inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,979 Commits 330 Branches 2,178 Tags
6523f5f183dd4e66a3fb1b42bc38cd3f74f6e15c
Commit Graph

2979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
9ce117f814 Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tom Page
8309e75b12 Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3. 2016-10-18 10:36:47 +01:00
roxana
dc62e20d31 Fixed unit test for linking. 2016-10-18 11:49:15 +03:00
roxana
121967ed7e Modified validation for link conditions to compare the original disposition of the record with the target one. 2016-10-18 10:57:08 +03:00
David Webster
2df396a7e1 MNT-16852: HF 2.2.0.2 release, remove snapshot version number 2016-10-17 22:01:17 +01:00
Tom Page
9f30a72785 RM-2526 Fix copy/paste error. 2016-10-17 16:47:43 +01:00
roxana
9ca060330f Added check for adding disposition lifecycle aspect. 2016-10-17 17:50:12 +03:00
Tom Page
a2909b4180 RM-2526 Treat null as the largest date possible. 
If a disposition step has an "as of" date of null then it requires human
interaction. Consequently there is no length of time we can wait before the
step triggers - so we treat it as the latest step if there are multiple
disposition schedules.
 2016-10-17 15:27:43 +01:00
Mihai Cozma
78a8885954 Merge branch 'feature-2.3/RM-4250_fileplan_creation_freeze' into release/V2.3 2016-10-17 16:02:21 +03:00
Mihai Cozma
75a8477d0e Fix resource filtering 2016-10-17 13:45:25 +03:00
roxana
3dd736e279 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
Tom Page
e20aa4bf23 RM-3386 Persist the fact that an "as of" date has been manually set. 
If a "disposition as of" date is manually set using "Edit Retention Date"
then don't update it when changing the disposition schedule steps. Use a
new property to store the fact that the "disposition as of" date has been
manually set.
 2016-10-14 16:15:16 +01:00
Tom Page
ad7caa395a RM-4247 Recalculate the "disposition as of" date if the period property changes. 2016-10-14 14:28:04 +01:00
Mihai Cozma
b6b903c88b Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3 2016-10-14 11:38:51 +03:00
Mihai Cozma
df373db229 add symetrical build-helper-maven-plugin for both rm-share and rm-server 2016-10-14 11:18:28 +03:00
Mihai Cozma
a757cec753 Fixed to handle more digits 2016-10-13 17:08:59 +03:00
Mihai Cozma
cc2046f31a RM-4245_update_module_version 2016-10-13 15:37:54 +03:00
David Webster
c9fdd7f050 MNT-16852: Fix typo in XML 2016-10-13 11:36:47 +01:00
David Webster
34dfa8a648 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
30831aa221 MNT-16852: Add comment explaining reason behind extracting mapping to properties file 2016-10-12 15:31:12 +01:00
David Webster
40135eb34e MNT-16852: Remove unnecessary imports 2016-10-12 15:25:06 +01:00
David Webster
fa2d37f37b MNT-16852: First pass at extracting permission mapping to properties file. 2016-10-12 15:08:17 +01:00
David Webster
0eaa927b38 MNT-16852: Fix issue reading properties in Outlook Integration 2016-10-12 09:22:14 +01:00
roxana
a3586737f0 Changed calculating as of date 2016-10-12 02:13:53 +03: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
David Webster
674f929acf MNT-16852: Refactor hasPermission method for readability 2016-10-11 12:57:38 +01:00
David Webster
60dd571153 MNT-16852: Give write properties permission to file records 2016-10-11 12:51:25 +01:00
roxana
e109482ffc I've changed the method that calculates the as of date to take in consideration the record creation date instead of the action creation date. 2016-10-11 12:28:07 +03: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
Tom Page
dd52a516c8 RM-2526 Add cherry-picked test to test suite. 
Nb. The test currently fails at the moment.
 2016-10-10 15:29:38 +01:00
Tom Page
d80be797b8 RM-2526 Remove unwanted extra copy of cherry-picked test file. 2016-10-10 15:20:45 +01:00
roxana
9b308c8394 Merge branch 'feature-2.3/RM2526_BlendedDispositionSchedule' of https://gitlab.alfresco.com/records-management/records-management into feature-2.3/RM2526_BlendedDispositionSchedule 2016-10-10 17:14:16 +03:00
roxana
0144aa10bf Moved UpdateNextDispositionActionTest/ 2016-10-10 16:50:21 +03:00
Tom Page
cb77ed71b5 RM-2526 Fix NPE found by integration tests. 2016-10-10 14:45:06 +01:00
Tom Page
2b3577d1c0 Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule. 2016-10-10 14:34:36 +01:00
Tom Page
9ed29822ee Merge feature-2.3/RM-3386_DispositionCreatedDate into release/V2.3. 
RM-3386 Ensure that we always use the same method when calculating the "disposition as of" date for the next disposition step.
 2016-10-10 14:20:57 +01:00
roxana
8ac88ca766 Removed disposition selection strategy. 2016-10-09 21:51:09 +03:00
roxana
d98ae92dd5 Addresed code review comments. 2016-10-09 20:50:28 +03:00
Tom Page
b75b546fa6 RM-3386 Fix the logger to be private static final. 2016-10-07 15:14:36 +01:00
Tom Page
b310f5cdc9 RM-3386 Integration test to check that updating the disposition period works. 
This test is the scenario given in the bug report. Create a record that has a
next disposition step in a year. Update the step to be three years, and check
that the record's 'disposition as of' date is updated accordingly.
 2016-10-07 14:57:54 +01:00
Tuna Aksoy
6214fdc804 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
7ea10996f9 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
 2016-10-07 14:40:39 +01:00
roxana
4163851b9d Changed a bit the methods to be more readable. 2016-10-07 10:45:49 +03:00
Mihai Cozma
24ba8c0961 Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' into release/V2.3 2016-10-07 09:36:59 +03:00
David Webster
60833cb131 MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00
Mihai Cozma
69db34ebd4 Add comments to the method 2016-10-06 13:42:10 +03:00
Mihai Cozma
02556460a4 fix ' And a warning is logged' 2016-10-06 13:17:48 +03:00
Mihai Cozma
309faaea05 Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' of gitlab.alfresco.com:records-management/records-management into RM-2368_Initial_version_record_does_not_inherit_document 2016-10-06 13:08:22 +03:00
Mihai Cozma
7163bc7cda RM-2368 Initial version record does not inherit document type and 
aspects from original document
 2016-10-06 13:03:40 +03:00
Tuna Aksoy
05725e6cce Push unstaged changes 2016-10-05 22:16:52 +01:00