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
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
6fec039920
Update year to 2017 on license headers.
2017-02-21 14:23:31 +00:00
Tom Page
ad656729c9
MNT-16881 Add CreateChild permission to the write group.
...
Note that the RM permission code in RecordsManagementPermissionPostProcessor
is not navigating the permission group hierarchy correctly. This is a simple
fix to solve the issue referenced, but the full fix will go into master.
2017-01-24 11:21:35 +00:00
Tuna Aksoy
860b262431
Merge branch 'release/V2.3' into release/V2.4
2017-01-04 14:13:35 +00:00
Tuna Aksoy
526d6982be
Merge branch 'release/V2.3.0.x' into release/V2.3
2017-01-04 13:58:14 +00:00
Tuna Aksoy
c22b815bfa
Updated version number to 2.3.0.10-SNAPSHOT
2017-01-04 13:54:12 +00:00
Tuna Aksoy
29de36a563
Release RM 2.3.0.9
2017-01-04 12:40:14 +00:00
Tuna Aksoy
7a7986bfcd
RM-4570 (Update license headers)
2017-01-02 19:45:32 +00:00
Tuna Aksoy
a61f833c8f
Merge branch 'release/V2.3' into release/V2.4
2016-12-28 20:34:52 +00:00
Tuna Aksoy
0f9576bb82
Merge branch 'release/V2.3.0.x' into release/V2.3
2016-12-27 20:38:30 +00:00
Tuna Aksoy
dc3ecec202
Copied the ui-automation code from release/v2.3
2016-12-20 11:04:18 +00:00
Tuna Aksoy
4e239abd1a
Fixed Alfresco installer download config
2016-12-19 21:24:29 +00:00
Tuna Aksoy
86ad1304c2
Set renditionService property for filePlanComponent bean definition
2016-12-19 20:41:11 +00:00
Tuna Aksoy
70776d5240
Added a check to see if the aspect hasn't been removed in the same
...
transaction.
2016-12-19 18:45:17 +00:00
Tuna Aksoy
0ceba1359b
MNT-17241 (Access denied exception thrown during preview of certain content by non-admin/non-site member users)
2016-12-19 13:45:52 +00:00
Oana Nechiforescu
dbf806c275
Merge branch 'merge-2.4/Merge231AfterReleaseIn24' into 'release/V2.4'
...
Merge 2.4/merge231 after release in24
See merge request !627
2016-11-15 10:44:07 +00:00
Oana Nechiforescu
6323c97f26
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24
...
# Conflicts:
# rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
# rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
# rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
# rm-automation/src/test/java/org/alfresco/test/TestData.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java
# rm-automation/src/test/resources/coreTests.xml
# rm-automation/src/test/resources/testng.xml
2016-11-14 17:17:45 +02:00
Oana Nechiforescu
ee41095e1b
Merge branch 'merge-2.3/Merge231ReleaseIn23' into 'release/V2.3'
...
Merge 2.3/merge231 release in23
Merging 2.3.1 in 2.3
See merge request !623
2016-11-11 15:45:18 +00:00
Tom Page
5be1ed731d
Merge release/V2.3.1.x into merge-2.3/Merge231ReleaseIn23.
2016-11-11 15:40:47 +00:00
Tom Page
bea04479ad
Remove spurious temp file.
2016-11-11 15:39:37 +00:00
Oana Nechiforescu
0caedb4589
Merge commit 'c03c6da96' into merge-2.3/Merge231ReleaseIn23
...
# Conflicts:
# pom.xml
# rm-automation/pom.xml
# rm-server/pom.xml
# rm-share/pom.xml
2016-11-11 14:40:57 +02:00
Tom Page
9ab1024c7b
RM-2526, RM-4264 Merge changes from release/V2.3 to release/V2.4.
2016-11-10 08:17:12 +00:00
Tom Page
d376ae50c3
Update version to 2.3.1.1-SNAPSHOT.
2016-11-09 13:48:25 +00:00
Tom Page
3b75d70ba7
Update version to 2.3.1.
2016-11-09 13:17:00 +00:00
Roxana Lucanu-Ghetu
ac8c7388d2
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526
2016-11-08 17:35:25 +02:00
Tom Page
11abb8960f
Merge branch 'merge-2.4/RM-4247_UpdateDispositionProperty' into 'release/V2.4'
...
Merge 2.4/rm 4247 update disposition property
RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.
See merge request !606
2016-11-08 13:21:55 +00:00
roxana
0282e1af68
Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3
2016-11-08 15:02:01 +02:00
Oana Nechiforescu
884947b0e6
Merge branch 'feature-2.3/RM-4313_UpdateDispositionNextActionDateWhenCurrentDateIsInThePast' into 'release/V2.3.1.x'
...
Feature 2.3/rm 4313 update disposition next action date when current date is in the past
Update record disposition action as of date if it changed.
See merge request !598
2016-11-07 21:12:53 +00:00
Tom Page
f70bee356f
RM-4247 Merge release/V2.3 into release/V2.4.
2016-11-07 16:12:20 +00:00
Tom Page
efbe7ab8c1
Merge branch 'feature-2.3/RM-4247_UpdateDispositionProperty' into 'release/V2.3'
...
Feature 2.3/rm 4247 update disposition property
RM-4247 Recalculate the "disposition as of" date if the period property changes.
See merge request !564
2016-11-07 16:10:16 +00:00
Tom Page
2e48e3207f
RM-4247 Fix typo.
2016-11-07 16:09:35 +00:00
Tom Page
dcdef19025
Merge branch 'feature-2.3/RM-4307_AuditFix' into 'release/V2.3.1.x'
...
Feature 2.3/rm 4307 audit fix
RM-4307 Cherry-pick fix from master.
See merge request !600
2016-11-07 12:30:45 +00:00
Ana Bozianu
c6810b33dd
fixed audit unit tests
...
(cherry picked from commit 7a33945dff
2016-11-04 15:38:24 +00:00
roxana
373439822c
Revert changes and removed cache check.
2016-11-04 17:08:09 +02:00
Tom Page
43b8f3eba1
RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty.
2016-11-04 11:09:17 +00:00
Ana Bozianu
59c6fcca39
RM-4249 - workaround : replaced maxEntries with a positive value
...
(cherry picked from commit 4b76fb838f
2016-11-04 10:51:27 +00:00
roxana
cb11d527d4
Update record disposition action as of date if it changed, to have the same value as next disposition action as of date.
2016-11-04 10:19:24 +02:00
Roxana Lucanu-Ghetu
bcc462cab3
Merge branch 'feature-2.3/RM-4280_UpdateDispositionWhenLinking&Unlinking' into 'release/V2.3.1.x'
...
Feature 2.3/rm 4280 update disposition when linking&unlinking
This should also fix RM-4292.
See merge request !589
2016-11-02 12:36:46 +00:00
roxana
8c69fd1399
Changed the test a bit to check a more complex case.
2016-11-01 15:25:04 +02:00
roxana
07d010b164
Added null check.
2016-10-31 15:53:17 +02:00
roxana
b47d2370d7
Added integration test for recalculating disposition for a record when unlinking it.
2016-10-31 15:14:14 +02:00
roxana
0a79d24def
Renamed method for calculating next disposition step and added null check.
2016-10-31 14:41:58 +02:00
