Commit Graph

1065 Commits

Author SHA1 Message Date
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
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
Tuna Aksoy
165c08749b Extracted RM Community REST API code to a separate project 2016-10-04 12:28:39 +01:00
Ana Bozianu
85d5a80620 RM-4012 - rebamed to fileplan components and used nodes service 2016-10-04 13:01:19 +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
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
9b4727ba5f Temp fix to mitigate different Alfresco versions in RM Community (5.2) and RM Enterprise (5.1) 2016-09-29 08:31:15 +01:00
Tuna Aksoy
d5ca1f3208 RM-4082 (Extend POM dependencies to include API Explorer) 2016-09-28 18:54:08 +01:00
Tom Page
eacfd00e0c Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Tom Page
cf26f9b207 Let git handle line endings for us. 2016-09-23 10:38:16 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tuna Aksoy
aa8e1c1b32 RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:47:29 +01:00
Tuna Aksoy
717e2f85ba RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:45:57 +01:00
Tuna Aksoy
0f596a6e21 Merge branch 'release/V2.3' into release/V2.4
Conflicts:
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
2016-09-22 10:39:50 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
cb2457641f Let git handle line endings for us. 2016-09-21 14:53:15 +01:00
Ana Bozianu
8fd8782c8e Merge 2.4 merge fix into 2.5 2016-09-21 15:56:06 +03:00
Ana Bozianu
be9f4f6f04 fixed merge error 2016-09-21 15:40:27 +03:00
Ana Bozianu
4ce68e9039 Merge release/2.5 into master 2016-09-21 15:12:01 +03:00
Ana Bozianu
85db34ff48 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
1d8bf3e67d Merge branch 'release/V2.5' into 'master'
Merge changes from release/V2.5 into master

See merge request !509
2016-09-20 23:27:32 +01:00
Tuna Aksoy
c3e480b649 RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Roxana Dina
7fd78f9768 RM-3913 FIXMEs should have JIRAs assigned to them.
Mention issue number next to Fixme's.
2016-09-06 16:00:49 +03:00
Tom Page
f74535e635 Update versions to 2.5.0.1-SNAPSHOT ready for next hotfix release. 2016-08-31 11:58:47 +01:00
alfresco-build
6ca480e670 [maven-release-plugin] prepare for next development iteration 2016-08-29 01:38:02 +01:00
alfresco-build
572d3c504d [maven-release-plugin] prepare release V2.5.0 2016-08-29 01:37:59 +01:00
Tom Page
46e029717e Update version to 2.6-SNAPSHOT. 2016-08-26 10:03:21 +01:00
Roy Wetherall
f2cbb3628a RM-3027: Remove extended security when a record is copied 2016-08-22 17:17:43 +01:00
Roy Wetherall
b05298f7d1 RM-3027: Fix unit tests 2016-08-22 16:32:43 +01:00
Roy Wetherall
3bd4d2d74b RM-3074: Deleted creators cause failures when declaring records 2016-08-22 15:06:43 +01:00
Roy Wetherall
7d30c1e9b0 RM-3074: Test group reuse 2016-08-22 08:43:30 +01:00
Roy Wetherall
79d2285bcb RM-3027: Fixed failing test 2016-08-19 13:03:19 +01:00
Roy Wetherall
5364779912 RM-3074: Fixup community integration tests 2016-08-19 12:21:50 +01:00
Roy Wetherall
9aa85d22a0 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-19 10:20:28 +01:00
Roy Wetherall
da05682d91 RM-3074: missing file 2016-08-19 10:20:09 +01:00
Roy Wetherall
c6f4561f8c RM-3074: Contributor didn't get write in-place access as expected
* owner derived from cm:creator was not added to writer list
* fully authenticated user in base test was being set incorrectly
* transaction executed outside authentication in BDT classes
2016-08-19 10:19:48 +01:00
gbroadbent
790adce309 JAPANESE: Updated bundle based on EN-rev2016-08-16 2016-08-18 14:02:28 +01:00
gbroadbent
c4c6f2ef8c FRENCH: Updated bundle based on EN-rev2016-08-16 2016-08-18 11:31:08 +01:00
Roy Wetherall
73124cb633 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-17 10:54:02 +10:00
Roy Wetherall
caeee2dafa RM-3074: Review comments 2016-08-17 10:53:40 +10:00
gbroadbent
4e03c1cdcd DUTCH: Updated Bundles based on EN-rev2016-08-09 2016-08-16 23:26:22 +01:00
gbroadbent
09cbc71d5b BRAZILIAN PORTUGUESE: Updated Bundles based on EN-rev2016-08-09 2016-08-16 23:03:06 +01:00
gbroadbent
054fcc6880 SIMPLIFIED CHINESE: Updated Bundles based on EN-rev2016-08-09 2016-08-16 22:06:42 +01:00
gbroadbent
3cc5f62fdb RUSSIAN: Updated Bundles based on EN-rev2016-08-09 2016-08-16 21:48:43 +01:00
gbroadbent
92526a5091 NORWEGIAN BOKMAL: Updated Bundles based on EN-rev2016-08-09 2016-08-16 21:20:34 +01:00