aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge pull request #42 from drivergroup/PDSUI-list-responsev0.8.7Vlad Uspensky2017-10-123-14/+36
|\
| * Code is formattedAleksandr2017-10-121-6/+4
| * Improved ListResponse classAleksandr2017-10-121-17/+15
| * All merge conflicts are resolvedAleksandr2017-10-1270-265/+978
| |\
| * | Code is formattedAleksandr2017-10-102-3/+2
| * | All merge conflicts are resolvedAleksandr2017-10-1058-435/+273
| |\ \
| * | | Fixed patientcriterion format; Added format for ListResponseAleksandr2017-10-104-20/+45
* | | | 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
* | | | 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-112-3/+13
|/ / /
* | | Merge pull request #37 from drivergroup/add-slot-eligibility-armsv0.8.1Kseniya Tomskikh2017-10-1160-241/+925
|\ \ \
| * | | add diseaseList to ExportTrialArmv0.7.6Marvin Bertin2017-10-105-8/+11
| * | | fix merge conflictsv0.7.5Marvin Bertin2017-10-1091-708/+778
| |\ \ \
| | * \ \ Merge pull request #35 from drivergroup/trial-46-disease-entityMarvin Bertin2017-10-10107-849/+954
| | |\ \ \
| | | * | | fix exports with EligibilityArmsMarvin Bertin2017-10-105-11/+11
| | | * | | update to eligibility arm idMarvin Bertin2017-10-104-9/+8
| | | * | | add disease list to ExportTrialArmMarvin Bertin2017-10-106-27/+17
| | | * | | remove commented codeMarvin Bertin2017-10-101-18/+0
| | | * | | fix merge conflicts with masterMarvin Bertin2017-10-1095-727/+537
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch 'master' into trial-46-disease-entityMarvin Bertin2017-10-1031-103/+364
| | | |\ \ \
| | | * | | | 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-0375-635/+1698
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | 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-1029-153/+348
| |/ / / / /
| * | | | | Merge branch 'master' into add-slot-eligibility-armsMarvin Bertin2017-10-0374-635/+1683
| |\ \ \ \ \
| * | | | | | Added SlotArmEligibilityArm entitytimgushue2017-09-291-0/+15
| | |/ / / / | |/| | | |
| * | | | | Removed condition from trialtimgushue2017-09-277-16/+2
| * | | | | Merge branch 'master' into add-slot-eligibility-armstimgushue2017-09-2714-43/+297
| |\ \ \ \ \
| * | | | | | fixing test in CriterionFormatSuitetimgushue2017-09-269-14/+17
| * | | | | | Fixed richcriterion to use eligibility armstimgushue2017-09-266-10/+10