Commit Graph

105 Commits

Author SHA1 Message Date
Ross Gale
ea4b979a5f Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
Ross Gale
c8932192f9 RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Ana Bozianu
4fcfdb164e Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Ana Bozianu
33af594d47 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
Rodica Sutu
8765349a80 Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x 2017-11-24 09:51:59 +02:00
Ana Bozianu
75469a0f5b MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Tuna Aksoy
1712bac995 RM-4689 (Can delete all RM site content through Repository browser)
Manually backported following changes:

RM-4293
734c1b2a82

RM-4326
a4aac053a8
c6ca74ab26
2017-06-12 16:17:24 +01:00
Tom Page
fa1e703428 Update copyright header. 2017-05-23 08:55:10 +01:00
Ana Bozianu
75a7285679 Merge 'release/V2.4' into 'release/V2.5' 2017-04-06 10:18:16 +03:00
Ana Bozianu
dac9f630de RM-3727 - added unit test for reviewed action and removed notification issued property 2017-04-05 12:04:31 +03: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
Tom Page
80b2fcdd90 RM-4456 Make unit tests work against Alfresco 5.2.b and 5.1.1. 2016-11-24 16:01:06 +00:00
Tom Page
76ca5df8a8 RM-4247 Merge release/V2.4 into release/V2.5. 2016-11-08 13:25:45 +00:00
Tom Page
a631ebfaf3 RM-4247 Merge release/V2.3 into release/V2.4. 2016-11-07 16:12:20 +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
Tom Page
2d4a627690 MNT-16852 Fix unit test comment. 2016-10-27 14:12:14 +01:00
David Webster
e50ce58533 MNT-16852: Improve commenting 2016-10-27 12:07:31 +01:00
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Tom Page
7731f4e245 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +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
0597d60f94 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01:00
Tuna Aksoy
2dc520e898 Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.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
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +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
e0cc131aa8 Let git handle line endings for us. 2016-09-23 10:38:16 +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
Ana Bozianu
4d2fc69747 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
a4030ba15d Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Roy Wetherall
695048dabd RM-3027: Fix unit tests 2016-08-22 16:32:43 +01:00
Roy Wetherall
c325875ab7 RM-3074: Unit test for records with renditions 2016-08-11 10:48:31 +10:00
Roy Wetherall
f7222748ff RM-3074: Rename getReader and getWriter methods 2016-08-09 15:06:48 +10:00
Roy Wetherall
667ac41a54 RM-3074: add unit test to show set now replaces, rather than appends extended security 2016-08-09 14:54:47 +10:00
Roy Wetherall
c27b7b60a9 RM-3074: Rename set/remove methods on extended security interface
* create deprecated service interface to tidy things up
* create set method and deprecate exisiting
* crate remove method and deprecate exisiting
* remove deprecation warnings in code
2016-08-09 12:01:16 +10:00
Roy Wetherall
737678aecd RM-3074: place common logic to get readers and writers of a node in one place
* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test

Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.
2016-08-09 11:20:50 +10:00
Roy Wetherall
3d36795bcc RM-3074: Refactor so read and write groups are reused independantly based on review comments 2016-08-08 12:31:44 +10:00
Roy Wetherall
beafb4fbb3 RM-3074: Remove unnecessary files 2016-08-02 20:07:13 +10:00
Roy Wetherall
6c55a67335 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-02 11:21:40 +10:00
Roy Wetherall
43a961237e RM-3074: groups assigned to RM roles, not authorities
* IPR groups are now assigned to RM roles rather than the individual
authorities
* more unit tests
2016-08-02 11:20:55 +10:00
Roy Wetherall
6756f0f841 RM-3074: unit testing of extended security service impl 2016-08-01 15:06:42 +10:00
Roy Wetherall
18bf4594ff RM-3074: Added root group and zones
* added root inplace group, created on start-up if not already there
* all groups created in RM zone
* fixed up file plan permission unit test and removed ignore from test
suite
* removed delimeters from groups names to keep length to a min
2016-08-01 11:18:51 +10:00
Roy Wetherall
f76b7df53c RM-3074: Initial refactoring of the extended security service implementation 2016-07-29 13:04:23 +10:00
Roy Wetherall
8a2553c082 RM-3649: missing changes 2016-07-27 11:26:21 +10:00
Roxana Lucanu-Ghetu
588155bc33 Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster 2016-07-12 11:47:10 +03:00
Roxana Lucanu-Ghetu
7de04dd516 Renamed unit test classes and changed error message. 2016-07-05 11:25:08 +03:00
Roxana Lucanu-Ghetu
a75fe88eb9 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Mihai Cozma
4c511cd396 Merge commit 'af7fe8' into RM-3341_MergeToMaster 2016-06-24 17:03:11 +03:00