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
4,117 Commits 325 Branches 2,188 Tags
ff31236cd5263f23dda3707fc6496fc49e9b6e8c
Commit Graph

4117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
9fc4a32454 RM-4376 - create RM relative path + unit tests 2016-11-21 17:11:37 +02:00
Roxana Lucanu-Ghetu
a4622c46fe Merge branch 'feature/RM-4083_OrphanedHierarchicalMarks' into 'master' 
Feature/rm 4083 orphaned hierarchical marks

Added functionality to prevent orphaned hierarchical marks.

See merge request !644
 2016-11-21 12:05:26 +00:00
Mihai Cozma
92ea428423 RM 4320 Min Alfresco Repo Version should be 5.1.1 not 
5.2.(alfresco.version)
 2016-11-21 13:27:46 +02:00
Tuna Aksoy
c58a106815 Merge branch 'feature/RM-4394_Add_RM_REST_API_Explorer_to_RM_Repo' into 'master' 
Feature/rm 4394 add rm rest api explorer to rm repo

See merge request !646
 2016-11-21 10:06:27 +00:00
Tuna Aksoy
171489d389 RM-4394 (Add RM REST API Explorer project into Records Management Repo) 2016-11-21 10:03:16 +00:00
Tuna Aksoy
98121398bb RM-4394 (Add RM REST API Explorer project to Records Management Repo) 2016-11-20 18:30:00 +00:00
Roxana Lucanu-Ghetu
4a7154dbfb Merge branch 'origin/feature/RM-3347_checkExclusiveClearanceHierarchicalMarks' into master 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/rm-query-context.xml
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/EnterpriseRecordsManagementQueryDAOImpl.java
 2016-11-18 15:15:45 +02:00
Ana Bozianu
194234956a Merge branch 'feature/RM-4357_and_RM_4373' into 'master' 
Feature/rm 4357 and rm 4373

Merge branch for RM-4357 and RM-4373. Original merge requests:
- RM-4357 : https://gitlab.alfresco.com/records-management/records-management/merge_requests/624
- RM-4373 : https://gitlab.alfresco.com/records-management/records-management/merge_requests/631

this merge contains conflict fixes and test fixes for both RM-4357 and RM-4373

See merge request !641
 2016-11-18 12:18:03 +00:00
Ana Bozianu
50896cc6e8 Merge master into feature/RM-4357_and_RM_4373 2016-11-18 14:15:53 +02:00
Ana Bozianu
2130acec01 Merge branch 'feature/RM-4375_WrongErrorForDuplicateRMIdentifier' into 'master' 
Feature/rm 4375 wrong error for duplicate rm identifier

RM-4375 - Handling duplicate "rma:identifier" values in POST /fileplan-components/{fileplanComponentId}/children

DuplicateAttributeException was not mapped to an error code in core. I extended the exception mapper so we ca add our custom mapping.

See merge request !643
 2016-11-18 10:26:41 +00:00
Ana Bozianu
7e809b55cd RM-4375 - extended the exception mapper from core to map our custom exceptions to HTTP error codes 2016-11-18 11:58:24 +02:00
Tuna Aksoy
119236a0d9 Added existsRMSite method to RMSiteAPI 2016-11-17 20:57:17 +00:00
Tuna Aksoy
5a10944ae4 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 
Conflicts:
	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/RMSiteAPI.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java
 2016-11-17 20:41:02 +00:00
Tuna Aksoy
2fd95c79f7 Changed package name org.alfresco.rest.rm to org.alfresco.rest.rm.community for RM Community REST API Automation project 2016-11-17 19:51:37 +00:00
Tuna Aksoy
d8b8e48203 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 2016-11-17 12:58:18 +00:00
Tuna Aksoy
d89e067366 Fixed compilation issue due to licence header changes in RM Community REST API Automation project 2016-11-17 12:51:09 +00:00
Ana Bozianu
a15ff96e25 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Tuna Aksoy
99acf8b81f Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 
Conflicts:
	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
 2016-11-17 12:31:37 +00:00
Tuna Aksoy
5372feb5bb Merge branch 'feature/RM-4347_Add_License_Header' into 'master' 
Feature/rm 4347 add license header

See merge request !636
 2016-11-17 12:22:46 +00:00
Tuna Aksoy
87748e048e Merge branch 'feature/RM_4347_Restructure_RM_Projects' into 'master' 
Feature/rm 4347 restructure rm projects

See merge request !637
 2016-11-17 12:22:31 +00:00
Tuna Aksoy
d9e71a0101 Integrate RM Community REST API Automation into RM UI Automation 2016-11-17 12:21:52 +00:00
Ana Bozianu
888684e519 RM-4357 - fixed allowable operations automation test 2016-11-17 13:50:09 +02:00
Mihai Cozma
657d89e6d1 Merge branch 'feature-2.5/MergeV2.5_to_master' into 'master' 
Feature 2.5/merge v2.5 to master

