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

3083 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
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
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02: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
c40b240af1 Merge commit 'c547a5601eaabe4cf29218014aee9a186d8e4163' into release/V2.5 2017-03-13 16:37:34 +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
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
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
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
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
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
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
Rodica Sutu
c861747b84 -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
e7176597e8 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
c547a5601e 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
217ec53966 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
0ae2d548c7 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00
David Webster
e85ea821ad 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
Tom Page
f35919c25d Merge branch 'merge-2.5/V2.4.0.2Release' into 'release/V2.5' 
Merge 2.5/v2.4.0.2 release

See merge request !97
 2017-03-01 12:38:05 +00:00
Tom Page
66f920bfc1 Merge release/V2.4 into release/V2.5. 2017-03-01 12:35:30 +00:00
Tom Page
189bb3c2ef Merge branch 'merge-2.4/V2.4.0.2Release' into 'release/V2.4' 
Merge 2.4/v2.4.0.2 release

See merge request !93
 2017-03-01 12:34:04 +00:00
Tom Page
fdfd314701 Merge release/V2.4.0.x into release/V2.4. 2017-02-28 11:59:11 +00:00
alfresco-build
daa9e53f09 [maven-release-plugin] prepare for next development iteration 2017-02-28 11:29:40 +00:00
alfresco-build
e8e5003b6d [maven-release-plugin] prepare release V2.4.0.2 2017-02-28 11:29:38 +00:00
Tom Page
8b60927bf4 Revert "RM-4760 Update maven release to use ssh rather than https." 
Use https for the hotfix, as Samuel has updated the build. We should use
ssh in future though, as it requires less configuration in Bamboo.

This reverts commit 8268b29400.
 2017-02-28 06:54:04 +00:00
Tom Page
8268b29400 RM-4760 Update maven release to use ssh rather than https. 2017-02-27 15:57:38 +00:00
Tuna Aksoy
93d56c580f Updated source code management tags after moving to the new gitlab server 
(cherry picked from commit 4d5091f5d0c59504e8db33bd08d3d4c8a6d47111)
 2017-02-27 14:48:53 +00:00
Tom Page
8fc7ba3913 Merge branch 'merge-2.5/RM-4308_AuditManagePermissions' into 'release/V2.5' 
Merge 2.5/rm 4308 audit manage permissions

See merge request !84
 2017-02-24 16:00:00 +00:00
Tom Page
8336d270fe RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +00:00
Tom Page
a4599de854 Merge branch 'merge-2.4/MNT-17512_AuditManagePermissions' into 'release/V2.4' 
Merge 2.4/mnt 17512 audit manage permissions

See merge request !82
 2017-02-24 13:05:58 +00:00
Tom Page
895fe29edc Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00