inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,979 Commits 330 Branches 2,178 Tags
6523f5f183dd4e66a3fb1b42bc38cd3f74f6e15c
Commit Graph

2979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Mihai Cozma
b488d25a0f RM-4245_update_module_version 
Update {alfresco.rm.version} to handle more digits
 2016-10-26 11:35:30 +03:00
Mihai Cozma
b84d7e5b49 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
d9efb58df2 RM-4245_update_module_version 
Update {alfresco.rm.version} to handle more digits
 2016-10-26 10:02:34 +03:00
David Webster
03839783f8 MNT-16852: Fix merge error. 2016-10-25 16:57:19 +01:00
Tom Page
47e87e5ecb Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
Tom Page
d17c3e196e Merge release/V2.4 into release/V2.5. 2016-10-25 15:58:31 +01:00
Tom Page
0cac8736dd Merge commit 'c068b0' into release/V2.4 (record only). 2016-10-25 15:50:28 +01:00
roxana
7dcdf74848 Merge branch 'RM-2526_LinkingMakesRecordPropertiesUnavailbale' into release/V2.3 2016-10-25 17:38:07 +03:00
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
Tom Page
7731f4e245 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +01: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
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
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
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