inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 335 Branches 2,191 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

6805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
a70d755b80 Merge branch 'feature/RM-5617_ClassifyCompleteRecords_API_Tests_no' into feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no 2017-10-27 10:41:20 +03:00
Rodica Sutu
1e8db89aed Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no 
# Conflicts:
#	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/issue/RM5617Test.java
 2017-10-27 10:40:54 +03:00
Rodica Sutu
96166522c1 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5617_ClassifyCompleteRecords_API_Tests_no 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM5617Test.java
 2017-10-27 10:09:08 +03:00
Ana Bozianu
7b3ff23548 Merge branch 'feature/RM-5617_ClassifyCompleteRecordWithPowerUser_sm' into 'master' 
Feature/rm 5617 classify complete record with power user sm

See merge request !647
 2017-10-27 07:54:20 +01:00
Ana Bozianu
ed309456bc Feature/rm 5617 classify complete record with power user sm 2017-10-27 07:54:20 +01:00
Rodica Sutu
5ee17506a6 review changes 2017-10-27 09:46:08 +03:00
Rodica Sutu
ec20a6f8d4 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
Tom Page
7d44ada329 RM-5792 Minor fixes to CONTRIBUTING.md. 2017-10-26 10:34:34 +01:00
Rodica Sutu
f509e1e289 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
Ross Gale
0939a0b880 RM-5792 Updating file to include changes from the second review 
Mirrored from community commit c744e70bd487f6a3ff5de55232dbee0469929a55
 2017-10-25 16:08:56 +01:00
Ross Gale
4d7e0d34da RM-5792 Updating file to include changes from the initial review 
Mirrored from community commit 45f1a30eb8e504a325a667f31d0ad6af082e040c
 2017-10-25 14:27:53 +01:00
Ross Gale
5f40b1d2ff RM-5792 Updating file to include changes from the initial review 
Mirrored from community commit b53e1b34accf10ca385a1dec8fb7baee2b746d64
 2017-10-25 14:05:45 +01:00
Rodica Sutu
0e32383432 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
1973ddd067 Add tests to cover RM-5617 2017-10-25 15:40:44 +03:00
Ross Gale
870f591ced RM-5792 adding first draft on contributing doc 
Mirrored from community commit 7e2df793a0d4b5a41ef35fe2786066cc94e1158e
 2017-10-24 16:15:56 +01:00
Ana Bozianu
8d376c5c30 RM-5617 - added integration test and fixed small issues discovered in the process 2017-10-24 17:30:39 +03:00
Ross Gale
ab10ff3e50 RM-5792 Adding in placeholder 
Mirrored from community commit 146eba847fe1472df2dc2d5cd51e1b828a6844c8
 2017-10-20 11:50:29 +01:00
Rodica Sutu
07d3d06db5 test fixes 2017-10-13 16:42:31 +03:00
Rodica Sutu
a2ea50868a fix failing tests from Enterprise REST API 2017-10-13 14:08:21 +03:00
Rodica Sutu
548c29294e 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
90c5f19d8e 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
32dcc29442 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
b0f4ab8131 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
0e459adc61 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
898b0fb0d6 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
41deff0d6a 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
7c80e30254 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
98ca8daf09 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
055ec439aa RM-5645 - removed unused method and made review changes on ui tests 2017-10-09 19:50:25 +03:00
Rodica Sutu
69ee38229f 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
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