Commit Graph

5622 Commits

Author SHA1 Message Date
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
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 ags-2.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 ags-2.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
Sara Aspery
e5d42ac653 Merge branch 'feature/RM-6040_HighestChildClassificationAllowsNonContainer_sm' into 'master'
Resolve External Issue

See merge request records-management/records-management!834
2018-02-09 16:10:17 +00:00
Sara Aspery
2c0133d0a2 Merge branch 'master' into 'feature/RM-6040_HighestChildClassificationAllowsNonContainer_sm'
# Conflicts:
#   rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/HighestClassificationFromImmediateChildrenTest.java
2018-02-09 10:13:01 +00:00
Sara Aspery
6d1b54d23d RM-6040 Fix Highest Classified Child for non-container 2018-02-09 09:58:53 +00:00
Rodica Sutu
fa973b90f7 Merge branch 'feature/fix_continueSuiteToRun' into 'master'
Fix for stopping the suite of tests to run if @Before/@After fails

See merge request records-management/records-management!830
2018-02-09 07:48:21 +00:00
Rodica Sutu
9b9dce1db2 update the suite of tests with configfailurepolicy="continue" 2018-02-08 15:51:24 +02:00
gbroadbent
29933615d3 JAPANESE: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:36:52 +00:00
gbroadbent
a357526160 SPANISH: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:33:57 +00:00
Sara Aspery
4bdcbd68b7 Merge branch 'feature/RM-6008_HighestClassificationRestApi_no' into 'master'
RM-6008 - Highest Child Classification Rest Api

See merge request records-management/records-management!813
2018-02-05 19:34:28 +00:00
Roxana Lucanu-Ghetu
46e56fa7a4 RM-5733 Removed unused parameter allowContextFromAsOf. 2018-02-04 21:52:46 +02:00
Roxana Lucanu-Ghetu
4c42b2cdf6 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +02:00
Sara Aspery
5c17f76656 RM-6008 Highest child classification Rest API 2018-02-02 10:52:28 +00:00
Sara Aspery
72b4fc4011 Merge branch 'feature/RM-5987_ViewFullAuditLogCanCrashAlfresco' into 'master'
RM-5987 View Audit Log can crash Alfresco

See merge request records-management/records-management!788
2018-02-01 09:10:12 +00:00
Rodica Sutu
06974177a5 Merge branch 'feature/RM-6007_highestClassificationLevelApiDevelopment_sm' into 'master'
RM-6007 - Added method to find the highest classification level seen by an user in a folder

See merge request records-management/records-management!798
2018-01-30 15:21:12 +00:00
Sara Aspery
cdf68bc39e RM-5987 View Audit Log - removed spring default 2018-01-30 11:50:06 +00:00
Rodica Sutu
2f104e9215 minor updates for getHighestClassificationLevelFromImmediateChildren() implementation
unit tests & integration tests created
2018-01-29 18:16:15 +02:00
Rodica Sutu
1c222cddf6 Merge branch 'feature/RM-6006_SQL_Query' into 'master'
feature/RM-6006_SQL_Query

See merge request records-management/records-management!794
2018-01-29 08:10:56 +00:00
Rodica Sutu
0dfc32fc15 review updates - minor formatting, update java docs 2018-01-29 09:29:08 +02:00