Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PDSUI-2330 | Aleksandr | 2017-10-23 | 15 | -175/+369 |
|\ | |||||
| * | Use core rejection handler | Jakob Odersky | 2017-10-20 | 2 | -2/+3 |
| | | |||||
| * | Fix default version in ApiPartialDocument | Jakob Odersky | 2017-10-20 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #51 from drivergroup/TRIAL-55v0.10.1 | Aleksandr | 2017-10-20 | 3 | -7/+72 |
| |\ | | | | | | | TRIAL-55 Create REST API for admins to edit Hypotheses, remove Hypotheses sync | ||||
| | * | Resolved breaking changes | Aleksandr | 2017-10-20 | 1 | -1/+2 |
| | | | |||||
| | * | Merge branch 'master' into TRIAL-55 | Aleksandr | 2017-10-20 | 9 | -165/+293 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #50 from drivergroup/entity-list-responsesv0.10.0 | Kseniya Tomskikh | 2017-10-20 | 9 | -165/+293 |
| |\ \ | | | | | | | | | Created list response for each entity | ||||
| | * | | Apply scalafmt | Kseniya Tomskikh | 2017-10-20 | 1 | -13/+13 |
| | | | | |||||
| | * | | Merge branch 'master' into entity-list-responses | Kseniya Tomskikh | 2017-10-20 | 20 | -46/+103 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Review fixes | Kseniya Tomskikh | 2017-10-20 | 7 | -161/+245 |
| | | | | |||||
| | * | | Created list response for each entity | Kseniya Tomskikh | 2017-10-19 | 5 | -71/+115 |
| | | | | |||||
| | | * | Fixed typo in HypothesisService | Aleksandr | 2017-10-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'master' into TRIAL-55 | Aleksandr | 2017-10-20 | 8 | -13/+26 |
| | | |\ | | |_|/ | |/| | | |||||
| | | * | Merge branch 'master' into TRIAL-55 | Aleksandr | 2017-10-19 | 12 | -31/+69 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into TRIAL-55 | Aleksandr | 2017-10-19 | 1 | -2/+8 |
| | | |\ \ | |||||
| | | * | | | Fixed ACL for Hypothesis | Aleksandr | 2017-10-19 | 1 | -1/+3 |
| | | | | | | |||||
| | | * | | | Added REST API methods to HypothesisService | Aleksandr | 2017-10-18 | 2 | -6/+68 |
| | |/ / / | |||||
* | / / / | Added 'inclusion' field to PatientCriterion | Aleksandr | 2017-10-23 | 5 | -10/+17 |
|/ / / / | |||||
* | | | | Merge pull request #52 from drivergroup/PDSUI-1088-2v0.9.4 | Kseniya Tomskikh | 2017-10-19 | 8 | -13/+26 |
|\ \ \ \ | |_|_|/ |/| | | | PDSUI-1088 Added labelVersion to documents | ||||
| * | | | PDSUI-1088 Added labelVersion to documents | Kseniya Tomskikh | 2017-10-19 | 8 | -13/+26 |
|/ / / | |||||
* | | | Merge pull request #49 from drivergroup/TRIAL-54v0.9.3 | Kseniya Tomskikh | 2017-10-19 | 12 | -31/+69 |
|\ \ \ | |_|/ |/| | | TRIAL-54 Study designs as enum | ||||
| * | | Review fixes | Kseniya Tomskikh | 2017-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | TRIAL-54 Study designs as enum | Kseniya Tomskikh | 2017-10-18 | 12 | -31/+69 |
| | | | |||||
* | | | Fixing RestEligibilityVerificationService to support empty ineligible_armsv0.9.2 | vlad | 2017-10-18 | 1 | -2/+8 |
| |/ |/| | |||||
* | | Merge pull request #48 from drivergroup/PDSUI-rep-sprayv0.9.1 | Aleksandr | 2017-10-18 | 2 | -15/+15 |
|\ \ | |/ |/| | Fixed spray formats of entities used in Rep | ||||
| * | Merge branch 'master' into PDSUI-rep-spray | Aleksandr | 2017-10-18 | 2 | -18/+15 |
| |\ | |/ |/| | |||||
* | | Merge pull request #46 from drivergroup/PDSUI-additional-formats | Vlad Uspensky | 2017-10-18 | 11 | -101/+225 |
|\ \ | | | | | | | Implemented format for EligibilityArmWithDiseases class; Fixed formats for other classes | ||||
| * | | Removed unused import | Aleksandr | 2017-10-17 | 1 | -1/+0 |
| | | | |||||
| * | | Code is formatted | Aleksandr | 2017-10-17 | 1 | -10/+10 |
| | | | |||||
| * | | Merge branch 'master' into PDSUI-additional-formats | Aleksandr | 2017-10-17 | 12 | -533/+801 |
| |\ \ | |/ / |/| | | |||||
| | * | 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 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #47 from drivergroup/PDSUI-2318v0.8.8 | Kseniya Tomskikh | 2017-10-17 | 11 | -472/+620 |
|\ \ \ | | | | | | | | | PDSUI-2318 Created custom swagger format for TM | ||||
| * | | | 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 |
| | | | |||||
* | | | Merge pull request #45 from drivergroup/revert-44-PDSUI-1088 | Kseniya Tomskikh | 2017-10-12 | 7 | -25/+13 |
|\ \ \ | | | | | | | | | Revert "PDSUI-1088 Added labelVersion to documents" | ||||
| * | | | 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 |
| | | |