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,365 Commits 324 Branches 2,170 Tags
2dd9015ad878cca91c8d92a04067df6db59bc25a
Commit Graph

573 Commits

Author SHA1 Message Date
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
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +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
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
Roy Wetherall
f2cbb3628a RM-3027: Remove extended security when a record is copied 2016-08-22 17:17: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
da05682d91 RM-3074: missing file 2016-08-19 10:20:09 +01:00
Roy Wetherall
caeee2dafa RM-3074: Review comments 2016-08-17 10:53:40 +10:00
Roy Wetherall
c000285a86 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-15 13:15:24 +10:00
Roy Wetherall
9de6c32046 RM-3074: Integration tests 
* including fix for ghosted records being visible in collab sites
 2016-08-15 13:14:53 +10:00
Roy Wetherall
34bdce8b35 Merge V2.4 to master 2016-08-12 09:02:32 +10:00
Roy Wetherall
c8e7c6272f Merge 4.2.0.1 to 2.4.1 2016-08-12 08:51:14 +10:00