inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,087 Commits 330 Branches 2,178 Tags
fb215876b82053e06907b5e8b10a3ce75db2bf5c
Commit Graph

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ana Bozianu
01199a2437 Merge master'into feature/RM-4186_BenchmarkInPlaceRecords 2017-02-24 11:38:11 +02:00
Tom Page
e7250be490 Merge branch 'feature-2.5/FixMavenLaunchFor512' into 'release/V2.5' 
Feature 2.5/fix maven launch for512

See merge request !67
 2017-02-24 08:20:08 +00:00
Tom Page
ac65ee7758 MNT-17512 Minor fixes after review. 
Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
 2017-02-24 08:05:11 +00:00
Tom Page
78ac6f5261 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
7dab46ad40 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
6616f0c572 MNT-17512 Allow partial updates to audit events. 
This is required so that the multiple calls to add permission and remove
permission do not overwrite each other within the transaction (e.g. if
there are permissions for multiple authorities being added, or if a
permission is being changed for a user).
 2017-02-23 10:51:46 +00:00
Tom Page
f83a6d7373 MNT-17512 Fix compilation for Java 7. 2017-02-23 08:32:11 +00:00
Tom Page
57f1566907 MNT-17512 Revert debugging change to RecordsManagementAuditServiceImpl.java. 2017-02-23 08:26:49 +00:00
Tom Page
9d52279f4e MNT-17512 Add auditing of RM permission changes. 2017-02-22 16:34:25 +00:00
Tom Page
0537f5d2a1 Record only merge of release/V2.5 into master. 2017-02-22 16:30:03 +00:00
Tom Page
ca40851afc Merge release/V2.5 into master. 
Merge fix to the GitLab URIs in the root pom.
 2017-02-22 16:29:06 +00:00
Tom Page
485562cf19 Record only merge release/V2.5.1.x into release/V2.5 2017-02-22 16:25:38 +00:00
David Webster
037a4b361e Update versions ready for 2.5.1.1 work 2017-02-22 16:21:20 +00:00
alfresco-build
a93a0629b3 [maven-release-plugin] prepare for next development iteration 2017-02-22 15:37:47 +00:00
alfresco-build
ecb418f649 [maven-release-plugin] prepare release V2.5.1 ags-2.5.1 2017-02-22 15:37:45 +00:00
Tuna Aksoy
42489cda9e Updated source code management tags after moving to the new gitlab server 2017-02-22 15:16:44 +00:00
Ana Bozianu
89e7751fc3 Merge master into feature/RM-4186_BenchmarkInPlaceRecords 2017-02-21 20:47:34 +02:00
Ana Bozianu
ce08b769b0 RM-4186 - loader preloads the records and schedules the events accordingly 2017-02-21 20:46:14 +02:00
Tom Page
8b1012312b Update year to 2017 on license headers. 2017-02-21 14:23:31 +00:00