Commit Graph

3908 Commits

Author SHA1 Message Date
Silviu Dinuta
6de240b1ea RM-4012: finalised FileplanComponentsEntityResource unit tests 2016-10-31 14:41:05 +02:00
Ana Bozianu
4b621be61d temporary changed installer location to test with alfresco 5.1.2 2016-10-31 14:31:24 +02:00
Silviu Dinuta
35b09cc094 Merge master into feature/RM-4012_UnitTests 2016-10-31 14:05:05 +02:00
Silviu Dinuta
ad3fbaae95 Merge master into feature/RM-4199_UnitTests 2016-10-31 13:54:12 +02:00
Silviu Dinuta
497caab7be RM-4199: review updates 2016-10-31 13:51:15 +02:00
Silviu Dinuta
3c4cd91054 RM-4012: added unit test classes and implemented parts of the unit tests 2016-10-31 13:43:52 +02:00
roxana
adc144e971 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
Ana Bozianu
92c45162a7 fixed "get pending reviews" solr query
(cherry picked from commit 798b76a8ed)
2016-10-31 12:12:27 +02:00
Tom Page
c3e75a5927 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-31 09:57:29 +00:00
Tom Page
703108c159 RM-1039 Merge commit 'f20e02f' into origin/release/V2.5. 2016-10-31 09:55:28 +00:00
Tom Page
5e4ebc4209 RM-2526 Merge commit '2348a1f' into master. 2016-10-31 09:50:46 +00:00
Tom Page
388afb73e6 Change line endings for surf files. 2016-10-31 09:02:41 +00:00
Rodica Sutu
ed87dca32f Merge branch 'feature/RM-3963_FilePlan_CRUD_API' into 'master'
Feature/rm 3963 file plan crud api

Tests created to cover the AC for RM-3963 File Plan root CRUD API.

See merge request !7
2016-10-31 08:43:41 +00:00
Rodica Sutu
6ed52b60cb remove some indentation,update AC as per review comment 2016-10-31 10:40:03 +02:00
Silviu Dinuta
d22994b862 Merge master into feature/RM-4199_UnitTests 2016-10-31 10:21:44 +02:00
Tom Page
2dc5251612 Merge merge-2.5/RM-2526_ManuallyChangedAsOf into release/V2.5. 2016-10-31 08:06:41 +00:00
Tom Page
07c47ef856 Merge merge/MNT-16852_HF_2.2.0.2 into master. 2016-10-31 08:03:57 +00:00
Rodica Sutu
d146c4454b File Plan CRUD API tests 2016-10-31 08:33:41 +02:00
Tuna Aksoy
7d39b799d8 Removed test scope from restapi-test dependency in order to use it in the benchmark project directly 2016-10-30 22:58:17 +00:00
Tuna Aksoy
4b2c76b6d3 Fixed config issue. 2016-10-29 23:02:55 +01:00
Tom Page
d4831245c4 Merge release/V2.5 into master. 2016-10-28 16:56:07 +01:00
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