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,775 Commits 324 Branches 2,170 Tags
cb3357080de60c9b33756d5ee80d6701b5cb1523
Commit Graph

1775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
181ab39f2d Removed disposition selection strategy. 2016-10-09 21:51:09 +03: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
Tom Page
4439f9bc18 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
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
David Webster
1605c715db MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00
Mihai Cozma
6155c71e24 Add comments to the method 2016-10-06 13:42:10 +03:00
Mihai Cozma
3a74bc28f5 fix ' And a warning is logged' 2016-10-06 13:17:48 +03:00
Mihai Cozma
1f114d5a1d 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
98ca0abe19 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
ee13f7bbf7 Push unstaged changes 2016-10-05 22:16:52 +01:00
Tom Page
2e6d11128f RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +01:00
Silviu Dinuta
db03f48a7e Merge release/V2.3.0.x into release/V2.3 2016-10-05 11:54:24 +03:00
Silviu Dinuta
65a3cc9951 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
c13edc3a02 removed snapshot from all the pom files 2016-10-05 11:03:11 +03: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
Mihai Cozma
b46709d75a Re-format acceptance criteria comments 2016-10-04 14:34:07 +03:00
Mihai Cozma
cf602aa9e1 Re-format acceptance criteria comments 2016-10-04 14:27:03 +03:00
Mihai Cozma
db0f5a2b45 Re-format acceptance criteria comments 2016-10-04 14:22:59 +03: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
David Webster
adca3362ba Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
21d4f7db03 HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
David Webster
4f5a2631df HF 2.2.0.1 version number updates 2016-09-28 11:28:16 +01:00
Tom Page
e673d7ab03 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
48e6cc47de formatting fix 2016-09-27 12:48:31 +03:00
Silviu Dinuta
b9bb54579e minor formating issue 2016-09-27 12:30:43 +03: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
David Webster
18e4c800ad Update HF version 2016-09-26 22:12:01 +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
Mihai Cozma
dfa5e57eb3 Merge branch 'feature-2.3/MergeV2.2_to_V2.3' into 'release/V2.3' 
Feature 2.3/merge v2.2 to v2.3

See merge request !518
 2016-09-23 14:03:47 +01:00
Mihai Cozma
ce19f694ef Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/MergeV2.2_to_V2.3 2016-09-23 14:34:32 +03:00