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
2,979 Commits 324 Branches 2,170 Tags
6523f5f183dd4e66a3fb1b42bc38cd3f74f6e15c
Commit Graph

2979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
9d02e0c768 Merge branch 'feature-2.4/RM-4095_Fix_Failing_Integration_Test' into release/V2.4 2016-10-05 19:28:45 +01:00
Tom Page
1ac97228b5 RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +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
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
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
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
Mihai Cozma
6d2752d34a 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
3be9d3718c 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 7345f55384)
 2016-10-03 12:10:20 +03:00
Tuna Aksoy
b8ad24e6bc 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
13cfe5914d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 22:50:50 +01:00
Tuna Aksoy
deefa0987d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 21:56:18 +01:00
Tuna Aksoy
18580aa649 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
711fb47c88 Merge branch 'release/V2.4' into release/V2.5 2016-09-30 17:20:05 +01:00
David Webster
2ceade040e Record Only: Merge branch 'release/V2.3' into release/V2.4 2016-09-30 17:15:47 +01:00
David Webster
028e3d47e3 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
72e875ba1e RM-4162 RM-4907 Merge release/V2.3.0.x into release/V2.3. 2016-09-30 16:23:58 +01:00
David Webster
ecbf4d1edc 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
965cb83669 RM-4162: formatting fix 2016-09-29 23:02:13 +03:00
Silviu Dinuta
431c6cd31b RM-4162: fixed formatting 2016-09-29 22:44:37 +03:00
Silviu Dinuta
9ec3f89637 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
3bf3ece86b Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
31e10e6a4a HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
David Webster
b63fe71b99 HF 2.2.0.1 version number updates 2016-09-28 11:28:16 +01:00
Tom Page
2e0cebc7c6 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
6cb9298ba3 formatting fix 2016-09-27 12:48:31 +03:00
Silviu Dinuta
0c9eeffd21 minor formating issue 2016-09-27 12:30:43 +03:00
Silviu Dinuta
54c4710120 RM-4907: added unit tests for csv acceptance criteria and made 
processNode method protected
 2016-09-27 12:17:04 +03:00
David Webster
2b4c6616bc MNT-16852: back port code fix for add children permission support 2016-09-26 22:17:24 +01:00
David Webster
5f0c239e5f Update HF version 2016-09-26 22:12:01 +01:00
Silviu Dinuta
c5e537fa69 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
6189376e17 RM-4097: added fix for both issues 2016-09-26 17:32:53 +03:00
Mihai Cozma
27a3091319 Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2016-09-26 10:41:17 +03:00
Tom Page
5328db71c5 Merge branch 'feature-2.4/MergeV2.4.0.xToV2.4' into 'release/V2.4' 
Feature 2.4/merge v2.4.0.x to v2.4

Merge some minor changes made to rm-automation back to V2.4.

See merge request !519
 2016-09-23 14:30:13 +01:00
Mihai Cozma
5f40921c12 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
5fbdca7735 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
Tom Page
cf1fe4ac45 Merge release/V2.5.0.x into release/V2.5. 2016-09-23 10:40:54 +01:00
Tom Page
ac679929c0 Merge release/V2.4 into release/V2.5. 2016-09-23 10:40:35 +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
e679622743 Merge release/V2.4.0.x into release/V2.4. 2016-09-23 10:31:00 +01:00