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
3,912 Commits 335 Branches 2,191 Tags
227276a24e28c5daacd555055db889600dd6ec2c
Commit Graph

3912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
667ba1a656 Fixed compilation issues. 2016-10-27 15:29:04 +01:00
Kristijan Conkas
524b771342 RM-3964: test updates. 2016-10-27 15:27:35 +01:00
Rodica Sutu
2289696e0f fix the merge 2016-10-27 17:04:11 +03:00
Rodica Sutu
f3ce791728 Merge branch 'feature/RM-4195_CreateRMSite2' into 'master' 
Feature/rm 4195 create rm site2

See merge request !1
 2016-10-27 14:52:53 +01:00
Rodica Sutu
51bad22dda Merge branch 'master' of https://gitlab.alfresco.com/records-management/rm-rest-api-automation into feature/RM-4195_CreateRMSite2 
# Conflicts:
#	src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java
#	src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java
 2016-10-27 16:52:33 +03:00
Rodica Sutu
438217b89e Merge branch 'feature/RM-4195_CreateRMSite2' 2016-10-27 16:44:36 +03:00
Rodica Sutu
5c5236c01c java doc indentation 2016-10-27 16:41:43 +03:00
Rodica Sutu
ce3c514967 Revert "java doc indentation" 
This reverts commit c2a4ecd2c6.
 2016-10-27 16:38:40 +03:00
Rodica Sutu
c2a4ecd2c6 java doc indentation 2016-10-27 16:12:39 +03:00
Tom Page
2d4a627690 MNT-16852 Fix unit test comment. 2016-10-27 14:12:14 +01:00
Rodica Sutu
1f2b869ba8 remove unnecessary comment + correct java docs 2016-10-27 16:07:53 +03:00
Rodica Sutu
eacdd24310 tidy up the code, creating the RM Site on BaseRestTests 2016-10-27 15:08:49 +03:00
Tom Page
1acd25241e Update version to 2.3.2-SNAPSHOT. 2016-10-27 12:30:05 +01:00
David Webster
e50ce58533 MNT-16852: Improve commenting 2016-10-27 12:07:31 +01:00
Kristijan Conkas
62a6f1edd3 RM-3964: more verification for positive tests. 2016-10-27 12:04:03 +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
Kristijan Conkas
d9a6e04b6e RM-3964: Component children test. 2016-10-26 16:54:31 +01: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
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