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
gbroadbent
5867bd4ea9 NORWEGIAN Bokmal: 2.6 community version updated Norwegian Bokmal bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:33:56 +00:00
gbroadbent
1ec0fb1040 ITALIAN: 2.6 community version updated Italian bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:32:54 +00:00
gbroadbent
902814d86e FRENCH: 2.6 community version updated French bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:31:45 +00:00
gbroadbent
47dd9f8e58 SPANISH: 2.6 community version updated Spanish bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:30:56 +00:00
gbroadbent
4ce18275aa GERMAN: 2.6 community version updated German bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:30:08 +00:00
Tom Page
01c52bc89b RM-5755 Add UI test for using instruction without marks. 
Also tidy up data after tests have run.
 2017-11-02 11:18:17 +00:00
David Webster
bf1805f253 Merge branch 'feature/RM-5625_ClassificationActionDocumentDetails' into 'master' 
Feature/rm 5625 classification action document details

See merge request !612
 2017-10-31 14:03:44 +00:00
Ana Bozianu
2215101e4a Feature/rm 5625 classification action document details 2017-10-31 14:03:44 +00:00
Rodica Sutu
661e07b478 Merge branch 'feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no' into 'master' 
Feature/rm 5787 classify in place record api tests no

See merge request !661
 2017-10-31 12:35:42 +00:00
Rodica Sutu
491ec863c6 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no 2017-10-31 14:34:24 +02:00
Tom Page
575df8091d Merge branch 'feature/RM-5755_RESTTestsPartialClearance_cg' into 'master' 
Feature/rm 5755 rest tests partial clearance cg

See merge request !658
 2017-10-31 11:49:10 +00:00
Rodica Sutu
66bd019080 fix formatting errors 2017-10-30 15:54:46 +02:00
Rodica Sutu
c6fcb975c6 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-5787_ClassifyInPlaceRecord_API_Tests_no 2017-10-30 15:35:26 +02:00
Sara Aspery
8f39d1bdfa Merge branch 'feature/RM-5723_EditClassificationPossibleForPostRequest' into 'master' 
Feature/rm 5723 edit classification possible for post request

See merge request !627
 2017-10-29 17:51:46 +00:00
Sara Aspery
c1acc0fb9a Merge branch 'master' into feature/RM-5723_EditClassificationPossibleForPostRequest 2017-10-27 10:20:00 +01:00
Sara Aspery
51a7c61f59 Merge branch 'master' into feature/RM-5723_EditClassificationPossibleForPostRequest 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/securitymarks/UpdateSecurityMarksPolicyTest.java
 2017-10-27 10:16:13 +01:00
Tom Page
89a15747ad RM-5755 Create a common test utility class to be shared by REST and UI tests. 2017-10-27 09:20:29 +01:00
Rodica Sutu
4d592ac9eb 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
49218865c0 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
b020ff8dcc 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
8e866c28b1 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
78158057f1 Feature/rm 5617 classify complete record with power user sm 2017-10-27 07:54:20 +01:00
Rodica Sutu
4ce93afc42 review changes 2017-10-27 09:46:08 +03:00
Rodica Sutu
c6e7671ba6 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
6f2ccf3a98 RM-5792 Minor fixes to CONTRIBUTING.md. 2017-10-26 10:34:34 +01:00
Rodica Sutu
77cdbdd142 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
e899df4c71 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
53573ba73e 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
6b3a552c31 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
7428a13f55 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
8ea2d63fe0 Add tests to cover RM-5617 2017-10-25 15:40:44 +03:00
Ross Gale
5107b2ce20 RM-5792 adding first draft on contributing doc 
Mirrored from community commit 7e2df793a0d4b5a41ef35fe2786066cc94e1158e
 2017-10-24 16:15:56 +01:00
Ana Bozianu
e6a54af4a7 RM-5617 - added integration test and fixed small issues discovered in the process 2017-10-24 17:30:39 +03:00
Ross Gale
96498ee7b0 RM-5792 Adding in placeholder 
Mirrored from community commit 146eba847fe1472df2dc2d5cd51e1b828a6844c8
 2017-10-20 11:50:29 +01:00
Rodica Sutu
cc5c0e126d test fixes 2017-10-13 16:42:31 +03:00
Rodica Sutu
2d06367dd9 fix failing tests from Enterprise REST API 2017-10-13 14:08:21 +03:00
Rodica Sutu
e6c88f386a 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
078b6b6768 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
483fef4c75 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
7d6ec75bf6 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
f5b5da481d 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
c2f87d6ddf 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
b561c8f785 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
85fc77529a 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
877c91ec62 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
087cb22097 RM-5645 - removed unused method and made review changes on ui tests 2017-10-09 19:50:25 +03:00
Rodica Sutu
744457b8bd 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
9073334fe5 RM-5645 - review changes 2017-10-09 16:53:10 +03:00
Rodica Sutu
cf6e4d2567 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
80f1fc9101 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