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,291 Commits 324 Branches 2,170 Tags
c6e7671ba623c0776efe49dcab8fa320c0900404
Commit Graph

4291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
c6e7671ba6 Merge remote-tracking branch 'remotes/origin/feature/RM-5617_ClassifyCompleteRecords_API_Tests_no' into feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no 2017-10-26 16:06:31 +03:00
Rodica Sutu
77cdbdd142 move the rules api implementation from UI test module to the community api test module in order to be able to create tests in the api project 2017-10-26 12:18:31 +03:00
Rodica Sutu
7428a13f55 Merge remote-tracking branch 'remotes/origin/feature/RM-5617_ClassifyCompleteRecordWithPowerUser_sm' into feature/RM-5617_ClassifyCompleteRecords_API_Tests_no 2017-10-25 15:47:58 +03:00
Rodica Sutu
8ea2d63fe0 Add tests to cover RM-5617 2017-10-25 15:40:44 +03:00
Ana Bozianu
e6a54af4a7 RM-5617 - added integration test and fixed small issues discovered in the process 2017-10-24 17:30:39 +03:00
Rodica Sutu
e6c88f386a Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5458_Tests_Prevent_FolderClassification 2017-10-10 09:21:38 +03:00
Ana Bozianu
078b6b6768 Merge branch 'feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' into 'master' 
Feature/rm 5645 automate ac prevent classification beyond parents classification

See merge request !595
 2017-10-10 07:18:59 +01:00
Rodica Sutu
483fef4c75 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5458_Tests_Prevent_FolderClassification 2017-10-10 09:18:07 +03:00
Rodica Sutu
7d6ec75bf6 Merge branch 'feature/RM-5457_AutomateAC' into 'master' 
Feature/rm 5457 automate ac

See merge request !620
 2017-10-10 07:16:56 +01:00
Rodica Sutu
f5b5da481d Merge remote-tracking branch 'remotes/origin/feature/RM-5457_AutomateAC' into feature/RM-5458_Tests_Prevent_FolderClassification 2017-10-09 22:59:10 +03:00
Rodica Sutu
c2f87d6ddf Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5457_AutomateAC 2017-10-09 21:56:19 +03:00
Rodica Sutu
b561c8f785 Merge remote-tracking branch 'remotes/origin/feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' into feature/RM-5458_Tests_Prevent_FolderClassification 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/utils/ClassificationUtils.java
 2017-10-09 20:33:39 +03:00
Rodica Sutu
85fc77529a Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5458_Tests_Prevent_FolderClassification 2017-10-09 20:24:35 +03:00
Ana Bozianu
877c91ec62 Merge remote-tracking branch 'origin/master' into feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification 2017-10-09 19:50:47 +03:00
Ana Bozianu
087cb22097 RM-5645 - removed unused method and made review changes on ui tests 2017-10-09 19:50:25 +03:00
Rodica Sutu
744457b8bd Merge remote-tracking branch 'remotes/origin/feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' into feature/RM-5458_Tests_Prevent_FolderClassification 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
 2017-10-09 16:59:45 +03:00
Ana Bozianu
9073334fe5 RM-5645 - review changes 2017-10-09 16:53:10 +03:00
Rodica Sutu
cf6e4d2567 Merge branch 'feature/RM-5457_AutomateAC' into feature/RM-5458_Tests_Prevent_FolderClassification 
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/PreventMoveCopyClassifiedFolderTest.java
 2017-10-09 14:58:49 +03:00
Ana Bozianu
80f1fc9101 Merge branch 'master' into 'feature/RM-5646_RestApi_ClassificationHierarchyActions' 
# Conflicts:
#   rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content/classified-content.properties
 2017-10-09 12:51:29 +01:00
Rodica Sutu
2202282b59 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5458_Tests_Prevent_FolderClassification 
# Conflicts:
#	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/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationException.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
 2017-10-09 14:40:32 +03:00
Ana Bozianu
bc21889b85 merge from master 2017-10-09 12:28:19 +03:00
Rodica Sutu
1667a34b99 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5457_AutomateAC 
# Conflicts:
#	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/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationException.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
 2017-10-09 09:18:19 +03:00
Ramona Popa
722147b1b6 Merge branch 'feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi' into 'master' 
Feature/rm 5647 prevent classifed items being moved java api

See merge request !594
 2017-10-08 11:32:10 +01:00
