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,833 Commits 324 Branches 2,170 Tags
004af33cdc7a190bf245c91abd9cd60bc152f79c
Commit Graph

3833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Page
68156b91c8 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
0359c8f4ea MNT-17512 Update audit event strings after review from UA. 2017-02-24 10:05:56 +00:00
Ana Bozianu
8a1d534847 Merge master'into feature/RM-4186_BenchmarkInPlaceRecords 2017-02-24 11:38:11 +02:00
Tom Page
53f2d3d620 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
116322705c 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
96f9efb183 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
ef73be4d58 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
bd137ccca1 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
cb8b6b804e MNT-17512 Fix compilation for Java 7. 2017-02-23 08:32:11 +00:00
Tom Page
adde6730ff MNT-17512 Revert debugging change to RecordsManagementAuditServiceImpl.java. 2017-02-23 08:26:49 +00:00
Tom Page
d27c9a209b MNT-17512 Add auditing of RM permission changes. 2017-02-22 16:34:25 +00:00
Tom Page
5487e60b1f Record only merge of release/V2.5 into master. 2017-02-22 16:30:03 +00:00
Tom Page
66a8856e52 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
bb566b71d2 Record only merge release/V2.5.1.x into release/V2.5 2017-02-22 16:25:38 +00:00
David Webster
39cf937e4d Update versions ready for 2.5.1.1 work 2017-02-22 16:21:20 +00:00
alfresco-build
2243ff1c09 [maven-release-plugin] prepare for next development iteration 2017-02-22 15:37:47 +00:00
alfresco-build
00b4d9b138 [maven-release-plugin] prepare release V2.5.1 2017-02-22 15:37:45 +00:00
Tuna Aksoy
8a14116cf2 Updated source code management tags after moving to the new gitlab server 2017-02-22 15:16:44 +00:00
Ana Bozianu
788d2db785 Merge master into feature/RM-4186_BenchmarkInPlaceRecords 2017-02-21 20:47:34 +02:00
Ana Bozianu
a2baaed564 RM-4186 - loader preloads the records and schedules the events accordingly 2017-02-21 20:46:14 +02:00
Tom Page
6fec039920 Update year to 2017 on license headers. 2017-02-21 14:23:31 +00:00
Tom Page
19d061acd5 RM-4676 RM-4234 Merge release/V2.5 into master. 
Fix patch for marking renditions and record-only merge fix for behaviours
(as there's already a more complete version on master).
 2017-02-21 14:09:28 +00:00
Tom Page
7295d58a51 Merge branch 'merge/RM-4234_PerformanceFixes' into 'master' 
Merge/rm 4234 performance fixes

See merge request !75
 2017-02-20 15:04:24 +00:00
Tom Page
1c9c4b22a2 RM-4234 Merge commit '131fc89' into master. 
Performance improvements, including applying security marks directly to renditions rather than using the metadata
referral service.
 2017-02-20 07:37:00 +00:00
Rodica Sutu
a5f41280ee Merge branch 'feature/UpdateTasDepedency' into 'master' 
Update tas dependency to the latest release version 5.2.0.4

See merge request !71
 2017-02-17 12:30:17 +00:00