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,516 Commits 324 Branches 2,170 Tags
3609b0a3f15b8ed10df131ce63e810c053cff07d
Commit Graph

350 Commits

Author SHA1 Message Date
Tuna Aksoy
3609b0a3f1 RM-4586 (Record can be declared a record) / RM-4587 (Folder in collaboration site can be declared a record) 2017-01-09 11:59:27 +00:00
Ana Bozianu
0f00c63ac1 RM-4436 and RM-4549 - unit tests for record api 2017-01-04 17:57:10 +02:00
Tuna Aksoy
3d7661746c Updated license headers 2017-01-01 11:52:56 +00:00
Oana Nechiforescu
6cd060ae9c Merge merge/upgradeTestDataFrom25 into master. 2016-12-23 13:38:53 +02:00
Oana Nechiforescu
1ba70727ae Merge branch 'release/V2.5' of https://gitlab.alfresco.com/records-management/records-management into merge/upgradeTestDataFrom25 
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
 2016-12-22 15:29:10 +02:00
Tuna Aksoy
6b7bdc03a4 Merge branch 'feature/FileAndDeclareApi' 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/RecordsEntityResource.java
 2016-12-20 20:51:33 +00:00
Mihai Cozma
0a1812ef4f MNT 16971 Unable to set an read only alfresco rm 
- remove commented code
 2016-12-19 16:01:52 +02:00
Mihai Cozma
7bb51b1522 MNT-16971 Unable to set read only using property server.allowWrite=false 
-fix transactions permission 
-fix document library view
 2016-12-19 15:52:26 +02:00
Ana Bozianu
6a45a6dab6 RM-4436 - implemented file record 
RM-4429 - implemented declare record
-renamed the nodes package into fileplancomponents
 2016-12-17 23:22:12 +02:00
Ana Bozianu
94325534fc RM-4418 - added comments and localization 2016-12-16 14:27:01 +02:00
Ana Bozianu
fb6a1c9946 RM-4418 - removed posibility to update content 2016-12-16 11:39:11 +02:00
Ana Bozianu
87f2c99a4a RM-4528 - extract original exception so it can be properly mapped to api error code 2016-12-10 14:01:16 +02:00
Ana Bozianu
6202a68e58 RM-4359 - added mandatory check and javadoc 2016-11-29 17:44:44 +02:00
Ana Bozianu
c13cbfaed0 RM-4359 - added records endpoint with get/update content requests 2016-11-25 17:36:29 +02:00
Tuna Aksoy
39642b39a8 RM-4399 (Update Alfresco dependency for RM Community to 5.2.b) 2016-11-23 19:43:25 +00:00
Ana Bozianu
5b055daff3 RM-4360 - added documentation and fixed an error code 2016-11-23 17:31:39 +02:00
Ana Bozianu
9fc4a32454 RM-4376 - create RM relative path + unit tests 2016-11-21 17:11:37 +02: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
a15ff96e25 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +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
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
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
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
Silviu Dinuta
7753ccad06 RM-4327: changed InvalidParameterException with IntegrityException 2016-11-10 16:58:05 +02:00