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
f981ed23bf
Merge merge-2.4/RM-2526_BlendedDispositionSchedule into release/V2.4.
2016-10-24 21:23:09 +01:00
David Webster
4fb07179d7
MNT-16852: Add in accidentally deleted bean extender
2016-10-24 17:38:34 +01:00
David Webster
859afafee9
Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor
2016-10-24 17:32:37 +01: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
8f8b0268f2
I've tweaked the tests a bit to handle daylight savings.
...
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
2016-10-24 14:40:08 +01:00
roxana
ad995fe263
Added null check
...
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
2016-10-24 14:39:32 +01:00
roxana
4a912391df
When the last step of the current disposition is completed, no more calculation is needed.
...
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
2016-10-24 14:39:27 +01:00
roxana
67ad6b4214
Checking if disposition as of date was changed manually.
...
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
05d14de22b
RM-2526 Fix location of MultipleSchedulesTest.
2016-10-24 14:07:39 +01: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
e9bfe2385e
Merge RM-2526_IntegrationTests into merge-2.4/RM-2526_BlendedDispositionSchedule.
2016-10-21 16:36:06 +01: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
Oana Nechiforescu
2f23f488db
Updates to amps names.
2016-10-21 13:29:24 +03:00
Oana Nechiforescu
ee807117b0
Updates to pom
2016-10-21 13:11:27 +03:00
Tom Page
fc569df0dc
RM-3386 Merge commit '4cb38d2' into merge-2.4/RM-2526_BlendedDispositionSchedules.
2016-10-21 11:03:36 +01:00
Tom Page
45df546932
Merge release/V2.4 into merge-2.4/RM-2526_BlendedDispositionSchedule.
2016-10-21 10:59:17 +01:00
roxana
780b0af6ac
Checking if disposition as of date was changed manually.
2016-10-21 11:13:51 +03:00
Oana Nechiforescu
8d0d513b9b
Trying to fix the poms. Have no idea if that will work.
2016-10-21 11:03:18 +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
Mihai Cozma
0cf49bfce9
Fix version with more digits. modified: pom.xml
2016-10-19 08:58:32 +03: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
Mihai Cozma
6c65fa5c7e
Merge commit '2745b7' into release/V2.4
2016-10-18 17:39:09 +03:00
Tom Page
a0e5ed3693
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tom Page
8309e75b12
Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3.
2016-10-18 10:36:47 +01:00
roxana
dc62e20d31
Fixed unit test for linking.
2016-10-18 11:49:15 +03:00
roxana
121967ed7e
Modified validation for link conditions to compare the original disposition of the record with the target one.
2016-10-18 10:57:08 +03:00
David Webster
2df396a7e1
MNT-16852: HF 2.2.0.2 release, remove snapshot version number
2016-10-17 22:01:17 +01:00
Tom Page
9f30a72785
RM-2526 Fix copy/paste error.
2016-10-17 16:47:43 +01:00
roxana
9ca060330f
Added check for adding disposition lifecycle aspect.
2016-10-17 17:50:12 +03:00
Tom Page
a2909b4180
RM-2526 Treat null as the largest date possible.
...
If a disposition step has an "as of" date of null then it requires human
interaction. Consequently there is no length of time we can wait before the
step triggers - so we treat it as the latest step if there are multiple
disposition schedules.
2016-10-17 15:27:43 +01:00
Mihai Cozma
78a8885954
Merge branch 'feature-2.3/RM-4250_fileplan_creation_freeze' into release/V2.3
2016-10-17 16:02:21 +03:00
Mihai Cozma
75a8477d0e
Fix resource filtering
2016-10-17 13:45:25 +03:00
roxana
3dd736e279
Fixed tests (for disposition schedules with event based actions).
2016-10-17 11:01:22 +03:00
Tom Page
e20aa4bf23
RM-3386 Persist the fact that an "as of" date has been manually set.
...
If a "disposition as of" date is manually set using "Edit Retention Date"
then don't update it when changing the disposition schedule steps. Use a
new property to store the fact that the "disposition as of" date has been
manually set.
2016-10-14 16:15:16 +01:00
Tom Page
ad7caa395a
RM-4247 Recalculate the "disposition as of" date if the period property changes.
2016-10-14 14:28:04 +01:00
Mihai Cozma
b6b903c88b
Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3
2016-10-14 11:38:51 +03:00
