inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,283 Commits 330 Branches 2,178 Tags
5a10944ae4138781b51e4426b0460cb9db13b0ab
Commit Graph

3283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Tuna Aksoy
3c585c4f5b RM-4347: Added license header 2016-11-16 22:46:27 +00:00
Tuna Aksoy
52b2e14e08 RM-4347 (Restructure RM Projects) 2016-11-16 22:18:42 +00:00
Tuna Aksoy
3e1d740d76 RM-4378: Changed @since value from 1.0 to 2.6 2016-11-16 22:01:38 +00:00
Oana Nechiforescu
ad40d62807 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
6410b30011 New test for RM-4367 2016-11-16 17:14:39 +02:00
Silviu Dinuta
8d677d6a8d RM-4293: after discussion with Ana for delete we need filing condition 2016-11-16 17:14:00 +02:00
Mihai Cozma
c785a2ba17 Merge remote-tracking branch 'origin/release/V2.5' into feature/MergeV2.5_to_master 2016-11-16 17:05:28 +02:00
Ana Bozianu
87f0391922 RM-4357 - updated unit tests 2016-11-16 16:19:16 +02:00
Oana Nechiforescu
b1874a363b Merge branch 'merge-2.5/Merge231ReleaseIn25' into 'release/V2.5' 
Merge 2.5/merge231 release in25

See merge request !629
 2016-11-16 14:05:52 +00:00
Silviu Dinuta
f3626a28a8 RM-4293: added integration test for testing special containers through 
java api
 2016-11-16 15:40:37 +02:00
Ana Bozianu
abcfede1ae RM-4357 - updated allowable operations to reflect the edit permissions changes for special containers made in RM-4373 2016-11-16 15:33:11 +02:00
Silviu Dinuta
bee71d2dbd RM-4293: created capabilities for deleting transfer container and hold 
container and restricted the deletion from behaviour beans
 2016-11-16 15:09:58 +02:00
Kristijan Conkas
dd5bef1df7 RM-4023: javadoc + minor code tidy-up 2016-11-16 11:59:23 +00:00
Kristijan Conkas
1cd8d361b9 RM-4023: Delete test 2016-11-16 11:52:22 +00:00
Silviu Dinuta
7d884e857c Merge branch 'feature/RM-4293' into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-15 19:25:42 +02:00
Kristijan Conkas
757d900c56 RM-4023: better check for PUT request 2016-11-15 17:12:00 +00:00
Silviu Dinuta
7ab2f753ad RM-4293: prevent filePlan and unfiled Record container from behaviour 
beans, also removed deleteNode method from RMNodesImpl and some unit
tests
 2016-11-15 19:00:48 +02:00
Kristijan Conkas
423fe1e27e RM-4023: edit tests 2016-11-15 16:59:14 +00:00
Kristijan Conkas
aa66d01816 RM-4023: Unfiled records folders tests 2016-11-15 16:33:48 +00:00
Oana Nechiforescu
a40fb40951 Merge remote-tracking branch 'origin/release/V2.4' into merge-2.5/Merge231ReleaseIn25 
# Conflicts:
#	rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
#	rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/category/DispositionBlock.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/record/RecordActionsPanel.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/DeleteRelationshipPrompt.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/SelectRecordDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
#	rm-automation/src/main/java/org/alfresco/po/share/page/Message.java
#	rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
#	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/src/test/java/org/alfresco/test/TestData.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/BrowseClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/ClassifyRecord.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/EditClassification.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedDocuments.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
 2016-11-15 18:04:48 +02:00
Oana Nechiforescu
9819160b0c Merge branch 'merge-2.4/Merge231AfterReleaseIn24' into 'release/V2.4' 
Merge 2.4/merge231 after release in24

See merge request !627
 2016-11-15 10:44:07 +00:00
Ana Bozianu
14cde7a0f4 RM-4357 - added spcial container check for update 2016-11-15 10:47:11 +02:00
Tuna Aksoy
9b73c7ada1 Merged remote tracking branch RM REST API Automation 2016-11-14 19:31:27 +00:00
Ana Bozianu
dd86bd3cc7 RM-4357 - change addChildren capability and updated unit tests 2016-11-14 18:16:04 +02:00