inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,990 Commits 335 Branches 2,191 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

1278 Commits

Author SHA1 Message Date
Tuna Aksoy
bd6c29f688 Merge branch 'feature/RM-4369_LackOfApiSpecificationOnCreate' into 'master' 
Feature/rm 4369 lack of api specification on create

- added information about how to use properties and relative path in RM
- added how to set aspects but didn't provided examples as I don't think we should encourage the user to set aspects directly
- removed association, secondaryChildren and target from the documentation because I couldn't think of a scenario where we could use them in RM

please advise!

See merge request !649
 2016-11-21 21:00:43 +00:00
Ana Bozianu
40b9a706f1 RM-4369 - removed statement as there are no existing aspects when creating a node 2016-11-21 22:03:54 +02:00
Ana Bozianu
592acfc15a RM-4369 - added information about aspects, properties and relative path and removed association, secondaryChildren and targets 2016-11-21 21:54:03 +02:00
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
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
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
Ana Bozianu
a15ff96e25 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Ana Bozianu
537b7c78cf RM-4357 - updated test for fileplan create operation check 2016-11-17 13:01:25 +02: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
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
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
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
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
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
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
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
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
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
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
Ana Bozianu
dd86bd3cc7 RM-4357 - change addChildren capability and updated unit tests 2016-11-14 18:16:04 +02:00
Mihai Cozma
0b0094af84 RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT 2016-11-14 17:33:34 +02:00
Oana Nechiforescu
28b213a1ec Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24 
# Conflicts:
#	rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
#	rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
#	rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
#	rm-automation/src/test/java/org/alfresco/test/TestData.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java
#	rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java
#	rm-automation/src/test/resources/coreTests.xml
#	rm-automation/src/test/resources/testng.xml
 2016-11-14 17:17:45 +02:00
Silviu Dinuta
b713fd146b Merge master into feature/RM-4327 2016-11-14 14:08:09 +02:00
Silviu Dinuta
562b751345 RM-4368: change entity resource name from sites to ig-sites 2016-11-14 12:20:18 +02:00
Silviu Dinuta
7c4b03e9f4 RM-4327: extracted error messages for type restrictions in 
action.service.properties
 2016-11-14 11:21:32 +02:00
Silviu Dinuta
6891845cb3 RM-4367: restricted types created under record category and added unit 
tests for RecordCategoryType
 2016-11-14 10:20:00 +02:00
Ana Bozianu
a5da3040d7 RM-4357 - defined allowable operations using RM's capabilities 2016-11-11 18:30:14 +02:00
Silviu Dinuta
b31a075324 RM-4327: changed exception type on RecordFolderType and added unit tests 
for the changes
 2016-11-11 17:39:01 +02:00
Tom Page
99acb9351c RM-4247 Merge master into RM-4247_UpdateDispositionProperty. 2016-11-11 08:21:58 +00:00
Mihai Cozma
2377d8e520 Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master' 
Feature/rm 4329 alfreco search in colaboration site doesn't work

See merge request !616
 2016-11-11 09:50:21 +02:00