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,734 Commits 324 Branches 2,170 Tags
531f10c458fa960e425f7d383fc2e950f6ef917c
Commit Graph

908 Commits

Author SHA1 Message Date
Tom Page
531f10c458 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
roxana
3ea86fa148 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
roxana
fa042c81ae Changed calculating as of date 2016-10-12 02:13:53 +03:00
roxana
d9bb9b2e00 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
f55111fe6c RM-2526 Fix NPE found by integration tests. 2016-10-10 14:45:06 +01:00
Tom Page
b80bff48aa Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule. 2016-10-10 14:34:36 +01:00
Tom Page
4d58308d9a 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
f0370a443b Addresed code review comments. 2016-10-09 20:50:28 +03:00
Tom Page
9a9600c782 RM-3386 Fix the logger to be private static final. 2016-10-07 15:14:36 +01:00
roxana
6b916b977f Changed a bit the methods to be more readable. 2016-10-07 10:45:49 +03:00
Mihai Cozma
fc1e4a5710 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
98ca0abe19 RM-2368 Initial version record does not inherit document type and 
aspects from original document
 2016-10-06 13:03:40 +03:00
Tom Page
2e6d11128f RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +01:00
Tom Page
70eb0cb399 RM-3386 Centralise the logic for recalculating "disposition as of" dates. 2016-10-04 16:42:28 +01:00
Tom Page
726c2284b8 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
ef1c5a2cfd RM-3386 Refactor duplicated disposition date code into method. 2016-10-04 16:41:04 +01:00
roxana
db231f62db Added implementation for handling multiple dispositions schedule record based. 2016-10-04 10:34:08 +03:00
Tuna Aksoy
276aed6179 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 2016-10-03 17:02:06 +01:00
Tuna Aksoy
853220b997 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
Mihai Cozma
17099d1731 RM-2368 Initial version record does not inherit document type and 
aspects from original document
 2016-10-03 18:02:20 +03:00
Roxana Lucanu-Ghetu
80c64b59eb Merge branch 'feature-2.4/RM-3060' into 'release/V2.4' 
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157

(cherry picked from commit d9883a3b02)
 2016-10-03 12:10:20 +03:00
Tuna Aksoy
03750d0f45 Merge branch 'hotfix-2.3/RM-4095_Fix_Failing_InplaceRecordPermissionTest' into release/V2.3.0.x 2016-10-03 07:32:34 +01:00
Tuna Aksoy
4cb13c0052 RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 21:56:18 +01:00
Tuna Aksoy
228bcbd960 RM-4101 (Link to, Copy to and File to rules fail when not run in background) 2016-10-01 17:21:57 +01:00
David Webster
8470ed38f8 Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/merge_from_v2.2.0.1 2016-09-30 16:33:49 +01:00
Tom Page
66771a2973 RM-4162 RM-4907 Merge release/V2.3.0.x into release/V2.3. 2016-09-30 16:23:58 +01:00
David Webster
76ca8ea811 Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1 2016-09-30 15:35:04 +01:00
Silviu Dinuta
c336a70846 RM-4162: formatting fix 2016-09-29 23:02:13 +03:00
Silviu Dinuta
39a8273063 RM-4162: fixed formatting 2016-09-29 22:44:37 +03:00
Silviu Dinuta
31c6b1e228 RM-4162: added extra parentNodeRef parameter, checked writers and 
readers individually for null and added unit tests for the changes
 2016-09-29 18:44:06 +03:00
Tom Page
e673d7ab03 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
8d05147c6e RM-4907: added unit tests for csv acceptance criteria and made 
processNode method protected
 2016-09-27 12:17:04 +03:00
David Webster
5c90f386f4 MNT-16852: back port code fix for add children permission support 2016-09-26 22:17:24 +01:00
Silviu Dinuta
3209fff5cd Merge branch 'hotfix-2.3/RM-4097' into hotfix-2.3/RM-4096_RM_4097 2016-09-26 18:26:36 +03:00
Silviu Dinuta
577173c2b6 RM-4097: added fix for both issues 2016-09-26 17:32:53 +03:00
Tom Page
7e14b5231b Let git handle line endings for us. 2016-09-21 13:48:28 +01:00
Tom Page
d4937aeda4 Let git handle line endings for us. 2016-09-21 13:47:25 +01:00
Ana Bozianu
a930f5e4f1 Merge release/V2.3.0.x into release/V2.3 2016-09-20 14:00:59 +03:00
Roxana Lucanu-Ghetu
ec363a3838 Merge branch 'feature-2.3/RM-2188_PreviewNotAvailableDeclaredRecord' into 'release/V2.3' 
Feature 2.3/rm 2188 preview not available declared record

Backported changes from fixed issue RM-3030 in V2.4.

See merge request !493
 2016-09-20 10:05:53 +01:00
Tuna Aksoy
ca5316b6e2 RM-3993 (Exceptions thrown when concurrently creating identical folder structure) 2016-09-20 00:54:14 +01:00
Mihai Cozma
ad163b0301 Fix audit issue 2016-09-19 15:06:13 +03:00
Mihai Cozma
fbe55ac0a9 Revert "Fix audit issue" 
This reverts commit d8f0c87c5b.
 2016-09-19 14:48:14 +03:00
Mihai Cozma
d8f0c87c5b Fix audit issue 2016-09-19 14:46:42 +03:00
Mihai Cozma
39afa6e9f1 Fix audit issue 2016-09-19 09:18:09 +03:00
Roxana Lucanu
eb3fa4acb3 RM-3030 - renamed variable and changed comment 
(cherry picked from commit d5efeec830)
 2016-09-15 16:12:55 +03:00
Roxana Lucanu
d0b8a79a8a RM-3030 - added filePlan aspect for every thumbnail from renditions 
(cherry picked from commit 1de1bcf5f4)
 2016-09-15 15:45:34 +03:00
Silviu Dinuta
d3628be26b RM-3996: added unit tests and fixed the bug with infinite loop when 
batchsize=0
 2016-09-15 14:04:06 +03:00
Silviu Dinuta
7d7d10768d RM-3906: set maxProcessedRecords to batchsize value if it is not set 
from the request
 2016-09-14 10:32:42 +03:00
Silviu Dinuta
9b5e311936 RM-3960: did most of the review mentioned improvements 2016-09-13 21:12:15 +03:00
Silviu Dinuta
194e075cc6 RM-3906: Implemented webscript 2016-09-13 15:58:43 +03:00