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,908 Commits 324 Branches 2,170 Tags
988f3d51a2fe73c12a73e19e2ece9a6b7c16144c
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristijan Conkas
e4feb0d484 RM-4366: added path field 2016-11-11 11:11:45 +00:00
Ana Bozianu
6f8819ae44 read only merge 2.5.0.2 to master 2016-11-11 12:39:33 +02:00
Ana Bozianu
92ad37ea25 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
9e5ab0b6ed read only merge release/V2.5.0.x into release/V2.5. 
2.5.0.x changes have been commited in 10b64c0
 2016-11-11 12:32:10 +02:00
Tom Page
cf6e32ff7e RM-4247 Merge master into RM-4247_UpdateDispositionProperty. 2016-11-11 08:21:58 +00:00
Tom Page
62d9270136 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
375c7e1b13 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
9b0aa770f9 RM-4327: changed InvalidParameterException with IntegrityException 2016-11-10 16:58:05 +02:00
Tom Page
1efc9333e5 RM-2526, RM-4264 Merge release/V2.5 into master. 2016-11-10 14:02:56 +00:00
Tom Page
dff54658ab 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
12589f2a72 Merge branch 'feature/RM-4326' into 'master' 
Feature/rm 4326

See merge request !607
 2016-11-10 13:52:39 +00:00
Silviu Dinuta
3b524477bd RM-4326: added some comments 2016-11-10 15:51:05 +02:00
Tom Page
bae6ca0338 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
3a0c9e3901 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
7cb41b5934 RM-4330 - changed the code from internal server error to integrity exception 2016-11-10 14:15:51 +02:00
Tom Page
a75f2d4a1d RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Silviu Dinuta
b571ad6381 Merge master into feature/RM-4326 2016-11-10 11:10:51 +02:00
Silviu Dinuta
94ec27b0de 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
9ab1024c7b RM-2526, RM-4264 Merge changes from release/V2.3 to release/V2.4. 2016-11-10 08:17:12 +00:00
Mihai Cozma
80d7f94e5e 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
0e93c1dcbe RM-4326: renamed rm site type unit test class 2016-11-09 16:52:17 +02:00
Silviu Dinuta
1d7f8673bb RM-4326: added unit tests for RmSiteType class 2016-11-09 16:35:51 +02:00
Tom Page
d376ae50c3 Update version to 2.3.1.1-SNAPSHOT. 2016-11-09 13:48:25 +00:00
Tom Page
3b75d70ba7 Update version to 2.3.1. 2016-11-09 13:17:00 +00:00
Silviu Dinuta
b6d09e8e98 Merge remote-tracking branch 'origin/master' into feature/RM-4326 2016-11-09 14:51:25 +02:00
Silviu Dinuta
8a8fc1e312 RM-4326: minor fix 2016-11-09 14:48:49 +02:00
Ana Bozianu
e7044b7937 read-only merge release/V2.5 into master 2016-11-09 14:45:37 +02:00
Ana Bozianu
10b64c082c 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
3899fa1d2d RM-4329 Update rmsearch to the latest core search version 2016-11-09 14:18:53 +02:00
Silviu Dinuta
ee5a40a508 RM-4326: extracted non unique types in a constant for RmSyteType create 
association check
 2016-11-09 13:27:33 +02:00
Silviu Dinuta
ddab49bf51 RM-4326: undo some formatting 2016-11-09 12:53:53 +02:00
Silviu Dinuta
49cb2f59ae RM-4326: undo some formatting 2016-11-09 12:51:14 +02:00
Silviu Dinuta
7e06083595 RM-4326: removed checkPostPermission method and changed RmSyteType to 
handle allowed created types
 2016-11-09 12:44:19 +02:00
Tom Page
64f7132913 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
9782ff2757 RM-4326: undo some formatting 2016-11-08 20:47:10 +02:00
Silviu Dinuta
03174c61c4 RM-4326: allow creation under hold type only from HoldServiceImpl 2016-11-08 20:40:51 +02:00
Silviu Dinuta
9a2e543c00 RM-4326: undo some formatting 2016-11-08 18:44:42 +02:00
Silviu Dinuta
6d1fa3408e RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:41:15 +02:00
Silviu Dinuta
0836e9682b RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:38:35 +02:00
Silviu Dinuta
517e3286b2 RM-4326: adjusted unit test name for transferContainerType 2016-11-08 17:42:06 +02:00
Silviu Dinuta
c7f1fcafc8 RM-4326: undo some formatting 2016-11-08 17:36:21 +02:00
Roxana Lucanu-Ghetu
ac8c7388d2 Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526 2016-11-08 17:35:25 +02:00
Silviu Dinuta
fce705ff72 RM-4326: allow creation in transfer container only from 
TransferServiceImpl
 2016-11-08 17:26:07 +02:00
Tom Page
81e1ece309 RM-4247 Merge release/V2.4 into release/V2.5. 2016-11-08 13:25:45 +00:00
Tom Page
11abb8960f Merge branch 'merge-2.4/RM-4247_UpdateDispositionProperty' into 'release/V2.4' 
Merge 2.4/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 !606
 2016-11-08 13:21:55 +00:00
roxana
0282e1af68 Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Silviu Dinuta
c28e0d5338 RM-4326: restricted permission for post request on Transfer Container, 
Transfer Folder type and Hold folder type and added unit tests for the
changes
 2016-11-08 14:16:15 +02:00
Silviu Dinuta
b3aa001eb0 RM-4326: added restriction for types that are accepted to be create in 
unfiled record folder
 2016-11-08 11:42:58 +02:00
Oana Nechiforescu
884947b0e6 Merge branch 'feature-2.3/RM-4313_UpdateDispositionNextActionDateWhenCurrentDateIsInThePast' into 'release/V2.3.1.x' 
Feature 2.3/rm 4313 update disposition next action date when current date is in the past

Update record disposition action as of date if it changed.

See merge request !598
 2016-11-07 21:12:53 +00:00
Tom Page
f70bee356f RM-4247 Merge release/V2.3 into release/V2.4. 2016-11-07 16:12:20 +00:00