inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,990 Commits 335 Branches 2,191 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ana Bozianu
9ebc0fea9d RM-4012 - update and delete node 2016-10-06 20:34:58 +03:00
Ana Bozianu
06a9ace67d RM-4012 - removed special containers and disposition schedules from the result list 2016-10-06 19:58:33 +03:00
Tuna Aksoy
f934297f11 Fixed failing integration and UI tests 2016-10-06 16:26:39 +01:00
Ana Bozianu
8fe237bef4 RM-4012 - moved the rest api to org.alfresco.rest.api package and extended nodes service 2016-10-06 16:34:01 +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
1928e120da Temp workaround to fix the failing integration tests 2016-10-05 23:58:05 +01:00
Tuna Aksoy
05725e6cce Push unstaged changes 2016-10-05 22:16:52 +01:00
Tuna Aksoy
dd7fbc057d Merged branch for v2.5 -> master 2016-10-05 22:05:30 +01:00
Tuna Aksoy
8eff7635df Merge branch 'release/V2.5' into merge/MergeV25ToMaster 2016-10-05 21:56:11 +01:00
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
Ana Bozianu
8356cc1824 Revert "Extracted RM Community REST API code to a separate project" 
This reverts commit a429101955.
 2016-10-05 16:16:52 +03:00
Ana Bozianu
1b47fe5761 Revert "Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project" 
This reverts commit 77b3307f1c.
 2016-10-05 16:16:04 +03: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
77b3307f1c Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project 2016-10-05 00:08:02 +01: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
Tuna Aksoy
a429101955 Extracted RM Community REST API code to a separate project 2016-10-04 12:28:39 +01: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
Ana Bozianu
0005e0021f RM-4012 - rebamed to fileplan components and used nodes service 2016-10-04 13:01:19 +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
Ana Bozianu
5678eb87f0 RM-4012 - added the ig rest api 2016-10-03 14:35: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
b8fb68f5c0 RM-4082 (Extend POM dependencies to include API Explorer) 2016-10-01 23:42:31 +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