See merge request !634
 2016-11-17 11:44:18 +00:00
Ana Bozianu
537b7c78cf RM-4357 - updated test for fileplan create operation check 2016-11-17 13:01:25 +02:00
Rodica Sutu
836c642034 Merge branch 'feature/RM-4367_RecordCategoryAcceptOnly' into 'master' 
Feature/rm 4367 record category accept only

Test created to  cover the issue https://issues.alfresco.com/jira/browse/RM-4367

See merge request !640
 2016-11-17 09:43:58 +00:00
Ana Bozianu
0ced52873b RM-4357 - delete unused methods after merge 2016-11-17 11:38:17 +02:00
Ana Bozianu
a05bcdb34c Merge master into feature/RM-4357_and_RM_4373 2016-11-17 11:37:04 +02:00
Kristijan Conkas
3711462264 Merge branch 'feature/RM-4023_UnfiledRecordFolderAPITests' into 'master' 
Feature/rm 4023 unfiled record folder api tests

Unfiled records folder API tests.

See merge request !630
 2016-11-17 09:30:36 +00:00
Rodica Sutu
456bb8a170 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-4367_RecordCategoryAcceptOnly 2016-11-17 11:30:14 +02:00
Kristijan Conkas
2f517a5b0e Merge remote-tracking branch 'origin/master' into feature/RM-4023_UnfiledRecordFolderAPITests 2016-11-17 09:29:57 +00:00
Rodica Sutu
e6cc9d2bd2 add the bug id 2016-11-17 11:29:47 +02:00
Silviu Dinuta
734c1b2a82 Merge branch 'feature/RM-4293_RM_special_containers_can_be_deleted' into 'master' 
Feature/rm 4293 rm special containers can be deleted

See merge request !628
 2016-11-17 09:26:47 +00:00
Kristijan Conkas
045cf50ec1 RM-4023: fixed CI findings 2016-11-17 09:23:35 +00:00
Ana Bozianu
d786137ba2 Merge feature/RM-4373_SpecialContainersEditable into feature/RM-4357_and_RM_4373 2016-11-17 11:13:48 +02:00
Ana Bozianu
bf1390f0ab Merge feature/RM-4357_AllowableOperations into feature/RM-4357_and_RM_4373 2016-11-17 11:11:04 +02:00
Silviu Dinuta
e2659aa356 Merge remote-tracking branch 'origin/master' into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 11:10:28 +02:00
Ana Bozianu
94d37e28be Revert "Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"" 
This reverts commit 4d3703ba10.
 2016-11-17 11:07:21 +02:00
Ana Bozianu
ee1a24f647 Revert "Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"" 
This reverts commit 521a0689a3.
 2016-11-17 11:07:14 +02:00
Ana Bozianu
7cda753a01 Merge master into feature/RM-4357_AllowableOperations 2016-11-17 11:04:37 +02:00
Silviu Dinuta
93674c191d Merge master into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 10:53:25 +02:00
Ana Bozianu
521a0689a3 Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit 9b658e2452, reversing
changes made to 3e1d740d76.
 2016-11-17 10:52:40 +02:00
Ana Bozianu
4d3703ba10 Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit 20e9fc986b, reversing
changes made to efe4165c9d.
 2016-11-17 10:52:00 +02:00
Silviu Dinuta
cad88f8679 RM-4293: review updates 2016-11-17 10:45:58 +02:00
Ana Bozianu
b026f86f67 Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 10:35:46 +02:00
Ana Bozianu
20e9fc986b Merge branch 'feature/RM-4357_AllowableOperations' into 'master' 
Feature/rm 4357 allowable operations

trivial fix for allowable operation bug

See merge request !638
 2016-11-17 08:31:43 +00:00
Ana Bozianu
1cfc8e93d6 RM-4357 - allow create children for fileplan 2016-11-17 10:26:58 +02:00
Oana Nechiforescu
efe4165c9d Merge branch 'merge/Merge231ReleaseToMaster' into 'master' 
Merge/merge231 release to master

See merge request !635
 2016-11-17 08:09:12 +00:00
Rodica Sutu
6e7720e9a7 minor updates 2016-11-17 10:07:11 +02:00
Ana Bozianu
df2d0f9b53 Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 09:44:50 +02:00
Ana Bozianu
9b658e2452 Merge branch 'feature/RM-4357_AllowableOperations' into 'master' 
Feature/rm 4357 allowable operations

RM-4357 - fileplanComponent's allowable actions don't reflect RM security

RM's capabilities overrides core's security so it is enough to test the capabilities. Please see the table from the issue's comment.

See merge request !624
 2016-11-17 07:33:42 +00:00