Commit Graph

4117 Commits

Author SHA1 Message Date
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
Mihai Cozma
aafd4b1ef8 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-09 17:02:14 +00:00
Silviu Dinuta
b67a8878a9 RM-4326: renamed rm site type unit test class 2016-11-09 16:52:17 +02:00
Silviu Dinuta
7685a5e36d RM-4326: added unit tests for RmSiteType class 2016-11-09 16:35:51 +02:00
Tom Page
1476e389d6 Update version to 2.3.1.1-SNAPSHOT. 2016-11-09 13:48:25 +00:00
Tom Page
0a423f1660 Update version to 2.3.1. 2016-11-09 13:17:00 +00:00
Silviu Dinuta
c9839ae3c4 Merge remote-tracking branch 'origin/master' into feature/RM-4326 2016-11-09 14:51:25 +02:00
Silviu Dinuta
5e7be6cc5f RM-4326: minor fix 2016-11-09 14:48:49 +02:00
Ana Bozianu
3fec0260d1 read-only merge release/V2.5 into master 2016-11-09 14:45:37 +02:00
Ana Bozianu
55fd1ec3c6 Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5 2016-11-09 14:41:13 +02:00
Mihai Cozma
955cddbc3c RM-4329 Update rmsearch to the latest core search version 2016-11-09 14:18:53 +02:00
Silviu Dinuta
699021b8e0 RM-4326: extracted non unique types in a constant for RmSyteType create
association check
2016-11-09 13:27:33 +02:00
Silviu Dinuta
da408b7459 RM-4326: undo some formatting 2016-11-09 12:53:53 +02:00
Silviu Dinuta
0b656e544a RM-4326: undo some formatting 2016-11-09 12:51:14 +02:00
Silviu Dinuta
94e8664129 RM-4326: removed checkPostPermission method and changed RmSyteType to
handle allowed created types
2016-11-09 12:44:19 +02:00
Tom Page
9d6bbe9cd2 Merge branch 'merge-2.5/RM-4247_UpdateDispositionProperty' into 'release/V2.5'
Merge 2.5/rm 4247 update disposition property

RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.

See merge request !609
2016-11-09 08:09:45 +00:00
Silviu Dinuta
338ec3f172 RM-4326: undo some formatting 2016-11-08 20:47:10 +02:00
Silviu Dinuta
9746ee9ff3 RM-4326: allow creation under hold type only from HoldServiceImpl 2016-11-08 20:40:51 +02:00
Silviu Dinuta
18e86553de RM-4326: undo some formatting 2016-11-08 18:44:42 +02:00
Silviu Dinuta
e999b68586 RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:41:15 +02:00
Silviu Dinuta
c6ca74ab26 RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:38:35 +02:00
Silviu Dinuta
ce367f79a3 RM-4326: adjusted unit test name for transferContainerType 2016-11-08 17:42:06 +02:00
Silviu Dinuta
57203f853a RM-4326: undo some formatting 2016-11-08 17:36:21 +02:00