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
4,767 Commits 324 Branches 2,170 Tags
b9e816c9ee96f5a765658e6e53e24705b7f60e9c
Commit Graph

4767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
e721781a47 RM-6129 Add test for capabilities of the RM user. 2018-02-28 16:26:27 +00:00
Tom Page
91033cdec1 RM-6129 Add test for pre-configured RM roles. 2018-02-28 16:00:34 +00:00
Rodica Sutu
80ac91dbd7 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
22b845f75f 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
dc2dcb87e7 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
c06ecabb17 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
751430ac4a Merge remote-tracking branch 'origin/release/V2.5' into merge-2.6/FixesFrom2.5 2018-02-27 08:46:23 +02:00
alfresco-build
c4a87a0ac4 [maven-release-plugin] prepare for next development iteration 2018-02-26 15:02:28 +00:00
alfresco-build
d7df9e0981 [maven-release-plugin] prepare release V2.5.3 2018-02-26 15:02:26 +00:00
Rodica Sutu
5a0313e779 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
863fbfb115 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
297af07a32 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
2e63a743c5 another attempt to fix running the test execution order 2018-02-22 23:20:27 +02:00
Rodica Sutu
fc5f3df281 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
fdb76f4bcf attempt (2) to fix running the test methods in different classes interleaved 2018-02-21 22:57:16 +02:00
Rodica Sutu
a6a6f3dd42 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
4e22ad7fe4 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
6c99375498 [maven-release-plugin] prepare for next development iteration 2018-02-19 14:24:52 +00:00
alfresco-build
3282bcfe61 [maven-release-plugin] prepare release V2.7-EA2 2018-02-19 14:24:50 +00:00
Elena Hardon
8ad2f373b7 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Tom Page
cc66a7216c 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
d8612fe1fd MNT-19114: Removed unused comments 2018-02-16 16:08:18 +02:00
Elena Hardon
6a3e742c5a 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
c3ed37b8ce 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
be3bb1e2f9 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
da5d9052fc [maven-release-plugin] prepare for next development iteration 2018-02-14 15:59:52 +00:00
alfresco-build
b756829d4f [maven-release-plugin] prepare release V2.7-EA1 2018-02-14 15:59:50 +00:00
Tom Page
dbda5e4c05 Remove tag from scm management. 2018-02-14 15:41:21 +00:00
Sara Aspery
5a8b4ee696 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
85c158eece 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
27cf9be622 RM-6040 Fix Highest Classified Child for non-container 2018-02-09 09:58:53 +00:00
Rodica Sutu
038f51667b 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
a4c054e4cb update the suite of tests with configfailurepolicy="continue" 2018-02-08 15:51:24 +02:00
gbroadbent
ceb5533bae JAPANESE: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:36:52 +00:00
gbroadbent
04c585eb17 SPANISH: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:33:57 +00:00
Sara Aspery
f5a8e7866d 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
f78387e57e RM-5733 Removed unused parameter allowContextFromAsOf. 2018-02-04 21:52:46 +02:00
Roxana Lucanu-Ghetu
ee62eb74d8 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +02:00
Sara Aspery
09304563f2 RM-6008 Highest child classification Rest API 2018-02-02 10:52:28 +00:00
Sara Aspery
b97d4b6998 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
54e44f00ef 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
ed04588a69 RM-5987 View Audit Log - removed spring default 2018-01-30 11:50:06 +00:00
Rodica Sutu
b42ef56d9e minor updates for getHighestClassificationLevelFromImmediateChildren() implementation 
unit tests & integration tests created
 2018-01-29 18:16:15 +02:00
Rodica Sutu
4e69149d1e 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
d5af9932f9 review updates - minor formatting, update java docs 2018-01-29 09:29:08 +02:00
Rodica Sutu
975b2fe323 updates after review: 
update the getChildrenPropertyValues return type
update the existing tests from RecordsManagementQueryDAOImplTest that test getChildrenPropertyValues() method
 2018-01-26 16:48:38 +02:00
Rodica Sutu
547bb407da modify the hasChildrenWithPropertyValues to getChildrenPropertyValues in order to return the query result 
update the implementation where the modified method is used
update tests
 2018-01-26 10:57:49 +02:00
Sara Aspery
7212ec9b98 RM-5987 changes from review 2018-01-26 07:11:20 +00:00
Rodica Sutu
cbeebaedc0 change the old query select_CountChildrenWithPropertyValues to return the list of distinct property values from children 
update the implementation were the updated query is used
 2018-01-24 15:22:10 +02:00
Sara Aspery
48f77fc38e RM-5987 use Spring to hold max entries default 2018-01-24 09:08:09 +00:00