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,433 Commits 324 Branches 2,170 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ana Bozianu
c782ce305b RM-4373 - added filling condition for editing transfer container and transfer nodes 2016-11-16 16:40:53 +02:00
Ana Bozianu
2248e99b67 RM-4357 - updated unit tests 2016-11-16 16:19:16 +02:00
Oana Nechiforescu
cba57bc0bb 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
b192bd6d3f RM-4293: added integration test for testing special containers through 
java api
 2016-11-16 15:40:37 +02:00
Ana Bozianu
f441ab71dd 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
Ana Bozianu
7b328dfa6c RM-4373 - made transfer and hold containers editable 2016-11-16 15:26:52 +02:00
Silviu Dinuta
8b172ac8e9 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
5262f62ed2 RM-4023: javadoc + minor code tidy-up 2016-11-16 11:59:23 +00:00
Kristijan Conkas
837d7e22c6 RM-4023: Delete test 2016-11-16 11:52:22 +00:00
Silviu Dinuta
9a51183297 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
d991e65d6c RM-4023: better check for PUT request 2016-11-15 17:12:00 +00:00
Silviu Dinuta
51f99f1846 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
b78970484e RM-4023: edit tests 2016-11-15 16:59:14 +00:00
Kristijan Conkas
07ad6dc1d7 RM-4023: Unfiled records folders tests 2016-11-15 16:33:48 +00:00
Oana Nechiforescu
66873aa7e6 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
dbf806c275 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
Roxana Lucanu-Ghetu
aedcf1fa53 RM-4083 - handle hierarchical marks 2016-11-15 11:09:32 +02:00
Ana Bozianu
7a27840a47 RM-4357 - added spcial container check for update 2016-11-15 10:47:11 +02:00
Tuna Aksoy
13880ba2bf Merged remote tracking branch RM REST API Automation 2016-11-14 19:31:27 +00:00
Ana Bozianu
a867a9618a RM-4357 - change addChildren capability and updated unit tests 2016-11-14 18:16:04 +02:00
Mihai Cozma
3f7a3e2be1 RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT 2016-11-14 17:33:34 +02:00