aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:drivergroup/pds-ui-commonv0.10.3v0.10.2Kseniya Tomskikh2017-10-236-10/+76
|\
| * Use core rejection handlerJakob Odersky2017-10-202-2/+3
| * Fix default version in ApiPartialDocumentJakob Odersky2017-10-201-1/+1
| * Merge pull request #51 from drivergroup/TRIAL-55v0.10.1Aleksandr2017-10-203-7/+72
| |\
| | * Resolved breaking changesAleksandr2017-10-201-1/+2
| | * Merge branch 'master' into TRIAL-55Aleksandr2017-10-209-165/+293
| | |\ | | |/ | |/|
| | * Fixed typo in HypothesisServiceAleksandr2017-10-201-1/+1
| | * Merge branch 'master' into TRIAL-55Aleksandr2017-10-208-13/+26
| | |\
| | * \ Merge branch 'master' into TRIAL-55Aleksandr2017-10-1912-31/+69
| | |\ \
| | * \ \ Merge branch 'master' into TRIAL-55Aleksandr2017-10-191-2/+8
| | |\ \ \
| | * | | | Fixed ACL for HypothesisAleksandr2017-10-191-1/+3
| | * | | | Added REST API methods to HypothesisServiceAleksandr2017-10-182-6/+68
* | | | | | Added custom set parameters to slick qbKseniya Tomskikh2017-10-231-0/+13
|/ / / / /
* | | | | Merge pull request #50 from drivergroup/entity-list-responsesv0.10.0Kseniya Tomskikh2017-10-209-165/+293
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Apply scalafmtKseniya Tomskikh2017-10-201-13/+13
| * | | | Merge branch 'master' into entity-list-responsesKseniya Tomskikh2017-10-2020-46/+103
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #52 from drivergroup/PDSUI-1088-2v0.9.4Kseniya Tomskikh2017-10-198-13/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | PDSUI-1088 Added labelVersion to documentsKseniya Tomskikh2017-10-198-13/+26
|/ / / /
* | | | Merge pull request #49 from drivergroup/TRIAL-54v0.9.3Kseniya Tomskikh2017-10-1912-31/+69
|\ \ \ \ | |_|_|/ |/| | |
| * | | Review fixesKseniya Tomskikh2017-10-191-1/+1
| * | | TRIAL-54 Study designs as enumKseniya Tomskikh2017-10-1812-31/+69
* | | | Fixing RestEligibilityVerificationService to support empty ineligible_armsv0.9.2vlad2017-10-181-2/+8
| |_|/ |/| |
| | * Review fixesKseniya Tomskikh2017-10-207-161/+245
| | * Created list response for each entityKseniya Tomskikh2017-10-195-71/+115
| |/ |/|
* | Merge pull request #48 from drivergroup/PDSUI-rep-sprayv0.9.1Aleksandr2017-10-182-15/+15
|\ \ | |/ |/|
| * Merge branch 'master' into PDSUI-rep-sprayAleksandr2017-10-182-18/+15
| |\ | |/ |/|
* | Merge pull request #46 from drivergroup/PDSUI-additional-formatsVlad Uspensky2017-10-1811-101/+225
|\ \
| * | Removed unused importAleksandr2017-10-171-1/+0
| * | Code is formattedAleksandr2017-10-171-10/+10
| * | Merge branch 'master' into PDSUI-additional-formatsAleksandr2017-10-1712-533/+801
| |\ \ | |/ / |/| |
| | * All merge conflicts are resolvedAleksandr2017-10-184-88/+210
| | |\ | |_|/ |/| |
* | | Fixed custom formats for rep and tricv0.9.0Kseniya Tomskikh2017-10-173-81/+210
| | * Merge branch 'master' into PDSUI-rep-sprayAleksandr2017-10-1711-472/+620
| | |\ | |_|/ |/| |
* | | Merge pull request #47 from drivergroup/PDSUI-2318v0.8.8Kseniya Tomskikh2017-10-1711-472/+620
|\ \ \
| * | | PDSUI-2318 Created custom swagger format for TMKseniya Tomskikh2017-10-1611-472/+620
|/ / /
| | * Fixed document and extracted data spray formatsAleksandr2017-10-172-15/+15
| |/
| * Resolved conflicts on merge with masterAleksandr2017-10-162-2/+2
| * Merge branch 'master' into PDSUI-additional-formatsAleksandr2017-10-161-1/+1
| |\ | |/ |/|
* | Merge pull request #42 from drivergroup/PDSUI-list-responsev0.8.7Vlad Uspensky2017-10-123-14/+36
|\ \
* | | Fixed fake medical record entity errorv0.8.6Kseniya Tomskikh2017-10-121-1/+1
* | | Merge pull request #45 from drivergroup/revert-44-PDSUI-1088Kseniya Tomskikh2017-10-127-25/+13
|\ \ \
| * | | Revert "PDSUI-1088 Added labelVersion to documents"Kseniya Tomskikh2017-10-127-25/+13
|/ / /
* | | Merge pull request #44 from drivergroup/PDSUI-1088v0.8.4Kseniya Tomskikh2017-10-127-13/+25
|\ \ \
| * | | PDSUI-1088 Added labelVersion to documentsKseniya Tomskikh2017-10-117-13/+25
| | | * Corrected criterion implicit attrbutesAleksandr2017-10-131-2/+2
| | | * Added swagger annotations for new entitiesAleksandr2017-10-134-3/+55
| | | * Fixed criterion and intervention formatsAleksandr2017-10-132-22/+21
| | | * Code is formattedAleksandr2017-10-121-21/+14
| | | * Implemented format for EligibilityArmWithDiseases class; Fixed formats for ot...Aleksandr2017-10-127-68/+158
| | |/
| | * Code is formattedAleksandr2017-10-121-6/+4