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
3,908 Commits 324 Branches 2,170 Tags
988f3d51a2fe73c12a73e19e2ece9a6b7c16144c
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Webster
fb48a1d90b MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x) 2017-03-10 16:00:23 +00:00
David Webster
586ad3d560 Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
b9bfd93187 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Rodica Sutu
65676a57cc Merge branch 'release/V2.5' into merge/RM-4835_UpdateUITests 
# Conflicts:
#	rm-automation/pom.xml
 2017-03-10 17:41:27 +02:00
Rodica Sutu
69fc1a2cfe Merge branch 'merge-2.5/RM-4835_UpdateUITests' into 'release/V2.5' 
Merge 2.5/rm 4835 update ui tests

See merge request !119
 2017-03-10 15:18:21 +00:00
Samuel Langlois
a1a9684540 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
ff748f7c3a MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
079c0a6823 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
6c6d9398b1 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
7b2fe91534 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
78bdeada80 Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
b68e12b8b3 Merge branch 'feature-2.4/RM-4163_DeclareRecordsConcurrencyIssue' into 'release/V2.4' 
RM-4163: added integration test for scenario provided by Roy and got the

See merge request !116
 2017-03-10 12:51:18 +00:00
Tom Page
a7ada74ba2 RM-4339 Fix tests. 
Also remove catch blocks, since we've upgraded TAS.
 2017-03-10 12:44:20 +00:00
Rodica Sutu
82d33ee82e Merge branch 'release/V2.4' into merge-2.5/RM-4835_UpdateUITests 2017-03-10 13:44:40 +02:00
Rodica Sutu
c7da05f65a Merge branch 'feature-2.4/RM-4835_UpdateInviteUsersMethod' into 'release/V2.4' 
Feature 2.4/rm 4835 update invite users method

See merge request !117
 2017-03-10 10:22:36 +00:00
David Webster
23c901af64 MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00