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
1,749 Commits 324 Branches 2,170 Tags
2f23f488db54f8e133552a8fc9eea6959cdeb52f
Commit Graph

1749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oana Nechiforescu
2f23f488db Updates to amps names. 2016-10-21 13:29:24 +03:00
Oana Nechiforescu
ee807117b0 Updates to pom 2016-10-21 13:11:27 +03:00
Oana Nechiforescu
8d0d513b9b Trying to fix the poms. Have no idea if that will work. 2016-10-21 11:03:18 +03:00
Tom Page
6c65ba572e RM-4127 Backport UI tests to V2.3. 2016-10-19 13:29:05 +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
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
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
roxana
a3586737f0 Changed calculating as of date 2016-10-12 02:13:53 +03: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
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
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
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
Tom Page
1ac97228b5 RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +01:00
Silviu Dinuta
3b8f954fcb Merge release/V2.3.0.x into release/V2.3 2016-10-05 11:54:24 +03:00
Silviu Dinuta
3a7bf93d29 changed the version to 2.3.0.9-SNAPSHOT in the pom files and incremented 
the version in module.properties files
 2016-10-05 11:50:22 +03:00
Silviu Dinuta
868c7ef411 removed snapshot from all the pom files 2016-10-05 11:03:11 +03:00
Tom Page
0bde77323a RM-3386 Centralise the logic for recalculating "disposition as of" dates. 2016-10-04 16:42:28 +01:00
Tom Page
132b5088c8 RM-3386 Replace apache logger with slf4j. 
Use slf4j to remove the need for a log level check. Note that the constant
strings will be concatenated at compile time so we don't have to worry
about the performance issue here.
 2016-10-04 16:42:28 +01:00
Tom Page
34ab6905d0 RM-3386 Refactor duplicated disposition date code into method. 2016-10-04 16:41:04 +01:00
Mihai Cozma
0d309d2ba7 Re-format acceptance criteria comments 2016-10-04 14:34:07 +03:00
Mihai Cozma
65c0116063 Re-format acceptance criteria comments 2016-10-04 14:27:03 +03:00
Mihai Cozma
04ac478189 Re-format acceptance criteria comments 2016-10-04 14:22:59 +03:00
roxana
3d511fde47 Added implementation for handling multiple dispositions schedule record based. 2016-10-04 10:34:08 +03:00
Tuna Aksoy
f0ceb96e1f Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 2016-10-03 17:02:06 +01:00
Tuna Aksoy
fa291eaa06 Merge branch 'release/V2.3.0.x' into feature-2.3/RM-4162_MergeToV2.3 
Conflicts:
	rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
	rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
 2016-10-03 16:06:45 +01:00