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
2,971 Commits 324 Branches 2,170 Tags
6c63e04cbdb1ab1ce73c93123f48599e4452f93f
Commit Graph

248 Commits

Author SHA1 Message Date
Silviu Dinuta
6c63e04cbd Merge master into feature/RM-4199_UnitTests 2016-10-31 10:21:44 +02:00
Tom Page
ea37d4e2de Merge release/V2.5 into master. 2016-10-28 16:56:07 +01:00
Tom Page
ddb0c9d8e6 Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Ana Bozianu
2196bc6718 RM-4012 - review updates 2016-10-28 14:44:34 +03:00
Tom Page
d8ac78ee45 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Tuna Aksoy
6836596a22 Merge branch 'master' into feature/RM-4012_Category_REST_API_2 2016-10-26 16:15:31 +01:00
Silviu Dinuta
e1e93e21e4 RM-4199: finalised unit tests for RMSiteEntityResource started on unit 
tests for RMSitesImpl, made some minor fixes
 2016-10-26 17:52:50 +03:00
Tom Page
47e87e5ecb Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
Silviu Dinuta
45e2c31b0b RM-3963: review updates 2016-10-25 16:47:48 +03:00
Tom Page
db7b1684a4 Merge release/V2.5 into master. 2016-10-25 14:22:15 +01:00
Silviu Dinuta
1d22ae2aa2 RM-3963: throw an exception if permanent parameter is passed for delete 2016-10-25 13:40:41 +03:00
Tom Page
7731f4e245 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +01:00
Silviu Dinuta
2fab18584f RM-3963: referenced (REPO-1459) issue for isSpecialNode to made 
protected
 2016-10-25 11:28:53 +03:00
Silviu Dinuta
1f091b7101 RM-3963: code formatting 2016-10-25 10:03:21 +03:00
Silviu Dinuta
a69743ffd0 RM-3963: prevent POST request directly in RM site node 2016-10-25 09:47:01 +03:00
David Webster
859afafee9 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Silviu Dinuta
8c09cafe53 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
8f8b0268f2 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
ad995fe263 Added null check 
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
 2016-10-24 14:39:32 +01:00
roxana
4a912391df 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
67ad6b4214 Checking if disposition as of date was changed manually. 
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
 2016-10-24 14:39:22 +01:00
Tuna Aksoy
716d456c81 Removed whitespaces 2016-10-21 15:05:38 +01:00
Silviu Dinuta
50514c1ace RM-4199: added update rm site functionality 2016-10-21 15:01:01 +03:00
Tom Page
fc569df0dc RM-3386 Merge commit '4cb38d2' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Silviu Dinuta
3693a02b2d RM-4199: renamed CategoryNode into RecordCategoryNode 2016-10-21 12:12:06 +03:00
Silviu Dinuta
3fd9de89a0 RM-4199: after review changes 2016-10-21 11:58:11 +03:00
Silviu Dinuta
ffdd4e70de RM-4199: workaround for supporting only rm site id for delete request 2016-10-20 17:03:09 +03:00
Silviu Dinuta
1040c89741 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
f57c86aa50 RM-4199: added one comment 2016-10-19 17:20:19 +03:00
Silviu Dinuta
2f06775aba 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
6eb062d4a3 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
9f3f82e290 RM-4007: Support alliases on update 2016-10-18 15:42:12 +03:00
Tom Page
a0e5ed3693 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814 Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Silviu Dinuta
ee07a75d67 RM-4199: create rm site rest api impl 2016-10-18 12:21:42 +03:00
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
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
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