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
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
Richard Smith
0b4823f392 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-08 12:19:04 +00:00
Oana Nechiforescu
25317acc8e Some changes. 2017-03-08 12:53:58 +02:00
Tom Page
1989534dc3 Merge master into RM-4159_EnterpriseReSTTests. 2017-03-08 08:57:44 +00:00
Tom Page
0dfac9925e RM-4159 Add wrapper method for assertLastError. 2017-03-08 08:12:30 +00:00
Tom Page
0909a833d0 Merge RM-4158_ClassificationRestApi into RM-4159_EnterpriseReSTTests. 2017-03-07 15:43:02 +00:00
Ana Bozianu
13d8d50811 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
0b37807f4c Merge branch 'feature/javaVersionUpdate' into 'master' 
updating java version

See merge request !100
 2017-03-06 08:43:01 +00:00
Tom Page
14c231d632 Silence the "Downloading..." and "Downloaded..." messages. 
Mirrored from community commit adfbf0902edd40ef26cefbd856e985a1cd9ec6db
 2017-03-06 07:55:48 +00:00
Tom Page
95ca9410ee 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
530bb47f57 RM-4619 - fixed the reject record issue 2017-03-03 15:13:03 +02:00
Tom Page
219e4a33dc 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
c174863631 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
fafc7d0e11 updating java version of the parts i missed the first time 2017-03-02 13:32:31 +00:00
Ross Gale
d19a7a0fe8 updating java version 2017-03-02 12:14:15 +00:00
Richard Smith
653910ec62 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-02 11:17:28 +00:00
Ana Bozianu
0353a21611 Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"" 
This reverts commit b055176b14.
 2017-03-01 21:32:00 +02:00
Ana Bozianu
b055176b14 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion" 
This reverts commit 92b9f4df4a.
 2017-03-01 20:46:22 +02:00
Tuna Aksoy
f6ca7230ec Merge branch 'feature/RM-4798_Update_dependencies_for_RM' into 'master' 
Feature/rm 4798 update dependencies for rm

See merge request !95
 2017-03-01 15:40:34 +00:00
Tom Page
9e202dca64 Record-only merge of release/V2.5 into this branch. 2017-03-01 13:55:14 +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
Tuna Aksoy
7f0cb596b8 Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d 
Conflicts:
	pom.xml
 2017-02-28 17:41:28 +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
Ana Bozianu
f607cbf7be RM-4619 - fixed java7 compilation error 2017-02-27 22:23:04 +02:00
Ana Bozianu
92b9f4df4a RM-4619 - add the rm search aspect when a record folder is created via conversion 2017-02-27 20:11:01 +02:00
Tom Page
8268b29400 RM-4760 Update maven release to use ssh rather than https. 2017-02-27 15:57:38 +00:00
Ana Bozianu
c444abb362 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02: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
Ana Bozianu
950c0028f3 RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Richard Smith
74edffaa61 RM-4113 Update Service 
1. Update the JS service to mirror the new data structures indicated in the swagger implementation.
2. Add the guide creation functions.
3. Add a mock response to the guide GET sequence.
 2017-02-27 12:57:01 +00:00
Ana Bozianu
7e08ee2f98 RM-4619 - convert the folder nodes before setting identifier 2017-02-27 12:41:39 +02:00
Tom Page
0124a94486 RM-4308 Merge release/V2.5 into master. 2017-02-24 16:04:02 +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
583bc6f63e Merge master into RM-4159_EnterpriseReSTTests. 
Update the RMRestWrapper with a couple more passthrough methods.
 2017-02-24 15:20:57 +00:00
Tom Page
fa30b86f49 Merge branch 'merge/SecurityMarkUpdateDataGenerator' into 'master' 
Merge/security mark update data generator

See merge request !83
 2017-02-24 15:09:57 +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
Ana Bozianu
43ceaba9e6 Merge branch 'feature/RM-4186_BenchmarkInPlaceRecords' into 'master' 
Feature/rm 4186 benchmark in place records

See merge request !39
 2017-02-24 12:54:41 +00:00
Tom Page
5ec3e1feea Merge release/V2.5 into master. 
Add support to the update data generator for security marks. Update to the
handling of maven repositories (mainly so that Alfresco 5.1.2 could be used
on the release/V2.5 branch).
 2017-02-24 10:37:52 +00:00
Tom Page
895fe29edc Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00