Commit Graph

4257 Commits

Author SHA1 Message Date
Ana Bozianu
087cb22097 RM-5645 - removed unused method and made review changes on ui tests 2017-10-09 19:50:25 +03:00
Ana Bozianu
9073334fe5 RM-5645 - review changes 2017-10-09 16:53:10 +03:00
Ana Bozianu
bc21889b85 merge from master 2017-10-09 12:28: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
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
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
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
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
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
Jelena Cule
789f21ecc2 Merge branch 'feature/RM-5416_REST_API_Tests_for_Folder_Classification_2' into 'master'
Feature/rm 5416 rest api tests for folder classification 2

See merge request !580
2017-09-29 19:22:40 +01:00
Rodica Sutu
86e6e4a64d Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5416_REST_API_Tests_for_Folder_Classification_2 2017-09-29 13:44:20 +03:00
Ana Bozianu
59393bdbbc Merge branch 'feature/RM-5655_ClassificationBewyondHighestChild' into 'master'
Feature/rm 5655 classification beyond highest child

See merge request !586
2017-09-29 11:39:00 +01:00
Ana Bozianu
41311ef40b Feature/rm 5655 classification beyond highest child 2017-09-29 11:39:00 +01:00
Rodica Sutu
10e639220c improve the tests for record folder classification to be independent 2017-09-29 12:31:14 +03:00
Tom Page
23fbfbecd4 Record-only merge release/V2.5.2.x into release/V2.5. 2017-09-29 09:52:58 +01:00
Rodica Sutu
47ae2830c5 refactoring tests to be more independent 2017-09-29 09:10:42 +03:00
Ana Bozianu
05ff9e92de Merge remote-tracking branch 'origin/master' into feature/RM-5655_ClassificationBewyondHighestChild 2017-09-29 08:56:40 +03:00
Rodica Sutu
5715438419 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5416_REST_API_Tests_for_Folder_Classification_2 2017-09-28 16:50:11 +03:00
Tom Page
989caf3dc2 Update version to 2.5.2.1-SNAPSHOT. 2017-09-28 14:08:14 +01:00
Rodica Sutu
69a6cc8ab3 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5416_REST_API_Tests_for_Folder_Classification_2 2017-09-28 15:22:47 +03:00
Ana Bozianu
24a6888adb RM-5655 - fixed unit tests and review formatting changes 2017-09-28 11:32:44 +03:00
Tom Page
a14e401fbf Merge origin/master into feature/RM_5358_UI_RelationshipToClassifiedRecord. 2017-09-28 09:23:45 +01:00
Rodica Sutu
9e18aa7f0c fix the failure introduced with the last commit 2017-09-28 09:23:24 +01:00
Rodica Sutu
9e5f53bd09 review comments changes 2017-09-28 09:23:10 +01:00
Rodica Sutu
30959017ee fix the request body sent when creating relationships 2017-09-28 09:23:01 +01:00
Rodica Sutu
da50858cfc fix the java docs 2017-09-28 09:22:02 +01:00
Rodica Sutu
6b54bd082f create relationships with v0 API requests 2017-09-28 09:21:08 +01:00
Ana Bozianu
f639b59831 RM-5655 - moved the query in community 2017-09-28 09:17:56 +03:00
jcule
052f36b062 RM-5416: REST API Tests for Folder Classification - various improvements 2017-09-27 17:43:57 +01:00
Oana Nechiforescu
b19b5e8be1 Commit 2, test changes to use the new API method. 2017-09-26 14:51:13 +03:00
Oana Nechiforescu
02219969b2 First commit just the test and new API empty trashcan method. 2017-09-26 14:50:28 +03:00
jcule
9e38a17a0f RM-5416: REST API Tests for Folder Classification 2017-09-25 18:31:43 +01:00
Jelena Cule
790e226361 Revert "Merge branch 'feature/RM-5416_REST_API_Tests_for_Folder_Classification_1' into 'master'"
This reverts merge request !569
2017-09-25 11:11:10 +01:00
Jelena Cule
bd920388bc Merge branch 'feature/RM-5416_REST_API_Tests_for_Folder_Classification_1' into 'master'
Feature/rm 5416 rest api tests for folder classification 1

See merge request !569
2017-09-24 01:08:32 +01:00
jcule
c4cfea44a7 RM-5416: REST API Tests for Folder Classification - removing the v0 search 2017-09-22 14:50:19 +01:00
jcule
49616d4019 RM-5416: REST API Tests for Folder Classification - removing the base class 2017-09-22 10:04:30 +01:00
jcule
9a224a4f49 Merge branch 'master' into feature/RM-5416_REST_API_Tests_for_Folder_Classification 2017-09-19 13:45:23 +01:00
Rodica Sutu
61c1fd0499 Merge branch 'feature/RM-5390_UI_Tests_Classification_Action' into 'master'
Feature/rm 5390 ui tests classification action

See merge request !550
2017-09-19 12:18:06 +01:00
Ana Bozianu
e5efa212c3 RM-5416 - remove actual file from create electronic record method 2017-09-19 11:02:29 +03:00
Ana Bozianu
3dbd9aa32b Merge master into feature/RM-5416_REST_API_Tests_for_Folder_Classification
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/main/java/org/alfresco/rest/rm/enterprise/v0/ClassificationAPI.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/module-context.xml
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationService.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImpl.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImpl.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyFoldersTest.java
2017-09-19 09:44:59 +03:00
Ana Bozianu
8af8501585 RM-5416 - reverted ClassificationAPI auto format 2017-09-19 09:19:01 +03:00
Ana Bozianu
ad94127b19 RM-5416 - reverted auto formatting for SearchAPI 2017-09-19 09:06:27 +03:00
Ana Bozianu
a9648f3f9a RM-5416 - remove logging messages from BaseAPI class 2017-09-18 21:27:53 +03:00