Merge remote-tracking branch 'origin/develop' into develop
Description
Description
Details
Details
- Committed
David Walend <david_walend@hms.harvard.edu> Nov 29 2016, 16:15 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:ab0d599b2fb3: Revert "Merge branch 'release/1.22.2' into develop"
R2664:37e1a9528a2d: Merge branch '1.22.2.x' into develop - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 37e1a9528a2d | Ty | Merge branch '1.22.2.x' into develop | Nov 23 2016 | |||
| d326a4ea1160 | Ty | got rid of attempt to handle browser requests to adapter/requests | Nov 23 2016 | |||
| 9e140e118556 | Ty | Merge branch '1.22.2.x' into develop | Nov 23 2016 | |||
| f830558696d0 | Ty | qep url fix, testing broadcaster url fix | Nov 23 2016 | |||
| a0ad37a51947 | Ty | scanner fix | Nov 23 2016 | |||
| 527b1a424792 | Ty | qep url mege | Nov 23 2016 | |||
| 24d151aecb31 | Ty | qep url fix | Nov 23 2016 | |||
| 42ea90a30faf | Ty | version update to 1.22.2.2 | Nov 22 2016 | |||
| eff632aa01aa | Ty | pom version fix after merge | Nov 22 2016 | |||
| 61634228e70e | Ty | Merge branch 'release/1.22.2' into develop | Nov 22 2016 | |||
| 2511dc6acf77 | Ty | fixed logout remote dashboard bug | Nov 22 2016 | |||
| 4fb16d4da48f | Ty | fixed hub appearance tab | Nov 22 2016 | |||
| c630f70664cc | Ty | Merge branch 'develop' into release/1.22.2 | Nov 22 2016 | |||
| 2d5a0f1b10e6 | Ty | hub won't appear for remote dashboards | Nov 22 2016 | |||
| 8d40b06cad5d | Ty | fixed version | Nov 22 2016 | |||
| 68eab76ec690 | Ty | Merge branch 'develop' into release/1.22.2 | Nov 22 2016 | |||
| e220ae3414aa | Ty | removed a println | Nov 22 2016 | |||
| 38f299fde041 | Ty | fixed name conflict | Nov 22 2016 | |||
| cdfb1e4adc90 | Ty | better error reporting for InavlidVerifySignatureResponse, default info message… | Nov 22 2016 | |||
| 62a90184918d | Ty | removed println | Nov 21 2016 | |||
| 73f100605938 | Ty | removed println | Nov 21 2016 | |||
| 410453f47323 | Ty | fixed merge version conflict | Nov 21 2016 | |||
| 47e302dab01c | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Nov 21 2016 | |||
| a49af481c0df | Ty | front end fixes for Dashboard | Nov 21 2016 | |||
| 5ecc1bbfaef6 | Ty | frontend fixes | Nov 21 2016 | |||
| 00b9c7de3476 | Ty | got rid of weird base case check on remoteSiteStatuses for keystore panel | Nov 18 2016 | |||
| 1d1e1ff2d309 | Ty | version fixon dashboard fixed | Nov 18 2016 | |||
| 29d3e3778fa8 | Ty | updated version to 1.23.1.0-SNAPSHOT | Nov 18 2016 | |||
| 5e238ec69ffa | Ty | conf change | Nov 17 2016 |