Commit Graph

2644 Commits

Author SHA1 Message Date
roxana
adc144e971 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
Tom Page
f206377f25 Merge merge-2.4/RM-2526_FixPermissionsIssue into release/V2.4. 2016-10-28 16:48:23 +01:00
Tom Page
c79463d96c RM-4247 Add unit test. 2016-10-28 16:44:34 +01:00
Tom Page
2cbba97c6d Merge release/V2.3 into release/V2.4.
RM-2526 Fix permissions issue getting disposition schedule.
2016-10-28 14:35:27 +01:00
Mihai Cozma
f20e02ffed Merge commit '103734a' into release/V2.4 2016-10-28 14:48:20 +03:00
Tom Page
eb00635594 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
Tom Page
e31bd57526 MNT-16852 Fix unit test comment. 2016-10-27 14:12:14 +01:00
Tom Page
7e105f40f9 Update version to 2.3.2-SNAPSHOT. 2016-10-27 12:30:05 +01:00
David Webster
28cf267ac1 MNT-16852: Improve commenting 2016-10-27 12:07:31 +01:00
David Webster
1bc282f2f5 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Mihai Cozma
73f47380c1 Merge branch 'release/V2.4' of git@gitlab.alfresco.com:records-management/records-management.git into release/V2.4 2016-10-26 10:06:55 +03:00
Mihai Cozma
40f606858e RM-4245_update_module_version
Update {alfresco.rm.version} to handle more digits
2016-10-26 10:02:34 +03:00
David Webster
9878ca9cb6 MNT-16852: Fix merge error. 2016-10-25 16:57:19 +01:00
Tom Page
121381a384 Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
Tom Page
485beb4cfa Merge commit 'c068b0' into release/V2.4 (record only). 2016-10-25 15:50:28 +01:00
roxana
8d4a2178de Merge branch 'RM-2526_LinkingMakesRecordPropertiesUnavailbale' into release/V2.3 2016-10-25 17:38:07 +03:00
Tom Page
5edc40e832 Merge commit '5077b83ddc785eb3dca3c774b8bc7a7318c5c000' into merge-2.4/MNT-16852_HF_2.2.0.2_Merge. 2016-10-25 14:05:31 +01:00
roxana
20d2bfb7d6 Run as system when getting disposition schedule for a record. 2016-10-25 15:51:39 +03:00
Mihai Cozma
103734a700 Merge branch 'feature-2.3/RM-4256_Delete_duplicate_test' into release/V2.3 2016-10-25 08:42:48 +03:00
Tom Page
02fa8fabc3 Merge merge-2.4/RM-2526_BlendedDispositionSchedule into release/V2.4. 2016-10-24 21:23:09 +01:00
David Webster
b8437018de MNT-16852: Add in accidentally deleted bean extender 2016-10-24 17:38:34 +01:00
David Webster
348128ef58 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Tom Page
fd3cf70a70 Remove unwanted javadoc comments. 2016-10-24 16:39:50 +01:00
Mihai Cozma
86d3705362 RM-1039_Delete_duplicate_test 2016-10-24 18:07:07 +03:00
roxana
4f1ccefae2 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
bac0622ce0 Added null check
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
2016-10-24 14:39:32 +01:00
roxana
72a7501d5e 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
9c5d0283cf Checking if disposition as of date was changed manually.
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
5468461288 RM-2526 Fix location of MultipleSchedulesTest. 2016-10-24 14:07:39 +01:00
roxana
cb3357080d I've tweaked the tests a bit to handle daylight savings. 2016-10-24 15:30:37 +03:00
roxana
4abeb19938 Added null check 2016-10-24 11:09:32 +03:00
roxana
9e7ae77cd5 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
9ad8e59d3c Merge RM-2526_IntegrationTests into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 16:36:06 +01:00
Tom Page
2348a1f5a5 Merge feature-2.3/RM-2526_IntegrationTests into release/V2.3. 2016-10-21 13:43:31 +01:00
Tom Page
9d6c9fdcc8 Merge feature-2.3/RM-4127_UITestsFor2.3 into release/V2.3. 2016-10-21 13:16:51 +01:00
Oana Nechiforescu
82789f31d8 Updates to amps names. 2016-10-21 13:29:24 +03:00
Oana Nechiforescu
d5759d6abc Updates to pom 2016-10-21 13:11:27 +03:00
Tom Page
0b52d1bd73 RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Tom Page
bb4a3f4298 Merge release/V2.4 into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 10:59:17 +01:00
roxana
7d82844048 Checking if disposition as of date was changed manually. 2016-10-21 11:13:51 +03:00
Oana Nechiforescu
0884997f81 Trying to fix the poms. Have no idea if that will work. 2016-10-21 11:03:18 +03:00
Tom Page
699e29bb28 Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Tom Page
79e6296e1d RM-2526 Fix typo. 2016-10-20 14:06:52 +01:00
Tom Page
3ceb976ec8 RM-2526 Make sure we set up the file plan from within a transaction. 2016-10-20 12:35:32 +01:00
Tom Page
a7bd537d82 RM-2526 Add a second test for linking to a shorter schedule. 2016-10-20 11:36:47 +01:00
Tom Page
03e39287f8 RM-2526 Integration test for linking record to longer schedule. 2016-10-20 11:14:16 +01:00
Tom Page
f464e21a54 RM-4127 Backport UI tests to V2.3. 2016-10-19 13:29:05 +01:00
Tom Page
48a65f5067 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
Mihai Cozma
480718fe24 Fix version with more digits. modified: pom.xml 2016-10-19 08:58:32 +03:00
David Webster
5077b83ddc Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge 2016-10-18 16:40:14 +01:00