inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 330 Branches 2,178 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
4a10ded602 Merge remote-tracking branch 'remotes/origin/feature/RM-2004_ExemptionCapability' into feature/RM-2004_ExemptionCapabilityFixTests 2018-03-29 21:01:02 +03:00
Rodica Sutu
1075455457 changes to cover review; 
remove unnecessary changes
move the capability check a bit earlier in the classification process
 2018-03-29 12:27:10 +03:00
Rodica Sutu
38dd584839 changes to cover review; 
remove unnecessary changes
move the capability check a bit earlier in the classification process
 2018-03-28 23:14:11 +03:00
cagache
1054fcef62 RM-2053 Fix tests affected by the new Manage Record Classification capability 2018-03-28 17:11:06 +03:00
Rodica Sutu
8d5b2f785d change the list of capabilities into a set 2018-03-28 12:16:31 +03:00
Rodica Sutu
419484719c change the UserRoles.java to a enum 
add the within RoleService a utility method to add/remove list of capabilities from a ROLE
 2018-03-27 21:14:21 +03:00
Rodica Sutu
ba1e480536 Merge branch 'remotes/origin/master' into feature/RM-2004_ExemptionCapability 
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/main/java/org/alfresco/rest/rm/enterprise/core/ClassificationData.java
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content/classified-content.properties
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/recordsPermissionModel.xml
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/security/rm-default-roles-bootstrap.json
 2018-03-27 18:07:08 +03:00
Tom Page
e85914c857 RM-6249 Don't update the declassification date of nodes with exemptions. 2018-03-27 15:29:16 +01:00
Roxana Lucanu-Ghetu
9080fc7976 RM-2053 Added classification capability restriction to classify action. Code review changes. 2018-03-27 01:25:49 +03:00
Rodica Sutu
9671416fd5 Merge branch 'feature/RM-5235_Audit_DeleteUser' into 'master' 
RM-5235_Audit_DeleteUser

See merge request records-management/records-management!925
 2018-03-24 15:56:19 +00:00
Ross Gale
132b301d8e RM-2004 adding in changes for AddDeclassificationExemption capability. A user can only add an exemption if they have the capability, this includes appling classification guides 2018-03-23 16:00:08 +00:00
Rodica Sutu
b537bf6804 minor java docs update 2018-03-23 17:31:02 +02:00
Rodica Sutu
9d6bdeaa8b review changes 2018-03-23 17:28:21 +02:00
Rodica Sutu
d009244189 test to cover the audit event for user deletion 2018-03-23 08:59:29 +02:00
cagache
490c7d9954 Merge branch 'master' into feature/RM-6167_RequestRecalculation_API_tests_no 2018-03-22 17:22:21 +02:00
Rodica Sutu
07d494f165 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-5235_Audit_DeleteUser 2018-03-21 23:07:22 +02:00
Rodica Sutu
da54db41c7 audit the properties specific to cm:person before deleting the node in order to provide information about the delete user 2018-03-21 23:06:48 +02:00
cagache
cb449f532b moved createRMSite from a test class to base class 2018-03-21 15:00:50 +02:00
Sara Aspery
ec094f8e98 Merge branch 'feature/RM-6107__ViewAndAddExemptionUI_sm' into 'master' 
RM-6107 View and Add Exemption UI

See merge request records-management/records-management!872
 2018-03-21 09:18:29 +00:00
Rodica Sutu
94581b56fa audit the delete person event on beforeDeleteNode 2018-03-20 21:52:25 +02:00
Ross Gale
a8be3bdc96 RM-2004 adding update to use enterprise files for all besides recordsPermissionModel 2018-03-20 16:52:39 +00:00
Rodica Sutu
f658688783 audit the cm:person beforeDeleteNode 2018-03-20 08:49:04 +02:00
Rodica Sutu
d40accb9af Merge branch 'feature/RM-6151RemoveExemptionUITests_sm' into 'feature/RM-6107__ViewAndAddExemptionUI_sm' 
RM-6151 RemoveExemptionUITests_sm

See merge request records-management/records-management!897
 2018-03-14 07:06:04 +00:00
Ross Gale
6dac611ab1 RM-2004 initial commit of capability 2018-03-13 10:26:05 +00:00
Rodica Sutu
99f32e08e2 Merge remote-tracking branch 'remotes/origin/feature/RM-6106_ViewAddExemptions_Automate_AC' into feature/RM-6151RemoveExemptionUITests_sm 
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/console/securitycontrols/DeclassificationExemptionsPanel.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/filePlan/ManagePermissionsTests.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/configuration/AddAndViewDeclassificationExemptionsTests.java
#	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-groups.get.properties
 2018-03-09 10:18:08 +02:00
Tom Page
6ebb19abef Merge branch 'feature/RM-6129_ManageClassifCapTests_no' into 'master' 
RM-6129 Create new API test methods to interact with RM roles

See merge request records-management/records-management!882
 2018-03-06 12:58:42 +00:00
