Commit Graph

3433 Commits

Author SHA1 Message Date
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
Tom Page
efbe7ab8c1 Merge branch 'feature-2.3/RM-4247_UpdateDispositionProperty' into 'release/V2.3'
Feature 2.3/rm 4247 update disposition property

RM-4247 Recalculate the "disposition as of" date if the period property changes.

See merge request !564
2016-11-07 16:10:16 +00:00
Tom Page
2e48e3207f RM-4247 Fix typo. 2016-11-07 16:09:35 +00:00
Ana Bozianu
5ad8cbde8d Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
Silviu Dinuta
93b312a12e Merge branch 'feature/RM-4306_SomeCommentsForWhenUpgradingFrom5_2_a_EA' into 'master'
Feature/rm 4306 some comments for when upgrading from5 2 a ea

See merge request !603
2016-11-07 14:40:43 +00:00
Silviu Dinuta
e06b50f1f9 RM-4312: fixed some integration tests 2016-11-07 16:05:19 +02:00
Rodica Sutu
138319917e Update gitignore to ignore test-output folder 2016-11-07 14:51:17 +02:00
alfresco-build
d3c03b9f76 [maven-release-plugin] prepare for next development iteration 2016-11-07 12:46:02 +00:00
alfresco-build
20e505e50b [maven-release-plugin] prepare release V2.5.0.1 2016-11-07 12:45:59 +00:00
Tom Page
dcdef19025 Merge branch 'feature-2.3/RM-4307_AuditFix' into 'release/V2.3.1.x'
Feature 2.3/rm 4307 audit fix

RM-4307 Cherry-pick fix from master.

See merge request !600
2016-11-07 12:30:45 +00:00
Silviu Dinuta
a63da9551e RM-4306: added some comments to the methods that need to be removed when
we'll use latest core SitesIml implementation
2016-11-07 14:17:17 +02:00
Silviu Dinuta
046b242cc2 Merge branch 'feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers' into 'master'
Feature/rm 4312 constraint for creating record folder in special containers

See merge request !596
2016-11-07 08:50:40 +00:00
Silviu Dinuta
670511aa87 RM-4312: added comments to unit tests 2016-11-07 10:47:10 +02:00
Ana Bozianu
f19ece3538 Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

We also updated the automation tests

See merge request !602
2016-11-04 16:40:30 +00:00
Silviu Dinuta
90b76a762c RM-4312: review updates 2016-11-04 18:40:04 +02:00
Silviu Dinuta
730f9ca3dd RM-4312: rewind changes on ServiceBaseImpl 2016-11-04 18:15:49 +02:00
Silviu Dinuta
a4feae7485 RM-4312: changed implementation after review 2016-11-04 18:05:05 +02:00
Ana Bozianu
c6810b33dd fixed audit unit tests
(cherry picked from commit 7a33945dff)
2016-11-04 15:38:24 +00:00
Ana Bozianu
d457a67cf6 Revert "updated tag for next development iteration"
This reverts commit 8ce501035b.
2016-11-04 17:26:32 +02:00
roxana
373439822c Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Silviu Dinuta
ab59884d72 Merge master into
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
2016-11-04 15:42:37 +02:00
Ana Bozianu
2ba84c3c79 Merge branch 'feature/RM-4296_IllegalChildrenInFileplanRoot' into 'master'
Feature/rm 4296 illegal children in fileplan root

RM-4296 - Create special containers as File Plan works

You could create children of any node type in fileplan root except for content and record folder because we were blacklisting the denied types.
Whitelisted the accepted types dividing them in 2 categories: types that are accepted only once and types that are accepted multiple types

See merge request !601
2016-11-04 13:39:46 +00:00