Tuna Aksoy
343cc06f7a
Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4
2017-03-15 16:28:38 +00:00
Tuna Aksoy
472debefac
Fixed share port for local UI tests and also addressed review comment.
2017-03-15 14:39:57 +00:00
Ana Bozianu
d729a69922
RM-3265 - fix merge error
2017-03-13 14:53:21 +02:00
Ana Bozianu
ffc1fe1992
Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into
...
feature-2.4/RM-3265_MoveDestroyedRecordFolders
2017-03-13 14:25:18 +02:00
Tuna Aksoy
5aa3721b91
RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException)
2017-03-13 01:01:33 +00:00
Tuna Aksoy
98628c75de
RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException)
2017-03-12 21:00:19 +00:00
Tuna Aksoy
a9375ada87
RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException)
2017-03-10 17:45:48 +00:00
Silviu Dinuta
fab6cdfe9b
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
c3aaa264f0
Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions.
2017-02-24 10:19:44 +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
8b1012312b
Update year to 2017 on license headers.
2017-02-21 14:23:31 +00:00
Tuna Aksoy
4462899fb1
RM-4570 (Update license headers)
2017-01-02 19:45:32 +00:00
Oana Nechiforescu
28b213a1ec
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
0cb9a8420c
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526
2016-11-08 17:35:25 +02:00
Tom Page
a631ebfaf3
RM-4247 Merge release/V2.3 into release/V2.4.
2016-11-07 16:12:20 +00:00
Tom Page
1822924626
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
d8ac78ee45
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
ba2fab69b0
MNT-16852: Add unit tests for postProcessor permissions configuration
2016-10-27 11:31:03 +01:00
Tom Page
47e87e5ecb
Fix very minor issue with Javadoc strings.
2016-10-25 16:09:48 +01:00
David Webster
859afafee9
Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor
2016-10-24 17:32:37 +01:00
roxana
8f8b0268f2
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
ad995fe263
Added null check
...
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
2016-10-24 14:39:32 +01:00
roxana
4a912391df
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
67ad6b4214
Checking if disposition as of date was changed manually.
...
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
fc569df0dc
RM-3386 Merge commit '4cb38d2' into merge-2.4/RM-2526_BlendedDispositionSchedules.
2016-10-21 11:03:36 +01:00
Tom Page
a0e5ed3693
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tuna Aksoy
2dc520e898
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
f28ab68609
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
b08d4a788e
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Tom Page
d57d024474
Let git handle line endings for us.
2016-09-21 14:53:15 +01:00
Ana Bozianu
a4030ba15d
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Roy Wetherall
8ada1e3245
Merge 4.2.0.1 to 2.4.1
2016-08-12 08:51:14 +10:00
Roxana Lucanu-Ghetu
c0c0c225c0
Created a property for AlfrescoRuntimeException instead ot the message.
2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
32bd60328f
Moved check for content to be done on commit.
2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
649cb7fc3f
Added check to allow creating only records inside a record folder.
2016-08-04 11:08:36 +10:00
Roy Wetherall
425e1d8d4c
MNT-16535: non admin users can't file email records via outlook integration
2016-08-04 10:47:20 +10:00
Roxana Dina
ca77b1c782
RM-3265 Explore test failures cause. Introduce "kinds" property in moveRecordFolderCapability bean.
2016-07-12 16:32:47 +03:00
Roxana Dina
081e8faecd
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
ff2d6eb64a
RM-3265 Explore test failures cause. Remove condition for closed
...
folders.
2016-07-07 16:32:26 +03:00
Roxana Dina
1242cc4081
Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'""
...
This reverts commit 36d5dc46ea
2016-07-05 15:50:35 +03:00
Roxana Dina
36d5dc46ea
Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"
...
This reverts commit 0e97de496f
2016-07-05 15:48:51 +03:00
Roxana Dina
0e97de496f
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
a81616d857
sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration
2016-07-05 11:54:19 +03:00
