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
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
Rodica Sutu
46cf88b223
Merge branch 'release/V2.5' of git.alfresco.com:records-management/records-management into feature-2.5/RM-6093_FixTestExecutionOrder
...
# Conflicts:
# rm-automation/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
2018-02-22 10:12:01 +02:00
Rodica Sutu
1fe8242944
attempt (2) to fix running the test methods in different classes interleaved
2018-02-21 22:57:16 +02:00
Rodica Sutu
2a42637ed7
Merge branch 'feature-2.5/MNT-19114_TestForCreateWikiPage' into 'release/V2.5'
...
MNT-19114 Test
See merge request records-management/records-management!856
2018-02-21 17:21:25 +00:00
Rodica Sutu
194928c0da
upgrade the dataPrep dependency
...
add a simple test to cover create wiki page issue (MNT-19117)
2018-02-20 22:52:34 +02:00
alfresco-build
0e869a735f
[maven-release-plugin] prepare for next development iteration
2018-02-19 14:24:52 +00:00
alfresco-build
5d80268501
[maven-release-plugin] prepare release V2.7-EA2
2018-02-19 14:24:50 +00:00
Elena Hardon
f1e3c0b853
MNT-19114 - Made review changes
2018-02-19 13:40:52 +02:00
Tom Page
a1c9dbc505
Merge branch 'feature/RM-6080_ClassifyRecordFoldersAndCategoriesTests_sm' into 'feature/v2.7EA1'
...
RM-6080 Check that cleared rm users with filling permissions on a category can classify with children the category or the record folder
See merge request records-management/records-management!843
2018-02-19 08:35:48 +00:00
Elena Hardon
b581d58726
MNT-19114: Removed unused comments
2018-02-16 16:08:18 +02:00
Elena Hardon
0da89c011c
MNT-19114 - Added integration test which shows that wiki pages can now be created as immediate folder type children under RM site
2018-02-16 16:07:18 +02:00
Tom Page
96e3b8d1b2
RM-6080 Use system user to handle metadata node.
...
This allows an rm admin user to classify record folders and their children.
2018-02-16 11:10:17 +00:00
Elena Hardon
e1b24791be
RM-19114: Removed the condition on creating only 2 folder-types from root and modified the unit test that was checking this
...
(cherry picked from commit af108af09125ed3da3e6ff6673434c3b045469a2)
# Conflicts:
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java
2018-02-15 20:47:38 +02:00
alfresco-build
cbfa402a24
[maven-release-plugin] prepare for next development iteration
2018-02-14 15:59:52 +00:00
alfresco-build
50091181f3
[maven-release-plugin] prepare release V2.7-EA1
2018-02-14 15:59:50 +00:00
Tom Page
fb87586fa1
Remove tag from scm management.
2018-02-14 15:41:21 +00:00
