Commit Graph

3212 Commits

Author SHA1 Message Date
Ana Bozianu
ce93ceb930 Revert "updated bamboo_auth password"
This reverts commit a2c37b4be5.
2016-11-01 15:03:06 +02:00
Ana Bozianu
a2c37b4be5 updated bamboo_auth password 2016-11-01 14:57:44 +02:00
Ana Bozianu
c33db37eb6 updated bamboo username 2016-11-01 14:50:04 +02:00
Ana Bozianu
fd232d2d72 added bamboo credentials 2016-11-01 14:45:52 +02:00
Ana Bozianu
21ebb12959 removed /qa from installer path base 2016-11-01 14:22:08 +02:00
Tom Page
c4bdb4e1f9 RM-2526 Merge merge-2.5/RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.5. 2016-10-31 14:47:51 +00:00
Tom Page
92484a8cf0 RM-1039 Merge merge-2.5/RM-1039_RemoveDuplicateTest into release/V2.5. 2016-10-31 13:57:56 +00:00
roxana
07d010b164 Added null check. 2016-10-31 15:53:17 +02:00
roxana
b47d2370d7 Added integration test for recalculating disposition for a record when unlinking it. 2016-10-31 15:14:14 +02:00
roxana
0a79d24def Renamed method for calculating next disposition step and added null check. 2016-10-31 14:41:58 +02:00
Ana Bozianu
4b621be61d temporary changed installer location to test with alfresco 5.1.2 2016-10-31 14:31:24 +02:00
roxana
adc144e971 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
Ana Bozianu
92c45162a7 fixed "get pending reviews" solr query
(cherry picked from commit 798b76a8ed)
2016-10-31 12:12:27 +02:00
Tom Page
c3e75a5927 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-31 09:57:29 +00:00
Tom Page
703108c159 RM-1039 Merge commit 'f20e02f' into origin/release/V2.5. 2016-10-31 09:55:28 +00:00
Tom Page
2dc5251612 Merge merge-2.5/RM-2526_ManuallyChangedAsOf into release/V2.5. 2016-10-31 08:06:41 +00:00
Tom Page
c7c15e7776 RM-2526 Merge commit '2348a1f' into release/V2.5. 2016-10-28 16:50:34 +01: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
262babedfc Merge merge-2.5/MNT-16852_HF_2.2.0.2 into release/V2.5. 2016-10-28 16:46:07 +01:00
Tom Page
c79463d96c RM-4247 Add unit test. 2016-10-28 16:44:34 +01:00
Ana Bozianu
18e5d469a6 fixed "get pending reviews" solr query
(cherry picked from commit 798b76a8ed)
2016-10-28 18:26:56 +03: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
Tom Page
d24a22264c Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Mihai Cozma
ef08a7b69f Merge commit '73f4738' into release/V2.5 2016-10-28 15:21:14 +03: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
354928e51a RM-4245_update_module_version
Update {alfresco.rm.version} to handle more digits
2016-10-26 11:35:30 +03: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
ebd20c8a7f Merge release/V2.4 into release/V2.5. 2016-10-25 15:58:31 +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
d1a49eab5a 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
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
Tom Page
3604820810 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +01: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