Merge branch 'develop' into feature/webclient-sandbox
Description
Description
Details
Details
- Committed
ben-carmen <benjamin_carmen@hms.harvard.edu> Feb 3 2017, 20:16 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:818aae34c45c: Merge branch 'feature/webclient-sandbox' of https://open.med.harvard.
R2664:b6f0a16b0883: fixed a test - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b6f0a16b0883 | Ty | fixed a test | Feb 1 2017 | |||
| eab35d539d15 | Ty | added test | Feb 1 2017 | |||
| e9584c66726f | Ty | moved extractors to package object and formatting | Feb 1 2017 | |||
| 05b0bbccd695 | Ty | moved json structures, finished first draft | Feb 1 2017 | |||
| c453486b5556 | Ty | further work on query json structures | Jan 31 2017 | |||
| 4f9ab3ff58b8 | Ty | fixed json structures | Jan 31 2017 | |||
| f109100dff3a | Ty | first draft of json structure implementations | Jan 31 2017 | |||
| 484585b01eb4 | Ty | further tweaking to jsonDemos, added in Rapture | Jan 25 2017 | |||
| bd4d56dac287 | Ty | fixed bug where navigating back to summary page causes AdapterDate to become… | Jan 25 2017 | |||
| 7ddf5bae7c54 | Ty | typeof instead of isFinite | Jan 25 2017 | |||
| 55b5f76ea4e2 | Ty | edited formatDate function | Jan 25 2017 | |||
| 269928c2538e | Ty | messing around with Jawn | Jan 24 2017 | |||
| 8680f01ca9b7 | Ty | red for summary error | Jan 24 2017 | |||
| b3eea30e1d1d | Ty | cleaned up summary timeout reporting | Jan 24 2017 | |||
| 17a5b4c91617 | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Jan 24 2017 | |||
| 5a1a6c69e483 | Ty | merging | Jan 24 2017 | |||
| 63a472a7f182 | David Walend | Dropping back the mysql version | Jan 23 2017 | |||
| 6d97d5317432 | David Walend | Upgraded the last of the easy dependencies for SHRINE-1851 | Jan 20 2017 | |||
| 21a1d29ad7c2 | David Walend | Updated top-level dependencies | Jan 20 2017 | |||
| 6884782c19f4 | Ty | updated json design docs to schemas | Jan 18 2017 | |||
| 70e71291bb0b | Ty | fixed up tests | Jan 17 2017 | |||
| 2903d8e95df4 | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Jan 17 2017 | |||
| a4e950fc29b7 | Ty | design notes for json structures, made timeout configurable | Jan 17 2017 |