Commit Graph

3912 Commits

Author SHA1 Message Date
roxana
27e8110d3e Added integration test for recalculating disposition for a record when unlinking it. 2016-10-31 15:14:14 +02:00
Ana Bozianu
fab6126db0 Changed line endings for RM site test files 2016-10-31 15:08:31 +02:00
Rodica Sutu
d5cebb2757 Fix the mismatch argument type 2016-10-31 14:56:09 +02:00
roxana
d22c941fce Renamed method for calculating next disposition step and added null check. 2016-10-31 14:41:58 +02:00
Silviu Dinuta
01aaf952ea RM-4012: finalised FileplanComponentsEntityResource unit tests 2016-10-31 14:41:05 +02:00
Ana Bozianu
3c08b3f05b temporary changed installer location to test with alfresco 5.1.2 2016-10-31 14:31:24 +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
roxana
c649c16345 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
Ana Bozianu
46fa12486b fixed "get pending reviews" solr query
(cherry picked from commit 3f75ea5d1d)
2016-10-31 12:12:27 +02:00
Tom Page
49c74d6196 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-31 09:57:29 +00:00
Tom Page
21f91bcb30 RM-1039 Merge commit '0143931' into origin/release/V2.5. 2016-10-31 09:55:28 +00:00
Tom Page
2e6c9736e4 RM-2526 Merge commit 'dbb0a67' into master. 2016-10-31 09:50:46 +00:00
Tom Page
03962fb44b 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
6c63e04cbd Merge master into feature/RM-4199_UnitTests 2016-10-31 10:21:44 +02:00
Tom Page
bc566f8bc8 Merge merge-2.5/RM-2526_ManuallyChangedAsOf into release/V2.5. 2016-10-31 08:06:41 +00:00
Tom Page
67d8b948ff 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
ea37d4e2de Merge release/V2.5 into master. 2016-10-28 16:56:07 +01:00
Tom Page
4e4ff60d27 RM-2526 Merge commit 'dbb0a67' into release/V2.5. 2016-10-28 16:50:34 +01:00
Tom Page
fc13407f5d Merge merge-2.4/RM-2526_FixPermissionsIssue into release/V2.4. 2016-10-28 16:48:23 +01:00
Tom Page
a127afabe8 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
c015977fff RM-4247 Add unit test. 2016-10-28 16:44:34 +01:00
Ana Bozianu
beae23f850 Merge feature/RM-4012_Category_REST_API_2 into master 2016-10-28 18:36:04 +03:00
Ana Bozianu
f6d63fd979 fixed "get pending reviews" solr query
(cherry picked from commit 3f75ea5d1d)
2016-10-28 18:26:56 +03:00
Tom Page
1822924626 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
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
Mihai Cozma
01439318f6 Merge commit '41b25b3' into release/V2.4 2016-10-28 14:48:20 +03:00
Ana Bozianu
2196bc6718 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
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
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