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

4257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ana Bozianu
1b366d5dae Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"" 
This reverts commit 98bce296d2.
 2017-03-01 21:32:00 +02:00
Ana Bozianu
98bce296d2 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion" 
This reverts commit 2e39b26c6a.
 2017-03-01 20:46:22 +02:00
Tuna Aksoy
8099fffadd 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
a88b1e3c82 Record-only merge of release/V2.5 into this branch. 2017-03-01 13:55:14 +00:00
Tom Page
0013a8a819 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
76cd30b0d6 Merge release/V2.4 into release/V2.5. 2017-03-01 12:35:30 +00:00
Tom Page
cc0c2d477f 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
ed01779226 Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d 
Conflicts:
	pom.xml
 2017-02-28 17:41:28 +00:00
Tom Page
47ccbf6e13 Merge release/V2.4.0.x into release/V2.4. 2017-02-28 11:59:11 +00:00
alfresco-build
270727c5aa [maven-release-plugin] prepare for next development iteration 2017-02-28 11:29:40 +00:00
alfresco-build
e172a93995 [maven-release-plugin] prepare release V2.4.0.2 ags-2.4.0.2 2017-02-28 11:29:38 +00:00
Tom Page
4135565f36 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 9657806429.
 2017-02-28 06:54:04 +00:00
Ana Bozianu
29deea36ad RM-4619 - fixed java7 compilation error 2017-02-27 22:23:04 +02:00
Ana Bozianu
2e39b26c6a 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
9657806429 RM-4760 Update maven release to use ssh rather than https. 2017-02-27 15:57:38 +00:00
Ana Bozianu
0b81dd90d6 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02:00
Tuna Aksoy
45ccd1667e 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
92fa327f1e RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Richard Smith
61d6237c4c 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
764b13d473 RM-4619 - convert the folder nodes before setting identifier 2017-02-27 12:41:39 +02:00
Tom Page
64d6075ab6 RM-4308 Merge release/V2.5 into master. 2017-02-24 16:04:02 +00:00
Tom Page
20521bb92f 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
f98336b7b6 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
53a8c755bb 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
9094b483d0 RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +00:00
Tom Page
0dcdab2b1e 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
3e63eafbb3 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
e03b068a58 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
c3aaa264f0 Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00
Tom Page
d338fe3fe0 Merge branch 'feature-2.4/MNT-17512_AuditManagePermissions' into 'release/V2.4.0.x' 
Feature 2.4/mnt 17512 audit manage permissions

See merge request !80
 2017-02-24 10:16:27 +00:00
Tom Page
6a756f9f5d MNT-17512 Update audit event strings after review from UA. 2017-02-24 10:05:56 +00:00