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

4255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
d94e96395f merge from master 2017-10-09 12:28:19 +03:00
Ramona Popa
7731b68e3e 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
48c8a39bd3 Feature/rm 5647 prevent classifed items being moved java api 2017-10-08 11:32:10 +01:00
jcule
9c76930fea 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
01147d40be 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
8f26a764f2 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
0061d6c63c 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
33ca5e5013 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
6faef88fc9 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
70447a47ab 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
a72bfcfd84 RM-5645: Automate AC for Prevent Classification Beyond Parents Classification 2017-10-03 09:36:29 +01:00
Tom Page
7780484ccc Merge release/V2.5 into master. 2017-10-03 08:12:05 +01:00
Ross Gale
616c9cf8ae RM-5595 Replace v0 calls to records apis 2017-10-02 13:22:27 +01:00
Ana Bozianu
946a2b82c8 Merge remote-tracking branch 'origin/master' into feature/RM-5656_RM-5654_PopupMessageForClassificationFailure 2017-10-02 12:15:21 +03:00
Jelena Cule
760fc1b324 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
bc2729517a 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
474f186cf8 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
28704ef015 Feature/rm 5655 classification beyond highest child 2017-09-29 11:39:00 +01:00
Rodica Sutu
9ff6b4f07c improve the tests for record folder classification to be independent 2017-09-29 12:31:14 +03:00
Tom Page
028706f91e Record-only merge release/V2.5.2.x into release/V2.5. 2017-09-29 09:52:58 +01:00
Rodica Sutu
6fc5685030 refactoring tests to be more independent 2017-09-29 09:10:42 +03:00
Ana Bozianu
330bfd2115 Merge remote-tracking branch 'origin/master' into feature/RM-5655_ClassificationBewyondHighestChild 2017-09-29 08:56:40 +03:00
Rodica Sutu
098b27f37f 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
3b623e26d7 Update version to 2.5.2.1-SNAPSHOT. 2017-09-28 14:08:14 +01:00
Rodica Sutu
5fe02bb7bf 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
84ed0e8b6b RM-5655 - fixed unit tests and review formatting changes 2017-09-28 11:32:44 +03:00
Tom Page
1a3173512b Merge origin/master into feature/RM_5358_UI_RelationshipToClassifiedRecord. 2017-09-28 09:23:45 +01:00
Rodica Sutu
d0130c6be0 fix the failure introduced with the last commit 2017-09-28 09:23:24 +01:00
Rodica Sutu
856cc9bccb review comments changes 2017-09-28 09:23:10 +01:00
Rodica Sutu
a2f6db6771 fix the request body sent when creating relationships 2017-09-28 09:23:01 +01:00
Rodica Sutu
88ac926335 fix the java docs 2017-09-28 09:22:02 +01:00
Rodica Sutu
4b57a35301 create relationships with v0 API requests 2017-09-28 09:21:08 +01:00
Ana Bozianu
63be351b34 RM-5655 - moved the query in community 2017-09-28 09:17:56 +03:00
jcule
b8398ecdac RM-5416: REST API Tests for Folder Classification - various improvements 2017-09-27 17:43:57 +01:00
Oana Nechiforescu
6af7609e7e Commit 2, test changes to use the new API method. 2017-09-26 14:51:13 +03:00
Oana Nechiforescu
bee032cb05 First commit just the test and new API empty trashcan method. 2017-09-26 14:50:28 +03:00
jcule
7b3628a1e3 RM-5416: REST API Tests for Folder Classification 2017-09-25 18:31:43 +01:00
Jelena Cule
701f7d065d 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
4bffaa98db 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
d11d477d04 RM-5416: REST API Tests for Folder Classification - removing the v0 search 2017-09-22 14:50:19 +01:00
jcule
51135a83c0 RM-5416: REST API Tests for Folder Classification - removing the base class 2017-09-22 10:04:30 +01:00
jcule
c0bd488a3f Merge branch 'master' into feature/RM-5416_REST_API_Tests_for_Folder_Classification 2017-09-19 13:45:23 +01:00
Rodica Sutu
6d0ab4af8f 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
cf3c343958 RM-5416 - remove actual file from create electronic record method 2017-09-19 11:02:29 +03:00
Ana Bozianu
9fe545e45b 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
a77f3571ad RM-5416 - reverted ClassificationAPI auto format 2017-09-19 09:19:01 +03:00
Ana Bozianu
cf247b7c03 RM-5416 - reverted auto formatting for SearchAPI 2017-09-19 09:06:27 +03:00
Ana Bozianu
2968872c00 RM-5416 - remove logging messages from BaseAPI class 2017-09-18 21:27:53 +03:00
Ana Bozianu
57ec2362f3 RM-5416 - revert auto formatting of BaseAPI class 2017-09-18 21:25:27 +03:00
Ana Bozianu
dd61bc3f8b RM-5416 - api tests for searching folders, record folders and record categories 2017-09-18 21:09:13 +03:00