inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,630 Commits 324 Branches 2,170 Tags
ffaed71484f18bf0e4bb0b07abdc400c6c700c15
Commit Graph

80 Commits

Author SHA1 Message Date
rodicasutu
ffaed71484 Merge remote-tracking branch 'remotes/origin/release/V3.3' into release/V3.4 
# Conflicts:
#	rm-community/rm-community-share/source/java/org/alfresco/module/org_alfresco_module_rm_share/evaluator/FileToActionEvaluator.java
 2021-01-04 11:03:10 +02:00
rodicasutu
7db2afff61 Merge remote-tracking branch 'remotes/origin/release/V3.2' into release/V3.3 2021-01-04 10:40:29 +02:00
rodicasutu
f00d444dd8 Merge remote-tracking branch 'remotes/origin/release/V3.1' into release/V3.2 2021-01-04 10:17:48 +02:00
rodicasutu
0f4a81a763 update headers year to 2021 2021-01-04 09:44:44 +02:00
ehardon
dac7a8bcf8 RM-6645: Added unit test for getRmActionDefinitions webscript when whitelisted actions are present 2020-04-14 17:22:33 +03:00
ehardon
ea41e5c553 RM-6645: Created WhitelistedDMActions for RM site 
- added whitelisted actions into the rm rule actions
 2020-04-09 12:16:33 +03:00
Sara Aspery
187db478a5 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
841340c1e8 Merge branch 'release/V2.7' into release/V3.0 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
 2020-01-02 16:15:49 +00:00
Sara Aspery
0ed125b0b5 Merge branch 'release/V2.6' into release/V2.7 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
 2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Ross Gale
149314d068 RM-7051 replacing string utils ref 2019-12-10 10:41:12 +00:00
Ross Gale
7af0b3f7f6 Merge remote-tracking branch 'origin/release/V3.2' into merge/RM-7051 2019-12-05 15:35:01 +00:00
Ross Gale
3809249576 RM-7051 updating code to deal with held content after 3.2 change 2019-12-04 14:01:54 +00:00
Ross Gale
3505e8dfd6 fix conflicts 2019-11-29 10:59:47 +00:00
Rodica Sutu
5ccea06272 replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Ross Gale
3937379587 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
ffaf55c7d3 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
cagache
c5907dbc10 Removed unnecessary null check before Boolean.parseBoolean 2019-07-01 16:28:48 +03:00
cagache
6bc4ec03a6 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
Rodica Sutu
77f750455c Merge branch 'feature/RM-6835_FixJavaDocRMCommunity' into 'master' 
Fix java docs for rm community repo:

Closes RM-6835

See merge request records-management/records-management!1163
 2019-06-20 15:14:31 +01:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
a0575dbc8a RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
cabc902203 RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Tom Page
0268299006 Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
9becfe79a5 Add debug log message if exceptions are swallowed. 
Fix a couple of minor issues in DynamicAuthoritiesGet webscript.
 2018-01-12 15:25:56 +00:00
Ana Manolache
f908442af2 update headers to 2018 2018-01-03 12:01:00 +02:00
Tom Page
64d6075ab6 RM-4308 Merge release/V2.5 into master. 2017-02-24 16:04:02 +00:00
Tom Page
9094b483d0 RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +00:00
Tom Page
c3aaa264f0 Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00
Tom Page
ac65ee7758 MNT-17512 Minor fixes after review. 
Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
 2017-02-24 08:05:11 +00:00
Tom Page
78ac6f5261 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
7dab46ad40 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
8b1012312b Update year to 2017 on license headers. 2017-02-21 14:23:31 +00:00
Tom Page
32e9282534 MNT-16881 Check permission hierarchy using PermissionModel. 
Use the permission group hierarchy to determine whether the configured
permissions imply the queried permission or not.
 2017-01-24 11:30:26 +00:00
Tuna Aksoy
4462899fb1 RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tuna Aksoy
4cb59970d0 RM-4570 (Update license headers) 2017-01-02 19:21:21 +00:00
Tuna Aksoy
3d7661746c Updated license headers 2017-01-01 11:52:56 +00:00
Tom Page
ddb0c9d8e6 Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Tom Page
d8ac78ee45 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Tom Page
47e87e5ecb Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
David Webster
859afafee9 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Tom Page
9ce117f814 Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tuna Aksoy
6214fdc804 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
b7311e28ac Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
 2016-10-05 15:20:19 +01:00
Tuna Aksoy
f28ab68609 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
 2016-10-04 22:56:45 +01:00
Tom Page
bbf9580519 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tom Page
b08d4a788e Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
d57d024474 Let git handle line endings for us. 2016-09-21 14:53:15 +01:00