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

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
f6aeea6687 RM-4942 Ensure the API sorting is case insensitive. 
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
 2017-03-23 14:22:19 +00:00
Oana Nechiforescu
c898ba8c2e Merge branch 'feature/RM-4339_RestTestsGuideTopicApi' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-22 10:21:18 +02:00
Oana Nechiforescu
0578a469a7 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 23:07:16 +02:00
Ross Gale
02ecacc364 Merge remote-tracking branch 'remotes/origin/feature/RM-4339_RestTestsGuideTopicApi' into feature/RM-4745_SubtopicsApiTests 2017-03-21 14:11:40 +00:00
Richard Smith
fa2aa51142 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-21 14:07:00 +00:00
Oana Nechiforescu
f9000d6d80 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 10:55:16 +02:00
Tuna Aksoy
0f3523a681 Merge branch 'release/V2.5' into merge/RM-3265_toMaster_2 2017-03-21 06:14:37 +00:00
Tuna Aksoy
8591b2cad4 Merge branch 'release/V2.4' into merge-2.5/RM-3265_to2.5_3 
Conflicts:
	pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2017-03-21 06:09:44 +00:00
Tuna Aksoy
2c295a35f4 RM-4760 (Update source control management info in the parent pom) 2017-03-20 18:42:01 +00:00
Tuna Aksoy
3b84d35ed0 Fixed typo 2017-03-20 10:19:25 +00:00
Tuna Aksoy
a336e942e7 RM-4808 (Update Record Folder: Reopen a close folder via PUT request throw Permission denied exception) 2017-03-19 00:16:37 +00:00
Oana Nechiforescu
034f7ebf84 Some additional tests, plus review changes and Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/rm-enterprise-public-rest-context.xml
 2017-03-18 21:11:23 +02:00
Richard Smith
f2e0935965 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-16 16:40:41 +00:00
Tuna Aksoy
68f460035e Merge branch 'merge/Merge_2332_2396' into 'master' 
Merge/merge 2332 2396

See merge request !140
 2017-03-16 08:03:04 +00:00
Tuna Aksoy
11ac1451c0 Merge branch 'release/V2.5' into merge/Merge_2332_2396 
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-03-15 22:17:52 +00:00
Tuna Aksoy
b49015a804 Merge branch 'merge-2.5/Merge_2332_2396' into 'release/V2.5' 
Merge 2.5/merge 2332 2396

See merge request !139
 2017-03-15 21:54:29 +00:00
Tuna Aksoy
c1103ffbf5 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
e6ba677cfe Excluded system test from the test suite. 2017-03-15 16:35:22 +00:00
Tuna Aksoy
4ef4a1a2b9 Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4 2017-03-15 16:28:38 +00:00
Ana Bozianu
343648614a Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Ana Bozianu
b9d27f60d5 Merge release/2.4 into release/V2.5 2017-03-15 16:48:26 +02:00
Tuna Aksoy
cbad0acae3 Fixed share port for local UI tests and also addressed review comment. 2017-03-15 14:39:57 +00:00
Ramona Popa
bd24d88d30 Merge branch 'feature/RM-4804_transfer_completed_records' into 'master' 
RM-4804_Transfer_Completed_Records

See merge request !132
 2017-03-15 13:17:38 +00:00
Tuna Aksoy
c9b6227036 RM-4804_Transfer_Completed_Records 2017-03-15 13:17:38 +00:00
Ana Bozianu
19ff92a4c1 Merge merge-2.5 into master 2017-03-15 13:17:37 +02:00
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Tom Page
39b19b52db Merge master into RM-4339_RestTestsGuideTopicApi. 2017-03-15 08:26:54 +00:00
Ana Bozianu
7fdba4c7f6 Merge branch 'feature-2.4/RM-3265_MoveDestroyedRecordFolders' into 'release/V2.4' 
Feature 2.4/rm 3265 move destroyed record folders

See merge request !127
 2017-03-14 08:22:39 +00:00
David Webster
1d0ca374ba Merge remote-tracking branch 'origin/release/V2.5' 2017-03-13 16:39:50 +00:00
David Webster
c40b240af1 Merge commit 'c547a5601eaabe4cf29218014aee9a186d8e4163' into release/V2.5 2017-03-13 16:37:34 +00:00
Tom Page
e0d72c6c72 Merge branch 'feature/RM-4159_EnterpriseReSTTests' into 'master' 
feature/RM-4159_EnterpriseReSTTests

See merge request !29
 2017-03-13 16:21:00 +00:00
Ana Bozianu
785be592b2 RM-3265 - added integration test for moving a closed folder 2017-03-13 18:20:39 +02:00
David Webster
43faae8f7b Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2017-03-13 16:16:06 +00:00
David Webster
884de597d0 Merge remote-tracking branch 'origin/release/V2.2' into release/V2.3 2017-03-13 16:11:04 +00:00
David Webster
6921dff066 Merge remote-tracking branch 'origin/release/V2.2.1.x' into release/V2.2 2017-03-13 16:09:24 +00:00
Richard Smith
3128da4f3a Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-13 15:13:00 +00:00
Tom Page
1028a8adf4 Merge branch 'feature/PR-3_tpage-alfresco' into 'master' 
Feature/pr 3 tpage alfresco

See merge request !125
 2017-03-13 14:22:27 +00:00
Ana Bozianu
62ef6644f0 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
8c59aac344 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Rodica Sutu
3911a14958 Merge branch 'merge/RM-4835_UpdateUITests' into 'master' 
Merge/rm 4835 update ui tests

See merge request !121
 2017-03-13 11:34:40 +00:00
Tom Page
08e7f50c24 Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-13 08:26:47 +00:00
Tom Page
03b8e4d4e7 RM-4159 Ensure there's exactly one RMRestWrapper. 
Use @PostConstruct to fix the hierarchy after initialisation.
 2017-03-13 08:14:48 +00:00
Tuna Aksoy
2f06487a3b RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
92f0e5bff0 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tom Page
3210c5dffb Add travis_wait command as mvn takes a long time to download dependencies. 
Mirrored from community commit ef23705b9cbd832e5f1025130cfbf74810ddadcf
 2017-03-11 06:22:02 +00:00
Tuna Aksoy
5acdf861cf RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
Tom Page
f980c5f67d Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-10 16:39:38 +00:00
Tom Page
80235541fc Merge RM-4332_TopicCRUD_REST_API into RM-4159_EnterpriseReSTTests. 2017-03-10 16:38:36 +00:00
Richard Smith
f6fba2ae54 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-10 16:21:29 +00:00
Ross Gale
da0d56962d Merge branch 'feature/RM-4158_ClassificationRestApi' into 'master' 
Feature/rm 4158 classification rest api

See merge request !115
 2017-03-10 16:12:53 +00:00