Tom Page
f0537f865e
Merge merge-2.5/RM-2526_BlendedDispositionSchedule into release/V2.5.
...
RM-2526 Allow records to follow linked disposition schedules.
RM-3386 Fix a bug when recalculating "disposition as of" date.
2016-10-25 14:17:47 +01:00
Tom Page
d9d6d38d9a
Merge commit '4470f620726f8942dd1e22e7e2927e1ad0cfd2b9' into merge-2.4/MNT-16852_HF_2.2.0.2_Merge.
2016-10-25 14:05:31 +01:00
roxana
1d3bfe74a0
Run as system when getting disposition schedule for a record.
2016-10-25 15:51:39 +03:00
Silviu Dinuta
1d22ae2aa2
RM-3963: throw an exception if permanent parameter is passed for delete
2016-10-25 13:40:41 +03:00
Tom Page
7731f4e245
RM-2526 Merge release/V2.4 into release/V2.5.
2016-10-25 10:28:13 +01:00
Silviu Dinuta
2fab18584f
RM-3963: referenced (REPO-1459) issue for isSpecialNode to made
...
protected
2016-10-25 11:28:53 +03:00
Silviu Dinuta
1f091b7101
RM-3963: code formatting
2016-10-25 10:03:21 +03:00
Silviu Dinuta
a69743ffd0
RM-3963: prevent POST request directly in RM site node
2016-10-25 09:47:01 +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
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
Silviu Dinuta
8c09cafe53
RM-3963: restricted allowed operations for filePlan, transfers, holds
...
and unfiled containers and added get request for rm site
2016-10-24 18:07:09 +03: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
Ana Bozianu
dd0f39fc09
Merge feature/RM-3994_Classification_group_corrupted into master
2016-10-21 17:52:39 +03:00
Silviu Dinuta
96eb19b21f
Merge feature/RM-4012_Category_REST_API into
...
feature/RM-4199_RM_REST_API_IMPL
2016-10-21 17:15:06 +03:00
Tuna Aksoy
716d456c81
Removed whitespaces
2016-10-21 15:05:38 +01:00
Ana Bozianu
f62d00d9e6
Merge feature/RM-3994_Classification_group_corrupted into feature/RM-4012_Category_REST_API
2016-10-21 16:28:30 +03:00
Ana Bozianu
73584b785a
Merge feature-2.5/RM-3994_Classification_group_corrupted into feature/RM-3994_Classification_group_corrupted
2016-10-21 16:23:05 +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
Silviu Dinuta
50514c1ace
RM-4199: added update rm site functionality
2016-10-21 15:01:01 +03: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
Silviu Dinuta
3693a02b2d
RM-4199: renamed CategoryNode into RecordCategoryNode
2016-10-21 12:12:06 +03:00
Silviu Dinuta
3fd9de89a0
RM-4199: after review changes
2016-10-21 11:58:11 +03: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
Mihai Cozma
497eed8060
Merge remote-tracking branch 'origin/release/V2.4' into release/V2.5
2016-10-21 09:38:50 +03:00
Tom Page
d303282d1c
Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3.
2016-10-20 15:20:00 +01:00
Silviu Dinuta
ffdd4e70de
RM-4199: workaround for supporting only rm site id for delete request
2016-10-20 17:03:09 +03: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
Silviu Dinuta
1040c89741
RM-4199: changes to include compliance in body create type, also changed
...
the delete part to only delete rm site
2016-10-20 03:27:52 +03:00
Silviu Dinuta
f57c86aa50
RM-4199: added one comment
2016-10-19 17:20:19 +03:00
Silviu Dinuta
2f06775aba
RM-4199: changed package structure, removed content2.bin since we don't
...
use welcome component for rm site, also added some comments and
simplified the validation of the site since we don't need to ad site id
and site visibility for rm site, given that site id is always rm and
site visibility always PUBLIC
2016-10-19 17:08:03 +03:00
