Commit Graph

3912 Commits

Author SHA1 Message Date
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
Tom Page
e987aa5864 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
f15365ef21 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
a1a1c7692a 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
e949ab40c2 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
Ana Bozianu
0b34eb760a Merge branch 'feature/RM-4673_ConcurrentlyDeclareInPlaceRecords' into 'master'
Feature/rm 4673 concurrently declare in place records

See merge request !58
2017-02-17 11:00:13 +00:00
Rodica Sutu
7164162ef4 update tas dependency to the latest release version 2017-02-17 09:13:49 +02:00
Tom Page
371ddc9946 Fix plugin repositories to allow running against 5.1.2.
Also move the enterprise-related repositories into the enterprise profile.
2017-02-16 11:41:04 +00:00
Tom Page
f428a5c32b Merge branch 'feature-2.5/browsePerformance' into 'release/V2.5'
Feature 2.5/browse performance

See merge request !46
2017-02-15 11:48:00 +00:00
Tom Page
655f55079f Merge branch 'feature-2.5/RM-4861_AddBehaviours' into 'release/V2.5'
Feature 2.5/rm 4861 add behaviours

See merge request !63
2017-02-15 11:19:29 +00:00
Tom Page
ba5c28586b RM-4681 Fix typo and add behaviour for moving RM items. 2017-02-15 04:03:58 +00:00
Tom Page
82e4a280da RM-4681 Add behaviours to restrict where rm items can be created.
Record categories can only go in the file plan, or under other record
categories. Record folders can only have categories as a primary parent,
and holds or transfers as secondary parents.
2017-02-14 16:19:45 +00:00
Tom Page
9139f4228b RM-4676 The patch version number should not be localised.
Delete localisation files and exclude version.properties from future
translation bundles.
2017-02-14 10:05:25 +00:00
Ana Bozianu
c44acc37a2 RM-4673 - delete unused import 2017-02-13 19:24:20 +02:00
Ana Bozianu
eee6fe572b RM-4673 - moved try catch in the create method so we can use the group name and fixed an update attribute bug
(cherry picked from commit 9a47da1e6ff050144629ebdd1692bcf9ee35bb56)
2017-02-13 19:20:30 +02:00
Ana Bozianu
c61e180dba RM-4673 - added try catch to handle concurrent attempt to create group
(cherry picked from commit 4e49223ae6f6900b98c5c3e9fe54fe479062639d)
2017-02-13 19:20:23 +02:00
Tom Page
67cb9863f1 RM-4234 When marking a node then also mark all renditions of it.
The same applies to clearing marks from a node.

This involved adding the rendition service to the base service (which I'm
a bit concerned about, because it looked like this should already have
been present).
2017-02-10 12:10:48 +00:00
Tuna Aksoy
8a80b58593 Merge branch 'feature/RM-4585_Amend_Test_Code_After_TAS_5202_Release' into 'master'
RM-4585 (DeclareDocumentAsRecordTests: use TAS Node API when available)

See merge request !54
2017-02-10 10:52:00 +00:00
Tuna Aksoy
1b698d5a1e Merge branch 'master' into feature/RM-4585_Amend_Test_Code_After_TAS_5202_Release
Conflicts:
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java
2017-02-10 10:35:57 +00:00
Rodica Sutu
daba3ec501 Merge branch 'feature/RM-4572TestsUpdates' into 'master'
Feature/rm 4572 tests updates

See merge request !52
2017-02-10 08:29:01 +00:00
Silviu Dinuta
ecc78431c2 Merge branch 'feature/RM-4595_changingIGNodeWithFilePlanComponent_in_yaml_file' into 'master'
RM-4595: changed all ocurences of IGNode to FilePlanComponent in

See merge request !53
2017-02-10 08:07:05 +00:00
Rodica Sutu
5fe413c26d fix the compilation error 2017-02-10 09:21:33 +02:00
Tuna Aksoy
5a4fe57958 RM-4585 (DeclareDocumentAsRecordTests: use TAS Node API when available) 2017-02-09 18:03:56 +00:00
Silviu Dinuta
b1033ad999 RM-4595: changed all ocurences of IGNode to FilePlanComponent in
ig-core.yaml file
2017-02-09 18:02:06 +02:00
Rodica Sutu
1495e351b9 updates: test to cover the scenario when a cm:folder is converted to a recordCategory 2017-02-09 17:30:42 +02:00
Rodica Sutu
a35637ba09 additional checks to cover the issue RM-4572 2017-02-09 12:44:04 +02:00