inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,525 Commits 335 Branches 2,191 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
0059d8164a Merge master into feature/PR-2_cetra3. 2016-10-25 15:02:29 +01:00
Silviu Dinuta
77031f9b42 Merge feature/RM-4012_Category_REST_API into feature/RM-4199_UnitTests 2016-10-25 17:02:13 +03:00
Silviu Dinuta
656c7d003a RM-3963: review updates 2016-10-25 16:47:48 +03:00
Silviu Dinuta
58e7a6d06e RM-4199: added RMSiteEntityResourceUnitTest, not all test methods 
implemented yet
 2016-10-25 16:42:11 +03:00
Tom Page
6c51cad5be Merge release/V2.5 into master. 2016-10-25 14:22:15 +01: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
Silviu Dinuta
61923816fa RM-3963: throw an exception if permanent parameter is passed for delete 2016-10-25 13:40:41 +03:00
Tom Page
3604820810 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
694cb39165 RM-3963: referenced (REPO-1459) issue for isSpecialNode to made 
protected
 2016-10-25 11:28:53 +03:00
Silviu Dinuta
9668bb448b RM-3963: code formatting 2016-10-25 10:03:21 +03:00
Silviu Dinuta
ca416fd603 RM-3963: prevent POST request directly in RM site node 2016-10-25 09:47:01 +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
Silviu Dinuta
c3dda4e4bc 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
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
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
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
Kristijan Conkas
918638e8a5 RM-3964: Update method + tests (WIP) 2016-10-21 17:17:11 +01:00
Tom Page
9ad8e59d3c Merge RM-2526_IntegrationTests into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 16:36:06 +01:00
Ana Bozianu
5635fef2fe Merge feature/RM-3994_Classification_group_corrupted into master 2016-10-21 17:52:39 +03:00
Silviu Dinuta
ddac4adfc8 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
995a3e98cc Removed whitespaces 2016-10-21 15:05:38 +01:00
Ana Bozianu
036cf24faa Merge feature/RM-3994_Classification_group_corrupted into feature/RM-4012_Category_REST_API 2016-10-21 16:28:30 +03:00
Ana Bozianu
07e30a9316 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
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
Silviu Dinuta
d8fcb352cf RM-4199: added update rm site functionality 2016-10-21 15:01:01 +03:00
Kristijan Conkas
26ea6127e1 RM-3964: Refactoring utility methods (WIP) 2016-10-21 12:19:38 +01:00
Oana Nechiforescu
82789f31d8 Updates to amps names. 2016-10-21 13:29:24 +03:00
Kristijan Conkas
9618b2a0a6 RM-3964: enum to const 2016-10-21 11:20:32 +01: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
Silviu Dinuta
69b4e9cabc RM-4199: renamed CategoryNode into RecordCategoryNode 2016-10-21 12:12:06 +03:00
Silviu Dinuta
1d2e70b14f RM-4199: after review changes 2016-10-21 11:58:11 +03:00
Rodica Sutu
bcf76ab210 update .gitignore 2016-10-21 11:51:47 +03:00