Ana Bozianu
8c59aac344
Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into
...
feature-2.4/RM-3265_MoveDestroyedRecordFolders
2017-03-13 14:25:18 +02:00
Silviu Dinuta
e7176597e8
RM-4163: added integration test for scenario provided by Roy and got the
...
fix from master
2017-03-09 16:27:50 +02: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
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
Tuna Aksoy
7a7986bfcd
RM-4570 (Update license headers)
2017-01-02 19:45:32 +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
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
f70bee356f
RM-4247 Merge release/V2.3 into release/V2.4.
2016-11-07 16:12:20 +00:00
Tom Page
2cbba97c6d
Merge release/V2.3 into release/V2.4.
...
RM-2526 Fix permissions issue getting disposition schedule.
2016-10-28 14:35:27 +01:00
Tom Page
eb00635594
Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4.
2016-10-28 09:31:09 +01:00
David Webster
1bc282f2f5
MNT-16852: Add unit tests for postProcessor permissions configuration
2016-10-27 11:31:03 +01:00
Tom Page
121381a384
Fix very minor issue with Javadoc strings.
2016-10-25 16:09:48 +01:00
David Webster
348128ef58
Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor
2016-10-24 17:32:37 +01:00
roxana
4f1ccefae2
I've tweaked the tests a bit to handle daylight savings.
...
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
2016-10-24 14:40:08 +01:00
roxana
bac0622ce0
Added null check
...
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
2016-10-24 14:39:32 +01:00
roxana
72a7501d5e
When the last step of the current disposition is completed, no more calculation is needed.
...
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
2016-10-24 14:39:27 +01:00
roxana
9c5d0283cf
Checking if disposition as of date was changed manually.
...
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
0b52d1bd73
RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules.
2016-10-21 11:03:36 +01:00
Tom Page
970d1080e2
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tuna Aksoy
d25b0423fb
Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
# rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
# rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
# rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +01:00
Tuna Aksoy
2db9730702
Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Tom Page
014e9662bc
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Tom Page
cb2457641f
Let git handle line endings for us.
2016-09-21 14:53:15 +01:00
Ana Bozianu
935d6319e1
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Roy Wetherall
c8e7c6272f
Merge 4.2.0.1 to 2.4.1
2016-08-12 08:51:14 +10:00
Roxana Lucanu-Ghetu
a5ba1b3804
Created a property for AlfrescoRuntimeException instead ot the message.
2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
d6e365ec6c
Moved check for content to be done on commit.
2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
ee6e676e0d
Added check to allow creating only records inside a record folder.
2016-08-04 11:08:36 +10:00
Roy Wetherall
7a3d9e119d
MNT-16535: non admin users can't file email records via outlook integration
2016-08-04 10:47:20 +10:00
Roxana Dina
fa410deb6c
RM-3265 Explore test failures cause. Introduce "kinds" property in moveRecordFolderCapability bean.
2016-07-12 16:32:47 +03:00
Roxana Dina
f46e6e1625
Merge branch 'release/V2.4' of ssh://gitlab.alfresco.com/records-management/records-management into RM-3265_NoOptionToMoveADestroyedRecordFolder
2016-07-12 16:06:49 +03:00
Roxana Dina
a077bcbcc3
RM-3265 Explore test failures cause. Remove condition for closed
...
folders.
2016-07-07 16:32:26 +03:00
Roxana Dina
9875ba7c0f
Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'""
...
This reverts commit 57b5547167
2016-07-05 15:50:35 +03:00
Roxana Dina
57b5547167
Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"
...
This reverts commit 3550fe3a28
2016-07-05 15:48:51 +03:00
Roxana Dina
3550fe3a28
Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'
...
Feature 2.4/rm 3265 no option to move a destroyed record folder
RM-3265 No option to move a destroyed record folder.
Disable "Move" action for closed record folder. Change the
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
See merge request !277
2016-07-05 10:57:28 +01:00
Roxana Lucanu-Ghetu
771a13194b
sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration
2016-07-05 11:54:19 +03:00
Roy Wetherall
850783b64a
Merge RM-3227 from V2.3 to V2.4
2016-06-29 10:15:13 +10:00
Roxana Dina
7fd7cf10f3
RM-3265 Disable "Move" action for closed record folder. Change the
...
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
2016-06-27 17:41:13 +03:00
Roxana Lucanu-Ghetu
1c7a84e481
Unit and integration test for RM-3450
2016-06-27 10:58:01 +03:00
Roxana Lucanu-Ghetu
e687fa40cf
Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
...
Feature 2.4/rm 3300
See merge request !271
2016-06-24 15:46:34 +01:00
Roxana Lucanu-Ghetu
5f8225360a
no message
2016-06-24 17:43:52 +03:00
Mihai Cozma
0ff85ba446
Merge branch 'feature-2.4/RM-3293_Audit_not_log_default_scheduled' into 'release/V2.4'
...
Feature 2.4/rm 3293 audit not log default scheduled
See merge request !242
2016-06-24 15:24:52 +01:00
