Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Feb 7 2017, 17:38 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:d154834cd2b5: Merge branch 'develop' into feature/webclient-sandbox
R2664:785418d46352: Handle unknown host exception - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d154834cd2b5 | ben-carmen | Merge branch 'develop' into feature/webclient-sandbox | Feb 3 2017 | |||
| 818aae34c45c | ben-carmen | Merge branch 'feature/webclient-sandbox' of https://open.med.harvard. | Feb 3 2017 | |||
| c440086eb629 | ben-carmen | this is the latest version of the sandbox, about to merge with develop | Feb 3 2017 | |||
| c74c558e7d4a | Ben Carmen | latest | Feb 1 2017 | |||
| 40bdb3c8bc88 | ben-carmen | created cohorts template | Jan 30 2017 | |||
| 84500dbbcedc | ben-carmen | commit of missing files | Jan 30 2017 | |||
| 5f9d8117d5a7 | ben-carmen | latest version | Jan 30 2017 | |||
| 1496aa8010bc | Ben Carmen | added Aurelia Framework to shrine plugin webclient code | Jan 27 2017 | |||
| f8047293293e | Ben Carmen | major cleanup of Webclient directory to facilitate gulp and node builds | Jan 27 2017 | |||
| 405f30f56a3d | Ben Carmen | more cleanup | Jan 27 2017 | |||
| 51bfd72b447c | Ben Carmen | latest | Jan 27 2017 | |||
| 71ebb85e34f9 | Ben Carmen | webclient directory cleanup and maven pom target updates | Jan 27 2017 | |||
| 651f7f41b3dd | Ben Carmen | changed the Webclient build directory in maven from html to js, also cleaned up… | Jan 27 2017 | |||
| e4464e82884b | ben-carmen | add a temporary jQuery (document).ready handler to verify prototype and jQuery… | Jan 26 2017 | |||
| eca2a878aafd | ben-carmen | updated shrine_config_data.js | Jan 25 2017 | |||
| d03e548a8efc | ben-carmen | minor refactor | Jan 25 2017 | |||
| d9485aa32840 | ben-carmen | successful sanboxing of SHRINE | Jan 25 2017 | |||
| 9bf9383b7a86 | ben-carmen | latest version of PM mock | Jan 24 2017 | |||
| ce38a9f60193 | ben-carmen | working on node pm server | Jan 23 2017 | |||
| 0e407c9e85a1 | ben-carmen | local proxy is working! | Jan 19 2017 | |||
| f6153e9e5842 | ben-carmen | latest | Jan 19 2017 | |||
| 2d84976f316c | ben-carmen | trying to make a local i2b2 PM server | Jan 19 2017 | |||
| 52c44b98bf37 | ben-carmen | first commit, created a new branch to sandbox shrine portion of webclient | Jan 19 2017 |