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
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
Oana Nechiforescu
1dbf09f994 Merge branch 'merge-2.3/Merge231ReleaseIn23' into 'release/V2.3' 
Merge 2.3/merge231 release in23

Merging 2.3.1 in 2.3

See merge request !623
 2016-11-11 15:45:18 +00:00
Tom Page
26e245b3f2 Merge release/V2.3.1.x into merge-2.3/Merge231ReleaseIn23. 2016-11-11 15:40:47 +00:00
Tom Page
46230c1181 Remove spurious temp file. 2016-11-11 15:39:37 +00: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
a2d5d6ec11 Merge branch 'merge/RM-4247_UpdateDispositionProperty' into 'master' 
Merge/rm 4247 update disposition property

RM-4247 Update retention periods when the period property changes in the definition.

See merge request !619
 2016-11-11 14:24:09 +00:00
Rodica Sutu
7aacdaa1d9 -updates on Record Folder CRUD API's tests 2016-11-11 16:18:51 +02:00
Mihai Cozma
1bb8521f60 Merge branch 'release/V2.5' of gitlab.alfresco.com:records-management/records-management into release/V2.5 2016-11-11 14:46:24 +02:00
Oana Nechiforescu
071e1b3214 Merge commit 'c03c6da96' into merge-2.3/Merge231ReleaseIn23 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-server/pom.xml
#	rm-share/pom.xml
 2016-11-11 14:40:57 +02:00
Kristijan Conkas
90f75e061a Merge branch 'feature/RM-4366_FilePlanComponent_Path' into 'master' 
Feature/rm 4366 file plan component path

This MR adds path handling.

See merge request !10
 2016-11-11 11:53:14 +00:00
Kristijan Conkas
e4feb0d484 RM-4366: added path field 2016-11-11 11:11:45 +00:00
Ana Bozianu
bea6aff38c read only merge 2.5.0.2 to master 2016-11-11 12:39:33 +02:00
Ana Bozianu
f43b90b915 merge release/V2.5 into master to bring 2.5.0.2 read only merge 2016-11-11 12:35:53 +02:00
Ana Bozianu
6160e413e0 read only merge release/V2.5.0.x into release/V2.5. 
2.5.0.x changes have been commited in 55fd1ec
 2016-11-11 12:32:10 +02:00
Tom Page
99acb9351c RM-4247 Merge master into RM-4247_UpdateDispositionProperty. 2016-11-11 08:21:58 +00:00
Tom Page
2dada54816 Merge branch 'merge/RM-4264_RelationshipDialog' into 'master' 
Merge/rm 4264 relationship dialog

RM-2526, RM-4264 Merge release/V2.5 into master.

See merge request !622
 2016-11-11 08:15:55 +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
Silviu Dinuta
7753ccad06 RM-4327: changed InvalidParameterException with IntegrityException 2016-11-10 16:58:05 +02:00
Tom Page
fdf6b2055c RM-2526, RM-4264 Merge release/V2.5 into master. 2016-11-10 14:02:56 +00:00
Tom Page
141927d001 Merge branch 'merge-2.5/RM-4264_RelationshipDialog' into 'release/V2.5' 
Merge 2.5/rm 4264 relationship dialog

RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.

See merge request !620
 2016-11-10 13:58:09 +00:00
Silviu Dinuta
579ebdd2df Merge branch 'feature/RM-4326' into 'master' 
Feature/rm 4326

See merge request !607
 2016-11-10 13:52:39 +00:00
Silviu Dinuta
0f8dd6f0e8 RM-4326: added some comments 2016-11-10 15:51:05 +02:00
Tom Page
9a66a6cf8c RM-4247 Re-add changes that were meant to be merged from release/V2.5. 
The merge in '5f75e3' missed the changes from RM-4247, so this commit adds
them back in.
 2016-11-10 13:14:33 +00:00
Ana Bozianu
033cd63dd1 Merge branch 'feature/RM-4330_UpdateReadOnlyPropertyReturnsWrongCode' into 'master' 
Feature/rm 4330 update read only property returns wrong code

RM-4330 - Updating read only field returns 500 internal server error

Changed the returned code when updating read only property

See merge request !618
 2016-11-10 12:24:57 +00:00
Ana Bozianu
796a003392 RM-4330 - changed the code from internal server error to integrity exception 2016-11-10 14:15:51 +02:00
Tom Page
4e6eae75a3 RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Silviu Dinuta
7eecf55796 Merge master into feature/RM-4326 2016-11-10 11:10:51 +02:00
Silviu Dinuta
35fa9c1e0d RM-4326 : added some more unit tests for RmSiteType and did some code 
cleanup in this class
 2016-11-10 11:04:34 +02:00
Tom Page
1ab4168f05 RM-2526, RM-4264 Merge changes from release/V2.3 to release/V2.4. 2016-11-10 08:17:12 +00:00