Ana Bozianu
995448081e
RM-4249 - workaround : replaced maxEntries with a positive value
2016-10-14 18:41:00 +03:00
Silviu Dinuta
6c8ba994aa
RM-4007 fixed some formatting
2016-10-13 16:02:00 +03:00
Silviu Dinuta
c259d6f34a
Merge remote-tracking branch 'origin/feature/RM-4007_PosibillityToUploadContent' into feature/RM-4012_Category_REST_API
2016-10-13 15:57:38 +03:00
Ana Bozianu
3f75ea5d1d
fixed "get pending reviews" solr query
2016-10-13 15:29:12 +03:00
Silviu Dinuta
99bb68c0dc
RM-4007: implemented method for uploading content
2016-10-13 10:50:16 +03:00
Tuna Aksoy
4ba9e64824
Merge branch 'master' into feature/RM-4012_Category_REST_API
2016-10-12 08:45:08 +01:00
Tuna Aksoy
d95c83df5a
Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016
2016-10-11 20:21:21 +01:00
Tuna Aksoy
0597d60f94
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01:00
cetra3
7eeb32f30b
Check to see whether repository models are initliased
...
Mirrored from community commit c81600dbfe2006e6ae6531c52704f12d497e4398
2016-10-11 01:37:22 +01:00
Ana Bozianu
8a839a279f
RM-4012 - added specific types, deleted duplicated code and use a core node
2016-10-10 23:44:49 +03:00
Tuna Aksoy
2dc520e898
Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
# rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
# rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.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
# rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +01:00
Tom Page
d80be797b8
RM-2526 Remove unwanted extra copy of cherry-picked test file.
2016-10-10 15:20:45 +01:00
Tuna Aksoy
79b680e4e5
Merge branch 'master' into feature/RM-4012_Category_REST_API
...
Conflicts:
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
rm-enterprise/rm-enterprise-repo/pom.xml
2016-10-09 16:21:15 +01:00
Tuna Aksoy
6214fdc804
Merged V2.4 to V2.5
2016-10-07 14:42:43 +01:00
Tuna Aksoy
7ea10996f9
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
2016-10-07 14:40:39 +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
Tuna Aksoy
1928e120da
Temp workaround to fix the failing integration tests
2016-10-05 23:58:05 +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
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
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
Tuna Aksoy
a429101955
Extracted RM Community REST API code to a separate project
2016-10-04 12:28:39 +01:00
Ana Bozianu
0005e0021f
RM-4012 - rebamed to fileplan components and used nodes service
2016-10-04 13:01:19 +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
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
6bc7e5ead1
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
10d7deed1b
RM-4082 (Extend POM dependencies to include API Explorer)
2016-09-28 18:54:08 +01:00
Tom Page
483bb55a13
Let git handle line endings for us.
2016-09-23 14:36:49 +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
Tuna Aksoy
9ecea8d44f
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:47:29 +01:00
Tuna Aksoy
b4298928bd
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:45:57 +01:00
Tuna Aksoy
96e9f8828f
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
b08d4a788e
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Tom Page
d57d024474
Let git handle line endings for us.
2016-09-21 14:53:15 +01:00
Ana Bozianu
a249953a92
Merge 2.4 merge fix into 2.5
2016-09-21 15:56:06 +03:00
Ana Bozianu
16927d264c
fixed merge error
2016-09-21 15:40:27 +03:00
Ana Bozianu
0a084b2f60
Merge release/2.5 into master
2016-09-21 15:12:01 +03:00
Ana Bozianu
4d2fc69747
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
Ana Bozianu
a4030ba15d
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Tuna Aksoy
a234bab816
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
