Commit Graph

4990 Commits

Author SHA1 Message Date
Tuna Aksoy
716d456c81 Removed whitespaces 2016-10-21 15:05:38 +01:00
Ana Bozianu
f62d00d9e6 Merge feature/RM-3994_Classification_group_corrupted into feature/RM-4012_Category_REST_API 2016-10-21 16:28:30 +03:00
Ana Bozianu
73584b785a Merge feature-2.5/RM-3994_Classification_group_corrupted into feature/RM-3994_Classification_group_corrupted 2016-10-21 16:23:05 +03:00
Tom Page
dbb0a67718 Merge feature-2.3/RM-2526_IntegrationTests into release/V2.3. 2016-10-21 13:43:31 +01:00
Tom Page
6204efd639 Merge feature-2.3/RM-4127_UITestsFor2.3 into release/V2.3. 2016-10-21 13:16:51 +01:00
Silviu Dinuta
50514c1ace RM-4199: added update rm site functionality 2016-10-21 15:01:01 +03:00
Kristijan Conkas
26ea6127e1 RM-3964: Refactoring utility methods (WIP) 2016-10-21 12:19:38 +01:00
Oana Nechiforescu
2f23f488db Updates to amps names. 2016-10-21 13:29:24 +03:00
Kristijan Conkas
9618b2a0a6 RM-3964: enum to const 2016-10-21 11:20:32 +01:00
Oana Nechiforescu
ee807117b0 Updates to pom 2016-10-21 13:11:27 +03:00
Tom Page
fc569df0dc RM-3386 Merge commit '4cb38d2' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Tom Page
45df546932 Merge release/V2.4 into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 10:59:17 +01:00
Silviu Dinuta
3693a02b2d RM-4199: renamed CategoryNode into RecordCategoryNode 2016-10-21 12:12:06 +03:00
Silviu Dinuta
3fd9de89a0 RM-4199: after review changes 2016-10-21 11:58:11 +03:00
Rodica Sutu
bcf76ab210 update .gitignore 2016-10-21 11:51:47 +03:00
roxana
780b0af6ac Checking if disposition as of date was changed manually. 2016-10-21 11:13:51 +03:00
Oana Nechiforescu
8d0d513b9b Trying to fix the poms. Have no idea if that will work. 2016-10-21 11:03:18 +03:00
Mihai Cozma
497eed8060 Merge remote-tracking branch 'origin/release/V2.4' into release/V2.5 2016-10-21 09:38:50 +03:00
Tuna Aksoy
d8f9f2bc3e Updated the README file, made some minor changes. 2016-10-20 23:26:29 +01:00
Tuna Aksoy
95888e178b Removed local.properties from versioning 2016-10-20 23:02:59 +01:00
Tuna Aksoy
0a228eeb4c Extracted properties from code into properties file, tidied up the code. 2016-10-20 22:50:56 +01:00
Kristijan Conkas
544938a9b8 RM-3964: CRUD happy path tests. 2016-10-20 17:02:18 +01:00
Tom Page
d303282d1c Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Silviu Dinuta
ffdd4e70de RM-4199: workaround for supporting only rm site id for delete request 2016-10-20 17:03:09 +03:00
Kristijan Conkas
073ae6f73a RM-4013: Skeleton Record Category model. 2016-10-20 14:53:39 +01:00
Tom Page
f4874eb118 RM-2526 Fix typo. 2016-10-20 14:06:52 +01:00
Tom Page
66def3bd88 RM-2526 Make sure we set up the file plan from within a transaction. 2016-10-20 12:35:32 +01:00
Tom Page
92ea5c3b58 RM-2526 Add a second test for linking to a shorter schedule. 2016-10-20 11:36:47 +01:00
Tom Page
e664784ce5 RM-2526 Integration test for linking record to longer schedule. 2016-10-20 11:14:16 +01:00
Silviu Dinuta
1040c89741 RM-4199: changes to include compliance in body create type, also changed
the delete part to only delete rm site
2016-10-20 03:27:52 +03:00
Silviu Dinuta
f57c86aa50 RM-4199: added one comment 2016-10-19 17:20:19 +03:00
Silviu Dinuta
2f06775aba RM-4199: changed package structure, removed content2.bin since we don't
use welcome component for rm site, also added some comments and
simplified the validation of the site since we don't need to ad site id
and site visibility for rm site, given that site id is always rm and
site visibility always PUBLIC
2016-10-19 17:08:03 +03:00
Tom Page
6c65ba572e RM-4127 Backport UI tests to V2.3. 2016-10-19 13:29:05 +01:00
Tom Page
4cb38d2440 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
Mihai Cozma
0cf49bfce9 Fix version with more digits. modified: pom.xml 2016-10-19 08:58:32 +03:00
Silviu Dinuta
6eb062d4a3 Merge feature/RM-4012_Category_REST_API into
feature/RM-4199_RM_REST_API_IMPL
2016-10-18 21:53:12 +03:00
Silviu Dinuta
a76a13db46 Merge remote-tracking branch feature/RM-4007_SupportAlliasesOnPut into
feature/RM-4012_Category_REST_API
2016-10-18 21:49:21 +03:00
David Webster
4470f62072 Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge 2016-10-18 16:40:14 +01:00
David Webster
e34e41d61d Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
Ana Bozianu
e686da88de fixed audit unit tests 2016-10-18 18:28:29 +03:00
David Webster
fbb55126d7 Set up 2.2.0.x HF branch ready for next release 2016-10-18 16:23:46 +01:00
Mihai Cozma
6c65fa5c7e Merge commit '2745b7' into release/V2.4 2016-10-18 17:39:09 +03:00
Silviu Dinuta
9f3f82e290 RM-4007: Support alliases on update 2016-10-18 15:42:12 +03:00
Tom Page
a0e5ed3693 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814 Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tom Page
8309e75b12 Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3. 2016-10-18 10:36:47 +01:00
Silviu Dinuta
ee07a75d67 RM-4199: create rm site rest api impl 2016-10-18 12:21:42 +03:00
Tuna Aksoy
182ab80190 Added some tests to compare TAS with RestAssured used directly. 2016-10-18 10:02:00 +01:00
Tuna Aksoy
65dd4787c2 first commit 2016-10-18 09:58:41 +01:00
roxana
dc62e20d31 Fixed unit test for linking. 2016-10-18 11:49:15 +03:00