Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #37 from drivergroup/add-slot-eligibility-armsv0.8.1 | Kseniya Tomskikh | 2017-10-11 | 60 | -241/+925 | |
| |\ | ||||||
| | * | add diseaseList to ExportTrialArmv0.7.6 | Marvin Bertin | 2017-10-10 | 5 | -8/+11 | |
| | * | fix merge conflictsv0.7.5 | Marvin Bertin | 2017-10-10 | 90 | -705/+775 | |
| | |\ | ||||||
| | | * | fix exports with EligibilityArms | Marvin Bertin | 2017-10-10 | 5 | -11/+11 | |
| | | * | update to eligibility arm id | Marvin Bertin | 2017-10-10 | 4 | -9/+8 | |
| | | * | add disease list to ExportTrialArm | Marvin Bertin | 2017-10-10 | 6 | -27/+17 | |
| | | * | remove commented code | Marvin Bertin | 2017-10-10 | 1 | -18/+0 | |
| | | * | fix merge conflicts with master | Marvin Bertin | 2017-10-10 | 94 | -725/+535 | |
| | | |\ | ||||||
| | | * \ | Merge branch 'master' into trial-46-disease-entity | Marvin Bertin | 2017-10-10 | 30 | -101/+362 | |
| | | |\ \ | ||||||
| | | * | | | add NoFoundError to CreateReply | Marvin Bertin | 2017-10-05 | 1 | -0/+6 | |
| | | * | | | add sql parameters to getBySlotId | Marvin Bertin | 2017-10-05 | 1 | -1/+4 | |
| | | * | | | fix getBySlotId return type | Marvin Bertin | 2017-10-04 | 1 | -1/+1 | |
| | | * | | | fix getBySlotId return type | Marvin Bertin | 2017-10-04 | 1 | -1/+1 | |
| | | * | | | fix spelling for getBySlotId merthod | Marvin Bertin | 2017-10-04 | 1 | -1/+1 | |
| | | * | | | update EligibilityArmService with slot arm id parameter | Marvin Bertin | 2017-10-04 | 1 | -3/+6 | |
| | | * | | | Merge branch 'add-slot-eligibility-arms' into trial-46-disease-entity | Marvin Bertin | 2017-10-03 | 74 | -633/+1696 | |
| | | |\ \ \ | ||||||
| | | * | | | | update ApiPartialEligibilityArm | Marvin Bertin | 2017-10-02 | 1 | -1/+1 | |
| | | * | | | | update ApiPartialEligibilityArm | Marvin Bertin | 2017-10-02 | 1 | -3/+11 | |
| | | * | | | | update ApiCreateEligibilityArm | Marvin Bertin | 2017-10-02 | 1 | -8/+16 | |
| | | * | | | | add with disease for EligibilityArmService | Marvin Bertin | 2017-10-02 | 1 | -9/+9 | |
| | | * | | | | update ApiEligibilityArm with diseases | Marvin Bertin | 2017-10-02 | 1 | -17/+30 | |
| | | * | | | | fix case class formatting | Marvin Bertin | 2017-10-02 | 1 | -4/+6 | |
| | | * | | | | add EligibilityArmWithDiseases | Marvin Bertin | 2017-10-02 | 1 | -0/+9 | |
| | | * | | | | fix id type for eligibilityArmDisease | Marvin Bertin | 2017-10-02 | 1 | -1/+1 | |
| | | * | | | | add EligibilityArmDisease entity | Marvin Bertin | 2017-09-28 | 1 | -0/+11 | |
| | * | | | | | add json format tests for Slot and Eligibility arms | Marvin Bertin | 2017-10-10 | 29 | -153/+348 | |
| | | |/ / / | | |/| | | | ||||||
| | * | | | | Merge branch 'master' into add-slot-eligibility-arms | Marvin Bertin | 2017-10-03 | 73 | -633/+1681 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Added SlotArmEligibilityArm entity | timgushue | 2017-09-29 | 1 | -0/+15 | |
| | | |/ / / | | |/| | | | ||||||
| | * | | | | Removed condition from trial | timgushue | 2017-09-27 | 7 | -16/+2 | |
| | * | | | | Merge branch 'master' into add-slot-eligibility-arms | timgushue | 2017-09-27 | 14 | -43/+297 | |
| | |\ \ \ \ | ||||||
| | * | | | | | fixing test in CriterionFormatSuite | timgushue | 2017-09-26 | 9 | -14/+17 | |
| | * | | | | | Fixed richcriterion to use eligibility arms | timgushue | 2017-09-26 | 6 | -10/+10 | |
| | * | | | | | Fixing some intervention slotarm type issues and eligibility issues | timgushue | 2017-09-26 | 4 | -5/+5 | |
| | * | | | | | fixing imports for slot and eligibility arms | timgushue | 2017-09-25 | 3 | -0/+5 | |
| | * | | | | | Added slot and eligibility arms to entities, json and services | timgushue | 2017-09-25 | 10 | -0/+424 | |
| * | | | | | | Merge pull request #43 from drivergroup/PDSUI-2265v0.8.0 | Kseniya Tomskikh | 2017-10-11 | 8 | -14/+30 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | PDSUI-2265 Added 'Error' to MedicalRecordService.CreateReply | Kseniya Tomskikh | 2017-10-10 | 1 | -0/+4 | |
| | * | | | | | | PDSUI-2265 Added total_pages field to MedicalRecord | Kseniya Tomskikh | 2017-10-10 | 7 | -14/+26 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | Merge pull request #41 from drivergroup/TRIAL-52 | Kseniya Tomskikh | 2017-10-11 | 1 | -2/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | TRIAL-52 Fixed check of intervention for null value of delivery method | Kseniya Tomskikh | 2017-10-09 | 1 | -2/+1 | |
* | | | | | | | Code is formatted | Aleksandr | 2017-10-10 | 2 | -3/+2 | |
* | | | | | | | All merge conflicts are resolved | Aleksandr | 2017-10-10 | 57 | -433/+271 | |
|\| | | | | | | ||||||
| * | | | | | | Ignore unknown fields in jsonv0.7.4 | Kseniya Tomskikh | 2017-10-10 | 1 | -1/+2 | |
| * | | | | | | Update PatientLabelEvidenceView to support to Provider and Document typev0.7.3 | vlad | 2017-10-09 | 4 | -8/+11 | |
| * | | | | | | Getting rid of the FuzzyValues, Name as a string, and conditionv0.7.1 | vlad | 2017-10-09 | 20 | -140/+50 | |
| * | | | | | | Getting rid of the FuzzyValues, Name as a string, and condition | vlad | 2017-10-09 | 42 | -286/+194 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #40 from drivergroup/fix-slick-qbv0.6.1 | Kseniya Tomskikh | 2017-10-06 | 1 | -5/+20 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fixed set list parameters in sql | Kseniya Tomskikh | 2017-10-06 | 1 | -10/+11 | |
| | * | | | | | Added implicit set parameter object for slick query builder | Kseniya Tomskikh | 2017-10-05 | 1 | -4/+18 | |
| | | |_|_|/ | | |/| | | | ||||||
* | / | | | | Fixed patientcriterion format; Added format for ListResponse | Aleksandr | 2017-10-10 | 4 | -20/+45 | |
|/ / / / / |