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
3,908 Commits 324 Branches 2,170 Tags
988f3d51a2fe73c12a73e19e2ece9a6b7c16144c
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
d4668b19b2 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
b045c512a3 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
c55a2634c0 Added existsRMSite method to RMSiteAPI 2016-11-17 20:57:17 +00:00
Tuna Aksoy
05313ff05b 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
0a1c6340e2 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
fba1676c85 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 2016-11-17 12:58:18 +00:00
Tuna Aksoy
7fece7a20c 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
28026941c3 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Tuna Aksoy
65cbccb630 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
c9bc69c843 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
55b4b0b070 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
b2ee0adb7e Integrate RM Community REST API Automation into RM UI Automation 2016-11-17 12:21:52 +00:00
Ana Bozianu
d42dc63664 RM-4357 - fixed allowable operations automation test 2016-11-17 13:50:09 +02:00
Mihai Cozma
328cc842c7 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
c8f6bfe333 RM-4357 - updated test for fileplan create operation check 2016-11-17 13:01:25 +02:00
Rodica Sutu
aca34250f2 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
d10fcea5fa RM-4357 - delete unused methods after merge 2016-11-17 11:38:17 +02:00
Ana Bozianu
3bb40fb88c Merge master into feature/RM-4357_and_RM_4373 2016-11-17 11:37:04 +02:00
Kristijan Conkas
daf84543f1 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
8c2519c95a 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
1a2fa548fe Merge remote-tracking branch 'origin/master' into feature/RM-4023_UnfiledRecordFolderAPITests 2016-11-17 09:29:57 +00:00
Rodica Sutu
bf19433949 add the bug id 2016-11-17 11:29:47 +02:00
Silviu Dinuta
135c4e04e0 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
c5560f24db RM-4023: fixed CI findings 2016-11-17 09:23:35 +00:00
Ana Bozianu
c22a5243c7 Merge feature/RM-4373_SpecialContainersEditable into feature/RM-4357_and_RM_4373 2016-11-17 11:13:48 +02:00
Ana Bozianu
0e8f15dddc Merge feature/RM-4357_AllowableOperations into feature/RM-4357_and_RM_4373 2016-11-17 11:11:04 +02:00
Silviu Dinuta
9f7d772ac5 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
a4dafd56b0 Revert "Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"" 
This reverts commit ba9807118c.
 2016-11-17 11:07:21 +02:00
Ana Bozianu
45cbc77ef3 Revert "Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"" 
This reverts commit 54717418e1.
 2016-11-17 11:07:14 +02:00
Ana Bozianu
083ffe2714 Merge master into feature/RM-4357_AllowableOperations 2016-11-17 11:04:37 +02:00
Silviu Dinuta
b660169e6a Merge master into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 10:53:25 +02:00
Ana Bozianu
54717418e1 Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit ab93e7b9c0, reversing
changes made to 0e74642b32.
 2016-11-17 10:52:40 +02:00
Ana Bozianu
ba9807118c Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit ba4c99bbb5, reversing
changes made to 618fb9d4a0.
 2016-11-17 10:52:00 +02:00
Silviu Dinuta
774b9bb00a RM-4293: review updates 2016-11-17 10:45:58 +02:00
Ana Bozianu
6551b12c67 Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 10:35:46 +02:00
Ana Bozianu
ba4c99bbb5 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
0938d8ad4d RM-4357 - allow create children for fileplan 2016-11-17 10:26:58 +02:00
Oana Nechiforescu
618fb9d4a0 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
102d9a6a75 minor updates 2016-11-17 10:07:11 +02:00
Ana Bozianu
5045dd69fa Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 09:44:50 +02:00
Ana Bozianu
ab93e7b9c0 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
Tuna Aksoy
3406a078f7 RM-4347: Added license header 2016-11-16 22:46:27 +00:00
Tuna Aksoy
401d211fa9 RM-4347 (Restructure RM Projects) 2016-11-16 22:18:42 +00:00
Tuna Aksoy
0e74642b32 RM-4378: Changed @since value from 1.0 to 2.6 2016-11-16 22:01:38 +00:00
Ana Bozianu
891f67782a RM-4373 - make transfers non editable because the rule inheritance is disabled on transfer container 2016-11-16 17:40:48 +02:00
Oana Nechiforescu
70ba4da0af Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge231ReleaseToMaster 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
 2016-11-16 17:33:33 +02:00
Rodica Sutu
737d1d15a0 New test for RM-4367 2016-11-16 17:14:39 +02:00
Silviu Dinuta
5202fd8fd6 RM-4293: after discussion with Ana for delete we need filing condition 2016-11-16 17:14:00 +02:00
Mihai Cozma
1fc11b4895 Merge remote-tracking branch 'origin/release/V2.5' into feature/MergeV2.5_to_master 2016-11-16 17:05:28 +02:00
Mihai Cozma
010e79be05 RM-4320 Upgrade RM 2.5.1 to Alf 5.2 2016-11-16 16:53:15 +02:00