inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,990 Commits 325 Branches 2,188 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Cozma
2456a8c56d Merge branch 'master' of gitlab.alfresco.com:records-management/records-management 2016-10-26 13:05:38 +03:00
Mihai Cozma
0fd7825905 RM-4245_update_module_version 
Update {alfresco.rm.version} to handle more digits
 2016-10-26 12:52:37 +03: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
Tom Page
7c42178c84 Merge release/V2.5 into master (record only). 2016-10-26 09:24:21 +01:00
Tom Page
c1ad40e051 Merge merge/RM-2526_BlendedDispositionSchedules into master. 
RM-2526 Handle records that are linked to multiple disposition schedules.

RM-3386 Persist the fact that an "as of" date has been manually set.
 2016-10-26 09:16:47 +01: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
Tuna Aksoy
9efdc2834a Fixed the issue with getting file plan component children 2016-10-25 22:28:17 +01:00
Tuna Aksoy
de55e85ec4 Refactored RM site creation related code 2016-10-25 20:14:47 +01:00
David Webster
03839783f8 MNT-16852: Fix merge error. 2016-10-25 16:57:19 +01:00
Kristijan Conkas
fefee35dac RM-3964: Refactoring further to API implementation discussion. 2016-10-25 16:45:47 +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
3ca78103d1 Merge master into feature/PR-2_cetra3. 2016-10-25 15:02:29 +01:00
Silviu Dinuta
30d9bdea6c Merge feature/RM-4012_Category_REST_API into feature/RM-4199_UnitTests 2016-10-25 17:02:13 +03:00
Silviu Dinuta
45e2c31b0b RM-3963: review updates 2016-10-25 16:47:48 +03:00
Silviu Dinuta
914b56608e RM-4199: added RMSiteEntityResourceUnitTest, not all test methods 
implemented yet
 2016-10-25 16:42:11 +03:00
Tom Page
db7b1684a4 Merge release/V2.5 into master. 2016-10-25 14:22:15 +01: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
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
Tuna Aksoy
a892c63d77 Refactored test code 2016-10-25 10:05:32 +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
Kristijan Conkas
36ec069dc0 Merge branch 'feature/RM-3964_Record_Category_CRUD' 2016-10-24 10:07:20 +01:00
Kristijan Conkas
0d83c1fa18 RM-3964: Utility methods updated to take models as parameters. 2016-10-24 10:06:20 +01: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
Kristijan Conkas
918638e8a5 RM-3964: Update method + tests (WIP) 2016-10-21 17:17:11 +01: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