cagache
0378205a68 swapped expected status code with actual status code (fix for expected:<500> but was:<200>) 2018-03-06 09:10:12 +02:00
Rodica Sutu
08d409b554 Merge branch 'feature/RM-6106_ViewAddExemptions_Automate_AC' of git.alfresco.com:records-management/records-management into feature/RM-6106_ViewAddExemptions_Automate_AC 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
 2018-03-05 15:37:40 +02:00
jcule
48f98f56ec Merge branch 'master' into feature/RM-6106_ViewAddExemptions_Automate_AC 2018-03-05 13:29:24 +00:00
Rodica Sutu
5e23cf092c Revert "Revert "Merge branch 'feature/RM-6107__ViewAndAddExemptionUI_sm' into…"" 
This reverts commit e9beac0144.
 2018-03-05 15:29:05 +02:00
Claudia Agache
e75852d30c Merge branch 'feature/RM-6125_UserWarnDeclassificationDateTests_sm' into 'master' 
RM-5296 Automated tests for the Declassification Date exceeds Time Frame warning

See merge request records-management/records-management!875
 2018-03-05 07:24:01 +00:00
Tom Page
d35ca27ab8 RM-6129 Use roles from UserRoles. 2018-03-02 15:58:49 +00:00
Tom Page
16fafb4262 RM-6129 Add API tests for creating and editing RM roles. 2018-03-02 13:32:04 +00:00
Tom Page
2faf6dbff6 RM-6125 More useful builder for creating RM site. 
Add a private constructor so that Lombok will generate a builder
including the site title and description (which come from a
superclass).
 2018-03-02 09:24:28 +00:00
Jelena Cule
e9beac0144 Revert "Merge branch 'feature/RM-6107__ViewAndAddExemptionUI_sm' into…" 
This reverts merge request !877
 2018-03-01 22:37:45 +00:00
cagache
ee748e3b68 RM-5296 Warn When Declassification Date exceeds Time Frame 2018-03-01 10:45:19 +02:00
Tom Page
d22362e3c3 RM-6129 Add test for capabilities of the RM user. 2018-02-28 16:26:27 +00:00
Tom Page
48b26d6b22 RM-6129 Add test for pre-configured RM roles. 2018-02-28 16:00:34 +00:00
Rodica Sutu
3e99d756a3 Merge branch 'merge/RM-6069_MergeFrom2.6ToMaster' into 'master' 
RM-6069_MergeFrom2.5ToMaster

See merge request records-management/records-management!869
 2018-02-28 13:16:06 +00:00
Rodica Sutu
9e96d0772b Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge/RM-6069_MergeFrom2.6ToMaster 2018-02-27 17:20:46 +02:00
Rodica Sutu
aacbc4b1b0 Merge branch 'merge-2.6/FixesFrom2.5' into 'release/V2.6' 
RM-6069 : Merge from 2.5 to 2.6

See merge request records-management/records-management!864
 2018-02-27 15:13:21 +00:00
Rodica Sutu
7b7948ccb4 Merge branch 'merge-2.6/FixesFrom2.5' into merge/RM-6069_MergeFrom2.6ToMaster 
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/ClassifyRecord.java
#	rm-automation/rm-automation-ui/src/test/resources/smokeTests.xml
#	rm-automation/rm-automation-ui/src/test/resources/testng.xml
 2018-02-27 15:35:44 +02:00
Rodica Sutu
9656a7d4c6 Merge remote-tracking branch 'origin/release/V2.5' into merge-2.6/FixesFrom2.5 2018-02-27 08:46:23 +02:00
Rodica Sutu
ff89968550 Update version to 2.5.3.1-SNAPSHOT 2018-02-26 17:39:11 +02:00
alfresco-build
9385959ed9 [maven-release-plugin] prepare for next development iteration 2018-02-26 15:02:28 +00:00
alfresco-build
ec18a96609 [maven-release-plugin] prepare release V2.5.3 ags-2.5.3 2018-02-26 15:02:26 +00:00
Rodica Sutu
26c9d97dcb Merge branch 'release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/DeleteFolderInUnfiledRecordsAndFilePlan.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/ClassifyRecord.java
#	rm-automation/rm-automation-ui/src/test/resources/smokeTests.xml
#	rm-automation/src/test/resources/classificationTests.xml
#	rm-automation/src/test/resources/level2Tests.xml
 2018-02-26 14:09:40 +02:00
Rodica Sutu
8c680d4d63 Merge branch 'feature-2.5/RM-6093_FixTestExecutionOrder' into 'release/V2.5' 
RM-6093 fix for running the method on test classes in a succession instead of interleaved

See merge request records-management/records-management!855
 2018-02-26 07:44:32 +00:00
Rodica Sutu
d11efb8c77 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-enterprise/pom.xml
 2018-02-24 21:48:16 +02:00
Rodica Sutu
bada7c2438 another attempt to fix running the test execution order 2018-02-22 23:20:27 +02:00