inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 330 Branches 2,178 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Webster
1605c715db MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00
Ana Bozianu
9c23eabf40 RM-4012 - update and delete node 2016-10-06 20:34:58 +03:00
Ana Bozianu
5a4cc334e6 RM-4012 - removed special containers and disposition schedules from the result list 2016-10-06 19:58:33 +03:00
Tuna Aksoy
f0a83e23d1 Fixed failing integration and UI tests 2016-10-06 16:26:39 +01:00
Ana Bozianu
19e02d402c 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
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
feb9bc09c7 Temp workaround to fix the failing integration tests 2016-10-05 23:58:05 +01:00
Tuna Aksoy
ee13f7bbf7 Push unstaged changes 2016-10-05 22:16:52 +01:00
Tuna Aksoy
ffc926b37b Merged branch for v2.5 -> master 2016-10-05 22:05:30 +01:00
Tuna Aksoy
524ec7ba84 Merge branch 'release/V2.5' into merge/MergeV25ToMaster 2016-10-05 21:56:11 +01:00
Tuna Aksoy
985c9d06b6 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
2e6d11128f RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +01:00
Tuna Aksoy
0614914beb 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
62952a9306 Revert "Extracted RM Community REST API code to a separate project" 
This reverts commit 165c08749b.
 2016-10-05 16:16:52 +03:00
Ana Bozianu
ec66655a1b Revert "Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project" 
This reverts commit 74f867dae1.
 2016-10-05 16:16:04 +03: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
Tuna Aksoy
74f867dae1 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
2db9730702 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
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
Tuna Aksoy
165c08749b Extracted RM Community REST API code to a separate project 2016-10-04 12:28:39 +01: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
Ana Bozianu
85d5a80620 RM-4012 - rebamed to fileplan components and used nodes service 2016-10-04 13:01:19 +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
Ana Bozianu
3b284fbea9 RM-4012 - added the ig rest api 2016-10-03 14:35: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
3465af3fab RM-4082 (Extend POM dependencies to include API Explorer) 2016-10-01 23:42:31 +01:00
Tuna Aksoy
2832594788 RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 22:50:50 +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
3a1d26f2e0 Merge branch 'release/V2.4' into release/V2.5 2016-09-30 17:20:05 +01:00
David Webster
459725e874 Record Only: Merge branch 'release/V2.3' into release/V2.4 2016-09-30 17:15:47 +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