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,990 Commits 325 Branches 2,188 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ana Bozianu
470dbbb5a5 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
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
Mihai Cozma
ea968cf07f RM-4320 Upgrade RM 2.5.1 to Alf 5.2 2016-11-16 16:53:15 +02:00
Ana Bozianu
0d43730633 RM-4373 - added filling condition for editing transfer container and transfer nodes 2016-11-16 16:40:53 +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
Ana Bozianu
8d7b60419c RM-4373 - made transfer and hold containers editable 2016-11-16 15:26:52 +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
Roxana Lucanu-Ghetu
5f2aceef43 RM-4083 - handle hierarchical marks 2016-11-15 11:09:32 +02: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