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,075 Commits 324 Branches 2,170 Tags
36935814ff1bea999a0c7d593747307e16574f7e
Commit Graph

238 Commits

Author SHA1 Message Date
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
62ef6644f0 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
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
8336d270fe RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +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
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
dee7e2d580 RM-4681 Fix typo and add behaviour for moving RM items. 2017-02-15 04:03:58 +00:00
Tom Page
f7622c0231 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
Tuna Aksoy
7a7986bfcd RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tuna Aksoy
058e3803fe RM-4570 (Update license headers) 2017-01-02 19:21:21 +00:00
Mihai Cozma
4630c5ba9a MNT 16971 Unable to set an read only alfresco rm 
- remove commented code
 2016-12-19 16:01:52 +02:00
Mihai Cozma
38fa3baab7 MNT-16971 Unable to set read only using property server.allowWrite=false 
-fix transactions permission 
-fix document library view
 2016-12-19 15:52:26 +02:00
Oana Nechiforescu
66873aa7e6 Merge remote-tracking branch 'origin/release/V2.4' into merge-2.5/Merge231ReleaseIn25 
# Conflicts:
#	rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
#	rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/category/DispositionBlock.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/record/RecordActionsPanel.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/DeleteRelationshipPrompt.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/SelectRecordDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
#	rm-automation/src/main/java/org/alfresco/po/share/page/Message.java
#	rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
#	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/src/test/java/org/alfresco/test/TestData.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/BrowseClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/ClassifyRecord.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/EditClassification.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedDocuments.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
 2016-11-15 18:04:48 +02: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
Tom Page
a75f2d4a1d RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Ana Bozianu
10b64c082c Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5 2016-11-09 14:41:13 +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
81e1ece309 RM-4247 Merge release/V2.4 into release/V2.5. 2016-11-08 13:25:45 +00:00
Tom Page
f70bee356f RM-4247 Merge release/V2.3 into release/V2.4. 2016-11-07 16:12:20 +00:00
Ana Bozianu
5ad8cbde8d Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
Tom Page
c3e75a5927 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-31 09:57:29 +00:00
Tom Page
262babedfc Merge merge-2.5/MNT-16852_HF_2.2.0.2 into release/V2.5. 2016-10-28 16:46:07 +01:00
Ana Bozianu
18e5d469a6 fixed "get pending reviews" solr query 
(cherry picked from commit 798b76a8ed)
 2016-10-28 18:26:56 +03: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
d24a22264c Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +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
Tom Page
3604820810 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +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
cf4dc8cbb1 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
 2016-10-11 17:00:35 +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
cba239d488 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
cdd02e9c13 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
 2016-10-07 14:40:39 +01:00
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
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/DestroyAction.java
 2016-10-05 15:20:19 +01:00