Tom Page
e70803c3ba
RM-5013 Merge release/V2.3.1.x into release/V2.3.
2017-04-12 16:19:51 +01:00
Ana Bozianu
3d7a93e3ce
RM-5013 Cherry-pick "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
See merge request !602
Nb. This does not copy across the updates to the automation tests.
(cherry picked from commit 54d673c176
2017-04-12 13:02:10 +01:00
David Webster
0512d6a308
MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x)
2017-03-10 16:00:23 +00:00
David Webster
3e3349a919
Merge branch 'release/V2.2' into release/V2.3
2017-03-10 15:51:22 +00:00
David Webster
5960df0286
Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2
2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e
Update versions following release of 2.2.0.3
2017-03-10 14:48:11 +00:00
David Webster
b19235004d
MNT-17550: Release 2.2.0.3
2017-03-09 17:02:39 +00:00
Samuel Langlois
c6a698ad55
MNT-17550/BDE-996 Fix TestNG version to 6.10
2017-03-09 11:37:13 +00:00
David Webster
a29ac3e653
MNT-17550: Update POM to work around build issue (BDE-996)
2017-03-09 10:55:37 +00:00
David Webster
57b4de11b2
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.
2017-03-08 16:05:00 +00: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
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
roxana
8dd2e277cf
Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3
2016-11-08 15:02:01 +02:00
Oana Nechiforescu
2eca420b59
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
6cf3411fe2
RM-4247 Fix typo.
2016-11-07 16:09:35 +00:00
Ana Bozianu
4d511bd0af
fixed audit unit tests
...
(cherry picked from commit e686da88de
2016-11-04 15:38:24 +00:00
roxana
71917d6d17
Revert changes and removed cache check.
2016-11-04 17:08:09 +02:00
Tom Page
683892ceb6
RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty.
2016-11-04 11:09:17 +00:00
Ana Bozianu
5200597182
RM-4249 - workaround : replaced maxEntries with a positive value
...
(cherry picked from commit 995448081e
2016-11-04 10:51:27 +00:00
roxana
23493ab550
Update record disposition action as of date if it changed, to have the same value as next disposition action as of date.
2016-11-04 10:19:24 +02:00
roxana
76cd3109ea
Changed the test a bit to check a more complex case.
2016-11-01 15:25:04 +02:00
roxana
8eba41396b
Added null check.
2016-10-31 15:53:17 +02:00
roxana
27e8110d3e
Added integration test for recalculating disposition for a record when unlinking it.
2016-10-31 15:14:14 +02:00
roxana
d22c941fce
Renamed method for calculating next disposition step and added null check.
2016-10-31 14:41:58 +02:00
roxana
c649c16345
Update disposition schedule action for a record when linking or unlinking it.
2016-10-31 12:18:34 +02:00
Tom Page
c015977fff
RM-4247 Add unit test.
2016-10-28 16:44:34 +01:00
Tom Page
1acd25241e
Update version to 2.3.2-SNAPSHOT.
2016-10-27 12:30:05 +01:00
roxana
7dcdf74848
Merge branch 'RM-2526_LinkingMakesRecordPropertiesUnavailbale' into release/V2.3
2016-10-25 17:38:07 +03:00
roxana
1d3bfe74a0
Run as system when getting disposition schedule for a record.
2016-10-25 15:51:39 +03:00
Mihai Cozma
41b25b37d0
Merge branch 'feature-2.3/RM-4256_Delete_duplicate_test' into release/V2.3
2016-10-25 08:42:48 +03:00
Tom Page
15828b1bed
Remove unwanted javadoc comments.
2016-10-24 16:39:50 +01:00
Mihai Cozma
3026aa072e
RM-1039_Delete_duplicate_test
2016-10-24 18:07:07 +03:00
roxana
bab20b2dc6
I've tweaked the tests a bit to handle daylight savings.
2016-10-24 15:30:37 +03:00
roxana
1f544e2d12
Added null check
2016-10-24 11:09:32 +03:00
roxana
7529a82c09
When the last step of the current disposition is completed, no more calculation is needed.
2016-10-24 10:16:58 +03:00
Tom Page
dbb0a67718
Merge feature-2.3/RM-2526_IntegrationTests into release/V2.3.
2016-10-21 13:43:31 +01:00
Tom Page
6204efd639
Merge feature-2.3/RM-4127_UITestsFor2.3 into release/V2.3.
2016-10-21 13:16:51 +01:00
roxana
780b0af6ac
Checking if disposition as of date was changed manually.
2016-10-21 11:13:51 +03:00
Tom Page
d303282d1c
Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3.
2016-10-20 15:20:00 +01:00
Tom Page
f4874eb118
RM-2526 Fix typo.
2016-10-20 14:06:52 +01:00
Tom Page
66def3bd88
RM-2526 Make sure we set up the file plan from within a transaction.
2016-10-20 12:35:32 +01:00
Tom Page
92ea5c3b58
RM-2526 Add a second test for linking to a shorter schedule.
2016-10-20 11:36:47 +01:00
Tom Page
e664784ce5
RM-2526 Integration test for linking record to longer schedule.
2016-10-20 11:14:16 +01:00
Tom Page
6c65ba572e
RM-4127 Backport UI tests to V2.3.
2016-10-19 13:29:05 +01:00
Tom Page
4cb38d2440
Merge release/V2.3 into RM-3386_ManauallySetDate.
2016-10-19 08:31:13 +01:00
David Webster
4470f62072
Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge
2016-10-18 16:40:14 +01:00
David Webster
e34e41d61d
Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2
2016-10-18 16:36:10 +01:00
David Webster
fbb55126d7
Set up 2.2.0.x HF branch ready for next release
2016-10-18 16:23:46 +01:00
Tom Page
8309e75b12
Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3.
2016-10-18 10:36:47 +01:00
