aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PDSUI-rep-sprayAleksandr2017-10-181-8/+1
|\
| * Removed unused importAleksandr2017-10-171-1/+0
| * Merge branch 'master' into PDSUI-additional-formatsAleksandr2017-10-1711-429/+668
| |\
* | \ All merge conflicts are resolvedAleksandr2017-10-183-5/+130
|\ \ \ | | |/ | |/|
| * | Fixed custom formats for rep and tricv0.9.0Kseniya Tomskikh2017-10-172-3/+130
* | | Merge branch 'master' into PDSUI-rep-sprayAleksandr2017-10-1710-420/+540
|\| |
| * | PDSUI-2318 Created custom swagger format for TMKseniya Tomskikh2017-10-1610-420/+540
* | | 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-133-2/+49
* | | | 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-1240-80/+684
|\| |
| * | Using EligibilityArm in EligibilityVerificationService definitionv0.8.3vlad2017-10-113-6/+8
| |/
| * 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-1074-589/+560
| | |\
| | | * fix exports with EligibilityArmsMarvin Bertin2017-10-104-8/+8
| | | * update to eligibility arm idMarvin Bertin2017-10-104-9/+8
| | | * add disease list to ExportTrialArmMarvin Bertin2017-10-105-21/+12
| | | * remove commented codeMarvin Bertin2017-10-101-18/+0
| | | * fix merge conflicts with masterMarvin Bertin2017-10-1063-465/+272
| | | |\
| | | * \ Merge branch 'master' into trial-46-disease-entityMarvin Bertin2017-10-1024-93/+220
| | | |\ \
| | | * | | add NoFoundError to CreateReplyMarvin Bertin2017-10-051-0/+6
| | | * | | add sql parameters to getBySlotIdMarvin Bertin2017-10-051-1/+4
| | | * | | fix getBySlotId return typeMarvin Bertin2017-10-041-1/+1
| | | * | | fix getBySlotId return typeMarvin Bertin2017-10-041-1/+1
| | | * | | fix spelling for getBySlotId merthodMarvin Bertin2017-10-041-1/+1
| | | * | | update EligibilityArmService with slot arm id parameterMarvin Bertin2017-10-041-3/+6
| | | * | | Merge branch 'add-slot-eligibility-arms' into trial-46-disease-entityMarvin Bertin2017-10-0360-598/+1305
| | | |\ \ \
| | | * | | | update ApiPartialEligibilityArmMarvin Bertin2017-10-021-1/+1
| | | * | | | update ApiPartialEligibilityArmMarvin Bertin2017-10-021-3/+11
| | | * | | | update ApiCreateEligibilityArmMarvin Bertin2017-10-021-8/+16
| | | * | | | add with disease for EligibilityArmServiceMarvin Bertin2017-10-021-9/+9
| | | * | | | update ApiEligibilityArm with diseasesMarvin Bertin2017-10-021-17/+30
| | | * | | | fix case class formattingMarvin Bertin2017-10-021-4/+6
| | | * | | | add EligibilityArmWithDiseasesMarvin Bertin2017-10-021-0/+9
| | | * | | | fix id type for eligibilityArmDiseaseMarvin Bertin2017-10-021-1/+1
| | | * | | | add EligibilityArmDisease entityMarvin Bertin2017-09-281-0/+11
| | * | | | | add json format tests for Slot and Eligibility armsMarvin Bertin2017-10-103-3/+89
| | | |/ / / | | |/| | |