Ramona Popa
ffd9ad16ea Feature/rm 5647 prevent classifed items being moved java api 2017-10-08 11:32:10 +01:00
Rodica Sutu
7d38b2ce4e tests updates 2017-10-06 14:45:17 +03:00
Rodica Sutu
11d5981c00 api tests for RM-5458 2017-10-06 12:15:22 +03:00
jcule
55af74e7bf RM-5645: Automate AC Prevent Classification Beyond Parents Classification: added checks for response code and message 2017-10-06 09:22:13 +01:00
Rodica Sutu
7fe81f2abc Merge branch 'feature/RM-5457_AutomateAC' into feature/RM-5458_Tests_Prevent_FolderClassification 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content/classified-content.properties
 2017-10-06 10:34:23 +03:00
jcule
99084cb158 RM-5645: Automate AC Prevent Classification Beyond Parents Classification: added checks for response code and message 2017-10-05 22:46:28 +01:00
Jelena Cule
fe267c4172 Merge branch 'feature/RM5756_FixRestErrorMsg' into 'feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' 
Feature/rm5756 fix rest error msg

See merge request !609
 2017-10-05 16:05:05 +01:00
Rodica Sutu
2c952146e9 Merge remote-tracking branch 'remotes/origin/feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi' into feature/RM-5457_AutomateAC 2017-10-05 16:29:11 +03:00
Rodica Sutu
c0592a9ca7 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5457_AutomateAC 2017-10-05 16:12:57 +03:00
Ramona Popa
b83f53ddef Merge branch 'master' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi 2017-10-05 13:13:08 +03:00
Ross Gale
16b00123bb Merge branch 'feature/RM-5595_L2TestFix' into 'master' 
RM-5595 L2 test fix for tear down method

See merge request !593
 2017-10-05 10:03:06 +01:00
Jelena Cule
9b73694c80 Merge branch 'master' into 'feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' 
Master

See merge request !602
 2017-10-04 19:24:17 +01:00
jcule
3531b5e747 RM-5645: Automate AC Prevent Classification Beyond Parents Classification: api tests moved into separate classes 2017-10-04 18:47:05 +01:00
Rodica Sutu
dd1d538d4f Merge remote-tracking branch 'remotes/origin/feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi' into feature/RM-5457_AutomateAC 2017-10-04 11:15:24 +03:00
Rodica Sutu
7bce4c0295 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5457_AutomateAC 2017-10-04 11:13:24 +03:00
Jelena Cule
630e50a504 Merge branch 'feature/RM-5638_RM-5640_PopupMessageForClassificationFailure' into 'feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' 
Feature/rm 5638 rm 5640 popup message for classification failure

See merge request !597
 2017-10-03 23:01:09 +01:00
Ramona Popa
da7551dcf2 RM-5647 - one more integration test + some fix & refactor 2017-10-03 17:21:34 +03:00
Rodica Sutu
bd9ffdfcc0 Merge remote-tracking branch 'remotes/origin/feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi' into feature/RM-5457_AutomateAC 2017-10-03 16:31:17 +03:00
Ramona Popa
06c47adc0e Merge branch 'feature/RM-5639_PreventClassificationBeyondParent_JavaAPI' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi 2017-10-03 16:02:21 +03:00
Rodica Sutu
61cc5fec91 minor test refactoring 2017-10-03 15:16:07 +03:00
Ramona Popa
c814258e80 RM-5647 - added java api functionality and some integration tests 2017-10-03 12:13:16 +03:00
Rodica Sutu
96a146b28c Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5457_AutomateAC 2017-10-03 12:12:32 +03:00
Rodica Sutu
4df615671b adding tests for Prevent Classified Items Being Moved/Copied/Linked into Folders with Lower Classification 2017-10-03 12:10:31 +03:00
jcule
9cc0f937a8 RM-5645: Automate AC for Prevent Classification Beyond Parents Classification 2017-10-03 09:36:29 +01:00
Tom Page
1c7b32caba Merge release/V2.5 into master. 2017-10-03 08:12:05 +01:00
Ross Gale
5610e783a6 RM-5595 Replace v0 calls to records apis 2017-10-02 13:22:27 +01:00
Ana Bozianu
54367376ab Merge remote-tracking branch 'origin/master' into feature/RM-5656_RM-5654_PopupMessageForClassificationFailure 2017-10-02 12:15:21 +03:00