inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 324 Branches 2,170 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
c7c15e7776 RM-2526 Merge commit '2348a1f' into release/V2.5. 2016-10-28 16:50:34 +01:00
Tom Page
f206377f25 Merge merge-2.4/RM-2526_FixPermissionsIssue into release/V2.4. 2016-10-28 16:48:23 +01:00
Tom Page
262babedfc Merge merge-2.5/MNT-16852_HF_2.2.0.2 into release/V2.5. 2016-10-28 16:46:07 +01:00
Tom Page
c79463d96c RM-4247 Add unit test. 2016-10-28 16:44:34 +01:00
Ana Bozianu
03f8226173 Merge feature/RM-4012_Category_REST_API_2 into master 2016-10-28 18:36:04 +03:00
Ana Bozianu
18e5d469a6 fixed "get pending reviews" solr query 
(cherry picked from commit 798b76a8ed)
 2016-10-28 18:26:56 +03:00
Tom Page
2cbba97c6d Merge release/V2.3 into release/V2.4. 
RM-2526 Fix permissions issue getting disposition schedule.
 2016-10-28 14:35:27 +01:00
Tom Page
d24a22264c Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Mihai Cozma
671f544a69 Merge commit '354928e' 2016-10-28 15:26:41 +03:00
Mihai Cozma
ef08a7b69f Merge commit '73f4738' into release/V2.5 2016-10-28 15:21:14 +03:00
Mihai Cozma
f20e02ffed Merge commit '103734a' into release/V2.4 2016-10-28 14:48:20 +03:00
Ana Bozianu
9237a3b4a2 RM-4012 - review updates 2016-10-28 14:44:34 +03:00
Kristijan Conkas
fb5414f929 Merge branch 'feature/RM-3964_Record_Category_CRUD_2' into 'master' 
Feature/rm 3964 record category crud 2

MR to complete RM-3964.

See merge request !6
 2016-10-28 11:56:03 +01:00
Kristijan Conkas
14c2329d64 Merge branch 'master' into feature/RM-3964_Record_Category_CRUD_2 2016-10-28 11:55:22 +01:00
Kristijan Conkas
d50590c5f0 RM-3964: Update further to code inspection comments. 2016-10-28 11:53:04 +01:00
Tom Page
eb00635594 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
Rodica Sutu
03cba5b006 Merge branch 'feature/RM-4195_CreateRMSite2' into 'master' 
Feature/rm 4195 create rm site2

Add more tests and fix for data prep -Tuna.

See merge request !5
 2016-10-28 09:27:35 +01:00
Kristijan Conkas
c611f6ff87 RM-3964: fixed a FIXME. 2016-10-28 09:20:51 +01:00
Rodica Sutu
1c4ebf8abf Merge branch 'feature/RM-4195_CreateRMSite3' into 'feature/RM-4195_CreateRMSite2' 
Feature/rm 4195 create rm site3

See merge request !4
 2016-10-28 08:05:57 +01:00
Tuna Aksoy
65472ca6c1 Fixed dataprep issue 2016-10-27 21:06:55 +01:00
Rodica Sutu
ca65f0a5a9 fix compilation errors 2016-10-27 19:22:11 +03:00
Rodica Sutu
dc0a6ed1a5 fix compilation error 2016-10-27 19:13:11 +03:00
Rodica Sutu
fefae8bc2c 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/RMSiteTests.java
#	src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java
 2016-10-27 19:09:52 +03:00
Rodica Sutu
f896963188 new tests for RM Site 2016-10-27 19:03:33 +03:00
Kristijan Conkas
7f754c2ff5 Merge branch 'master' into feature/RM-3964_Record_Category_CRUD_2 2016-10-27 15:36:35 +01:00
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
e31bd57526 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
7e105f40f9 Update version to 2.3.2-SNAPSHOT. 2016-10-27 12:30:05 +01:00
David Webster
28cf267ac1 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
1bc282f2f5 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Silviu Dinuta
28990fc095 RM-4199: finalised rm site api unit testing 2016-10-27 06:47:49 +03:00
Tuna Aksoy
935b516646 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
9dacb0c5e1 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
ded1bbef88 Merge branch 'master' into feature/RM-4012_Category_REST_API_2 2016-10-26 16:15:31 +01:00
Ana Bozianu
c84fc6ee9e RM-4259 - added method security condition 2016-10-26 18:14:29 +03:00
Silviu Dinuta
efa830881c 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
e66a1dbefa Merge branch 'master' of gitlab.alfresco.com:records-management/records-management 2016-10-26 13:05:38 +03:00
Mihai Cozma
6b7e5b3491 RM-4245_update_module_version 
Update {alfresco.rm.version} to handle more digits
 2016-10-26 12:52:37 +03:00