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,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
8ff0a24952 RM-5645 - review changes 2017-10-09 16:53:10 +03:00
Rodica Sutu
1272a212bc 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
ca836da669 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
55d17acadb 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
d94e96395f merge from master 2017-10-09 12:28:19 +03:00
Rodica Sutu
8a5d8d2b1d 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
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
Rodica Sutu
bf05271b8a tests updates 2017-10-06 14:45:17 +03:00
Rodica Sutu
3978d6dd7d api tests for RM-5458 2017-10-06 12:15:22 +03: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
Rodica Sutu
4de24afe1a 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
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
Rodica Sutu
4d4b47bdeb 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
04e2d3d828 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
cc57f8ed9f Merge branch 'master' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi 2017-10-05 13:13:08 +03: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
Rodica Sutu
66790ae478 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
35a9d151a5 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
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
Ramona Popa
cbcc7c9ec7 RM-5647 - one more integration test + some fix & refactor 2017-10-03 17:21:34 +03:00
Rodica Sutu
0d169ee793 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
d54086e843 Merge branch 'feature/RM-5639_PreventClassificationBeyondParent_JavaAPI' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi 2017-10-03 16:02:21 +03:00
Rodica Sutu
d2663348a8 minor test refactoring 2017-10-03 15:16:07 +03:00
Ramona Popa
1c19e19598 RM-5647 - added java api functionality and some integration tests 2017-10-03 12:13:16 +03:00
Rodica Sutu
76aebc34cd 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
39e8875de0 adding tests for Prevent Classified Items Being Moved/Copied/Linked into Folders with Lower Classification 2017-10-03 12:10:31 +03: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