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
4,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

595 Commits

Author SHA1 Message Date
Silviu Dinuta
ca416fd603 RM-3963: prevent POST request directly in RM site node 2016-10-25 09:47:01 +03:00
David Webster
348128ef58 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Silviu Dinuta
c3dda4e4bc RM-3963: restricted allowed operations for filePlan, transfers, holds 
and unfiled containers and added get request for rm site
 2016-10-24 18:07:09 +03:00
roxana
4f1ccefae2 I've tweaked the tests a bit to handle daylight savings. 
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
 2016-10-24 14:40:08 +01:00
roxana
bac0622ce0 Added null check 
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
 2016-10-24 14:39:32 +01:00
roxana
72a7501d5e When the last step of the current disposition is completed, no more calculation is needed. 
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
 2016-10-24 14:39:27 +01:00
roxana
9c5d0283cf Checking if disposition as of date was changed manually. 
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
 2016-10-24 14:39:22 +01:00
Tuna Aksoy
995a3e98cc Removed whitespaces 2016-10-21 15:05:38 +01:00
Silviu Dinuta
d8fcb352cf RM-4199: added update rm site functionality 2016-10-21 15:01:01 +03:00
Tom Page
0b52d1bd73 RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Silviu Dinuta
69b4e9cabc RM-4199: renamed CategoryNode into RecordCategoryNode 2016-10-21 12:12:06 +03:00
Silviu Dinuta
1d2e70b14f RM-4199: after review changes 2016-10-21 11:58:11 +03:00
Silviu Dinuta
a398dfeeb5 RM-4199: workaround for supporting only rm site id for delete request 2016-10-20 17:03:09 +03:00
Silviu Dinuta
ac7a451eea RM-4199: changes to include compliance in body create type, also changed 
the delete part to only delete rm site
 2016-10-20 03:27:52 +03:00
Silviu Dinuta
4aad1bec98 RM-4199: added one comment 2016-10-19 17:20:19 +03:00
Silviu Dinuta
3a7bda1aed RM-4199: changed package structure, removed content2.bin since we don't 
use welcome component for rm site, also added some comments and
simplified the validation of the site since we don't need to ad site id
and site visibility for rm site, given that site id is always rm and
site visibility always PUBLIC
 2016-10-19 17:08:03 +03:00
Silviu Dinuta
db36b0c43f Merge feature/RM-4012_Category_REST_API into 
feature/RM-4199_RM_REST_API_IMPL
 2016-10-18 21:53:12 +03:00
Silviu Dinuta
7b862f41d7 RM-4007: Support alliases on update 2016-10-18 15:42:12 +03:00
Tom Page
970d1080e2 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Silviu Dinuta
b61559071b RM-4199: create rm site rest api impl 2016-10-18 12:21:42 +03:00
Ana Bozianu
4b76fb838f RM-4249 - workaround : replaced maxEntries with a positive value 2016-10-14 18:41:00 +03:00
Silviu Dinuta
817aa74bfb RM-4007 fixed some formatting 2016-10-13 16:02:00 +03:00
Silviu Dinuta
1564a8bb1f 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
798b76a8ed fixed "get pending reviews" solr query 2016-10-13 15:29:12 +03:00
Silviu Dinuta
b510c89ac7 RM-4007: implemented method for uploading content 2016-10-13 10:50:16 +03:00
Tuna Aksoy
72afd52a1d Merge branch 'master' into feature/RM-4012_Category_REST_API 2016-10-12 08:45:08 +01:00
Tuna Aksoy
c97b1223d1 Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016 2016-10-11 20:21:21 +01:00
Tuna Aksoy
cf4dc8cbb1 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
a84d41a0b7 Check to see whether repository models are initliased 
Mirrored from community commit c81600dbfe2006e6ae6531c52704f12d497e4398
 2016-10-11 01:37:22 +01:00
Ana Bozianu
ba795912e3 RM-4012 - added specific types, deleted duplicated code and use a core node 2016-10-10 23:44:49 +03:00
Tuna Aksoy
d25b0423fb 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
Tuna Aksoy
89513a7316 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
cba239d488 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
cdd02e9c13 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
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
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
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
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
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
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