aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:drivergroup/pds-ui-commonv0.10.3v0.10.2Kseniya Tomskikh2017-10-235-9/+75
|\
| * Use core rejection handlerJakob Odersky2017-10-201-1/+2
| * Fix default version in ApiPartialDocumentJakob Odersky2017-10-201-1/+1
| * Resolved breaking changesAleksandr2017-10-201-1/+2
| * Merge branch 'master' into TRIAL-55Aleksandr2017-10-208-148/+281
| |\
| * | Fixed typo in HypothesisServiceAleksandr2017-10-201-1/+1
| * | Merge branch 'master' into TRIAL-55Aleksandr2017-10-206-10/+21
| |\ \
| * \ \ Merge branch 'master' into TRIAL-55Aleksandr2017-10-1910-24/+66
| |\ \ \
| * \ \ \ 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
| |_|_|_|/ |/| | | |
* | | | | Apply scalafmtKseniya Tomskikh2017-10-201-13/+13
* | | | | Merge branch 'master' into entity-list-responsesKseniya Tomskikh2017-10-2016-36/+95
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | PDSUI-1088 Added labelVersion to documentsKseniya Tomskikh2017-10-196-10/+21
| | |_|/ | |/| |
| * | | Merge pull request #49 from drivergroup/TRIAL-54v0.9.3Kseniya Tomskikh2017-10-1910-24/+66
| |\ \ \ | | |_|/ | |/| |
| | * | TRIAL-54 Study designs as enumKseniya Tomskikh2017-10-1810-24/+66
| * | | 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-194-54/+103
|/ /
* | Merge branch 'master' into PDSUI-rep-sprayAleksandr2017-10-182-18/+15
|\|
| * 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
|\| |
| * | 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-122-13/+34
| |\
| * | Fixed fake medical record entity errorv0.8.6Kseniya Tomskikh2017-10-121-1/+1
| * | Revert "PDSUI-1088 Added labelVersion to documents"Kseniya Tomskikh2017-10-125-20/+10
| * | Merge pull request #44 from drivergroup/PDSUI-1088v0.8.4Kseniya Tomskikh2017-10-125-10/+20
| |\ \
| | * | PDSUI-1088 Added labelVersion to documentsKseniya Tomskikh2017-10-115-10/+20
* | | | 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-125-32/+103
| |_|/ |/| |
* | | Code is formattedAleksandr2017-10-121-6/+4
* | | Improved ListResponse classAleksandr2017-10-121-17/+15
* | | All merge conflicts are resolvedAleksandr2017-10-1241-82/+690
|\| |
| * | Using EligibilityArm in EligibilityVerificationService definitionv0.8.3vlad2017-10-113-6/+8
| * | Support for boolean filtersv0.8.2vlad2017-10-111-1/+2
| * | Support for boolean filtersvlad2017-10-111-2/+5
| |/
| * Merge pull request #37 from drivergroup/add-slot-eligibility-armsv0.8.1Kseniya Tomskikh2017-10-1131-63/+653
| |\
| | * add diseaseList to ExportTrialArmv0.7.6Marvin Bertin2017-10-104-5/+8
| | * fix merge conflictsv0.7.5Marvin Bertin2017-10-1078-636/+584
| | |\