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,117 Commits 325 Branches 2,188 Tags
ff31236cd5263f23dda3707fc6496fc49e9b6e8c
Commit Graph

4117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tuna Aksoy
5db6c87580 Merge branch 'feature/RM-4347_Integrate_REST_API_in_UI_Automation' 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/actions/viewaudit/AuditLogPage.java
	rm-automation/src/main/java/org/alfresco/po/rm/console/audit/AuditEvents.java
	rm-automation/src/test/java/org/alfresco/test/TestData.java
	rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java
 2016-11-14 14:42:35 +00:00
Silviu Dinuta
b114b1070f Merge branch 'feature/RM-4327' into 'master' 
Feature/rm 4327

See merge request !621
 2016-11-14 12:09:01 +00:00
Silviu Dinuta
b713fd146b Merge master into feature/RM-4327 2016-11-14 14:08:09 +02:00
Rodica Sutu
051d4afabe Merge branch 'feature/RM-4018_RecordFolder_CRUD_API' into 'master' 
Feature/rm 4018 record folder crud api

MR for the tests from the AC for the Record Folder CRUD API
-tests created
-implement all the required fields for a File Plan Component POJO class
-add some helper method to the BaseTest  class

See merge request !12
 2016-11-14 11:41:09 +00:00
Rodica Sutu
03be67b073 updates after review 2016-11-14 13:35:18 +02:00
Silviu Dinuta
0baf2c7d62 Merge branch 'feature/4368_change_sites_into_ig-sites' into 'master' 
Feature/4368 change sites into ig sites

See merge request !11
 2016-11-14 10:55:56 +00:00
Silviu Dinuta
e373b31f0f Merge branch 'feature/RM-4368' into 'master' 
Feature/rm 4368

See merge request !626
 2016-11-14 10:55:38 +00:00
Rodica Sutu
629006a874 Merge branch 'master' of https://gitlab.alfresco.com/records-management/rm-rest-api-automation into feature/RM-4018_RecordFolder_CRUD_API 2016-11-14 12:42:28 +02:00
Silviu Dinuta
709b6d7d13 RM-4368: changed links from sites to ig-sites 2016-11-14 12:27:27 +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
Rodica Sutu
4aa72d4591 update the response status code for createFilePlanSpecialContainerWhenExists() to 422 2016-11-14 11:00:12 +02:00
Rodica Sutu
71de2f3697 add comments, tidy up the code 2016-11-14 10:40:16 +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
Tuna Aksoy
61f6c2a0d1 Fixed Alfresco installer host 2016-11-13 21:52:33 +00:00
Tuna Aksoy
cde04c5d78 RM-4347 (Integrate rm-rest-api-automation in rm-ui-automation) 2016-11-13 19:05:34 +00:00
Tuna Aksoy
a7996cf7fd RM-4347 (Integrate rm-rest-api-automation in rm-ui-automation) 2016-11-12 23:18:48 +00:00
Tuna Aksoy
55c5aa11a4 RM-4347 (Integrate rm-rest-api-automation in rm-ui-automation) 2016-11-11 21:32:04 +00:00
Ana Bozianu
a5da3040d7 RM-4357 - defined allowable operations using RM's capabilities 2016-11-11 18:30:14 +02:00