Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | All merge conflicts are resolved | Aleksandr | 2017-10-18 | 4 | -88/+210 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Fixed custom formats for rep and tricv0.9.0 | Kseniya Tomskikh | 2017-10-17 | 3 | -81/+210 | |
| | | | ||||||
* | | | Merge branch 'master' into PDSUI-rep-spray | Aleksandr | 2017-10-17 | 11 | -472/+620 | |
|\| | | ||||||
| * | | PDSUI-2318 Created custom swagger format for TM | Kseniya Tomskikh | 2017-10-16 | 11 | -472/+620 | |
| | | | ||||||
* | | | Fixed document and extracted data spray formats | Aleksandr | 2017-10-17 | 2 | -15/+15 | |
| |/ |/| | ||||||
* | | Resolved conflicts on merge with master | Aleksandr | 2017-10-16 | 2 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into PDSUI-additional-formats | Aleksandr | 2017-10-16 | 1 | -1/+1 | |
|\| | ||||||
| * | Merge pull request #42 from drivergroup/PDSUI-list-responsev0.8.7 | Vlad Uspensky | 2017-10-12 | 3 | -14/+36 | |
| |\ | | | | | | | Fixed patientcriterion format; Added format for ListResponse | |||||
| * | | Fixed fake medical record entity errorv0.8.6 | Kseniya Tomskikh | 2017-10-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Revert "PDSUI-1088 Added labelVersion to documents" | Kseniya Tomskikh | 2017-10-12 | 7 | -25/+13 | |
| | | | ||||||
| * | | Merge pull request #44 from drivergroup/PDSUI-1088v0.8.4 | Kseniya Tomskikh | 2017-10-12 | 7 | -13/+25 | |
| |\ \ | | | | | | | | | PDSUI-1088 Added labelVersion to documents | |||||
| | * | | PDSUI-1088 Added labelVersion to documents | Kseniya Tomskikh | 2017-10-11 | 7 | -13/+25 | |
| | | | | ||||||
* | | | | Corrected criterion implicit attrbutes | Aleksandr | 2017-10-13 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Added swagger annotations for new entities | Aleksandr | 2017-10-13 | 4 | -3/+55 | |
| | | | | ||||||
* | | | | Fixed criterion and intervention formats | Aleksandr | 2017-10-13 | 2 | -22/+21 | |
| | | | | ||||||
* | | | | Code is formatted | Aleksandr | 2017-10-12 | 1 | -21/+14 | |
| | | | | ||||||
* | | | | Implemented format for EligibilityArmWithDiseases class; Fixed formats for ↵ | Aleksandr | 2017-10-12 | 7 | -68/+158 | |
| |_|/ |/| | | | | | | | | other classes | |||||
* | | | Code is formatted | Aleksandr | 2017-10-12 | 1 | -6/+4 | |
| | | | ||||||
* | | | Improved ListResponse class | Aleksandr | 2017-10-12 | 1 | -17/+15 | |
| | | | ||||||
* | | | All merge conflicts are resolved | Aleksandr | 2017-10-12 | 70 | -265/+978 | |
|\| | | ||||||
| * | | Using EligibilityArm in EligibilityVerificationService definitionv0.8.3 | vlad | 2017-10-11 | 3 | -6/+8 | |
| | | | ||||||
| * | | Support for boolean filtersv0.8.2 | vlad | 2017-10-11 | 1 | -1/+2 | |
| | | | ||||||
| * | | Support for boolean filters | vlad | 2017-10-11 | 2 | -3/+13 | |
| |/ | ||||||
| * | Merge pull request #37 from drivergroup/add-slot-eligibility-armsv0.8.1 | Kseniya Tomskikh | 2017-10-11 | 60 | -241/+925 | |
| |\ | | | | | | | Add slot eligibility arms | |||||
| | * | 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 | |
| | |\ \ \ \ |