Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts with master | Marvin Bertin | 2017-10-10 | 1 | -7/+1 |
|\ | |||||
| * | Getting rid of the FuzzyValues, Name as a string, and conditionv0.7.1 | vlad | 2017-10-09 | 1 | -7/+2 |
* | | Merge branch 'master' into trial-46-disease-entity | Marvin Bertin | 2017-10-10 | 1 | -1/+1 |
|\| | |||||
| * | Fixed a part of routes, that have wrong spray json writer types | Aleksandr | 2017-10-04 | 1 | -1/+1 |
* | | Removed condition from trial | timgushue | 2017-09-27 | 1 | -1/+0 |
|/ | |||||
* | PDSUI-2188 Created and fixed test for json formats of TriC | Kseniya Tomskikh | 2017-08-11 | 1 | -8/+10 |
* | PDSUI-2188 Created and fixed spray json formats for tric and rep | Kseniya Tomskikh | 2017-08-11 | 1 | -0/+88 |