inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,622 Commits 325 Branches 2,188 Tags
f7e69629bb30f15ca8b17d598775e1ee2faaedcc
Commit Graph

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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