Commit Graph

2977 Commits

Author SHA1 Message Date
Silviu Dinuta
01aaf952ea RM-4012: finalised FileplanComponentsEntityResource unit tests 2016-10-31 14:41:05 +02:00
Silviu Dinuta
aff9aceb31 Merge master into feature/RM-4012_UnitTests 2016-10-31 14:05:05 +02:00
Silviu Dinuta
6e1e6e9d9f Merge master into feature/RM-4199_UnitTests 2016-10-31 13:54:12 +02:00
Silviu Dinuta
c96c169b69 RM-4199: review updates 2016-10-31 13:51:15 +02:00
Silviu Dinuta
bcee7331fd RM-4012: added unit test classes and implemented parts of the unit tests 2016-10-31 13:43:52 +02:00
Tom Page
03962fb44b Change line endings for surf files. 2016-10-31 09:02:41 +00:00
Silviu Dinuta
6c63e04cbd Merge master into feature/RM-4199_UnitTests 2016-10-31 10:21:44 +02:00
Tom Page
67d8b948ff Merge merge/MNT-16852_HF_2.2.0.2 into master. 2016-10-31 08:03:57 +00:00
Tom Page
ea37d4e2de Merge release/V2.5 into master. 2016-10-28 16:56:07 +01:00
Ana Bozianu
beae23f850 Merge feature/RM-4012_Category_REST_API_2 into master 2016-10-28 18:36:04 +03:00
Tom Page
ddb0c9d8e6 Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Mihai Cozma
2d9dfa86ad Merge commit 'b488d25' 2016-10-28 15:26:41 +03:00
Mihai Cozma
4117e6df47 Merge commit 'b84d7e5' into release/V2.5 2016-10-28 15:21:14 +03:00
Ana Bozianu
2196bc6718 RM-4012 - review updates 2016-10-28 14:44:34 +03:00
Tom Page
d8ac78ee45 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
2d4a627690 MNT-16852 Fix unit test comment. 2016-10-27 14:12:14 +01:00
David Webster
e50ce58533 MNT-16852: Improve commenting 2016-10-27 12:07:31 +01:00
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Silviu Dinuta
ec7adcd7fd RM-4199: finalised rm site api unit testing 2016-10-27 06:47:49 +03:00
Tuna Aksoy
a5fa13b22f Merge branch 'feature/RM-4012_Category_REST_API' into feature/RM-4012_Category_REST_API_2 2016-10-26 17:33:53 +01:00
Silviu Dinuta
fd676c8154 RM-4199: added createRMSite unit test 2016-10-26 19:07:30 +03:00
Tuna Aksoy
6836596a22 Merge branch 'master' into feature/RM-4012_Category_REST_API_2 2016-10-26 16:15:31 +01:00
Ana Bozianu
831cc73ea8 RM-4259 - added method security condition 2016-10-26 18:14:29 +03:00
Silviu Dinuta
e1e93e21e4 RM-4199: finalised unit tests for RMSiteEntityResource started on unit
tests for RMSitesImpl, made some minor fixes
2016-10-26 17:52:50 +03:00
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
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
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
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
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
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
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