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

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
d729a69922 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
ffc1fe1992 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Rodica Sutu
3bf5296450 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
5d3f1f4621 Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-13 08:26:47 +00:00
Tom Page
fe45e852f5 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
5aa3721b91 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
98628c75de RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tom Page
1d5df7d857 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
a9375ada87 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
Tom Page
0ccd845659 Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-10 16:39:38 +00:00
Tom Page
4a02f3970b Merge RM-4332_TopicCRUD_REST_API into RM-4159_EnterpriseReSTTests. 2017-03-10 16:38:36 +00:00
Richard Smith
2a85b545f2 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-10 16:21:29 +00:00
Ross Gale
de67adedb7 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
0512d6a308 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
4f355ad10d Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
3e3349a919 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Rodica Sutu
dbda8b4f6a 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
83d6e9d820 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
ff00888ac4 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
9950f4868c MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
407e1f1e65 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
7dce59e4c8 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
5960df0286 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
796f32a461 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
27fc457dec RM-4339 Fix tests. 
Also remove catch blocks, since we've upgraded TAS.
 2017-03-10 12:44:20 +00:00
Rodica Sutu
f5d159238b Merge branch 'release/V2.4' into merge-2.5/RM-4835_UpdateUITests 2017-03-10 13:44:40 +02:00
Rodica Sutu
c7119d7b41 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
b19235004d MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00
Rodica Sutu
c68070f50f -update dataprep dependency 
-change the method to invite user from inviteUserToSiteAndAccept to createSiteMember (see MNT-17427)
 2017-03-09 16:56:35 +02:00
Silviu Dinuta
fab6cdfe9b RM-4163: added integration test for scenario provided by Roy and got the 
fix from master
 2017-03-09 16:27:50 +02:00
David Webster
52d46bef65 Merge branch 'hotfix-2.2/MNT-17550' into 'release/V2.2.0.x' 
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.

See merge request !114
 2017-03-09 13:16:14 +00:00
Samuel Langlois
c6a698ad55 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
a29ac3e653 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00
David Webster
57b4de11b2 MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up. 2017-03-08 16:05:00 +00:00
Richard Smith
c665f90c2f Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-08 12:19:04 +00:00
Oana Nechiforescu
4d71d6d2b5 Some changes. 2017-03-08 12:53:58 +02:00
Tom Page
714281a978 Merge master into RM-4159_EnterpriseReSTTests. 2017-03-08 08:57:44 +00:00
Tom Page
5de74bc2d7 RM-4159 Add wrapper method for assertLastError. 2017-03-08 08:12:30 +00:00
Tom Page
630f004057 Merge RM-4158_ClassificationRestApi into RM-4159_EnterpriseReSTTests. 2017-03-07 15:43:02 +00:00
Ana Bozianu
2a09832b97 Merge branch 'feature/RM-4619_createFolderThroughFTP' into 'master' 
RM-4619 - convert the folder nodes before setting identifier

See merge request !89
 2017-03-06 09:36:57 +00:00
Ross Gale
1f0d066ec1 Merge branch 'feature/javaVersionUpdate' into 'master' 
updating java version

See merge request !100
 2017-03-06 08:43:01 +00:00
Tom Page
3e74098d31 Silence the "Downloading..." and "Downloaded..." messages. 
Mirrored from community commit adfbf0902edd40ef26cefbd856e985a1cd9ec6db
 2017-03-06 07:55:48 +00:00
Tom Page
c7761d9149 Add a travis build file to give visibility of community testing. 
Mirrored from community commit 2ffb11f3c6c1b919cc3b66c81351201bb61f34df
 2017-03-03 16:26:12 +00:00
Ana Bozianu
f1ec66d9ff RM-4619 - fixed the reject record issue 2017-03-03 15:13:03 +02:00
Tom Page
719f174073 Merge branch 'merge/RM-4308_AuditManagePermissions' into 'master' 
Merge/rm 4308 audit manage permissions

Closes MNT-17512

See merge request !86
 2017-03-03 07:55:05 +00:00
Tom Page
9a1ecfc721 RM-4158 Add classification guide calls. 
This is /classification-guides GET and POST, /classification-guides/{id}
GET, PUT and DELETE.
 2017-03-02 14:58:16 +00:00
Ross Gale
ffff0c1172 updating java version of the parts i missed the first time 2017-03-02 13:32:31 +00:00
Ross Gale
bae1e78d31 updating java version 2017-03-02 12:14:15 +00:00
Richard Smith
f6ecfe00f6 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-02 11:17:28 +00:00