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> Apr 11 2017, 21:33 - Pushed
mickmis Oct 25 2017, 14:31 - Parents
- R2664:7148491ad196: Human-readable output from the new qep service, thanks to Ty. SHRINE-1980
R2664:3fdcd37f54c1: further work on json storage and representation - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7148491ad196 | David Walend | Human-readable output from the new qep service, thanks to Ty. SHRINE-1980 | Apr 11 2017 | |||
| c2c6f3dd9c1c | David Walend | Less in the json to help Ben read it. SHRINE-1980 | Apr 11 2017 | |||
| 6219afa7fc78 | David Walend | More for SHRINE-1981, shrine.war needs slf4j-log4j | Apr 10 2017 | |||
| 44c1bedf7a70 | David Walend | pom.xml file fix for SHRINE-1981, only slf4j-log4j in the war files | Apr 10 2017 | |||
| 7ffc8bc5787a | Simon Chang | Merge pull request #6 in SHRINE/shrine from ~SCHANG/shrine:release/1.23.2.3 to… | Apr 10 2017 | |||
| ddd77424e952 | David Walend | Removing extra debug logging | Apr 10 2017 | |||
| 88fb19273640 | Simon Chang | Change test location to directory on local file system. (ITEAM-390) | Apr 10 2017 | |||
| f97ae384453e | David Walend | Logging in the database layer to debug why it is so slow | Apr 7 2017 | |||
| 0805adc914b0 | David Walend | Trace logging for SHRINE-1963, plus a missing default config value. | Apr 7 2017 | |||
| f61baf7e8fbd | David Walend | Moving a missing reference.conf property to where it is needed | Apr 7 2017 | |||
| 4eee2a84f05b | bendcarmen | started styling the status of pending and error | Apr 6 2017 | |||
| c282fd006a4d | David Walend | Not the prettiest json, but should be good enough for testing. SHRINE-1964 | Apr 6 2017 | |||
| 963b2811b33d | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Apr 6 2017 | |||
| 9f8e49b83c3a | David Walend | Wrap up SHRINE-1963, db testing work, and most of SHRINE-1964 | Apr 6 2017 | |||
| b7c362164613 | bendcarmen | merge of branch feature/sprint2 - which is the branch used for the query viewer | Apr 6 2017 | |||
| fb149f6ed4b1 | bendcarmen | merged develop into feature/sprint2 | Apr 6 2017 | |||
| 5ab58d36d9e2 | David Walend | Updating to 1.23.2.3-SNAPSHOT | Apr 5 2017 | |||
| 80fd54e90ce3 | bendcarmen | shrine plugin parent child iframe route selection | Apr 5 2017 | |||
| 21feb334cb38 | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Apr 5 2017 | |||
| df5b3b56fa8e | David Walend | Code changes to get data flowing for SHRINE-1963 | Apr 5 2017 | |||
| 5e7831451f6f | bendcarmen | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Apr 4 2017 | |||
| 4e832185eb7d | bendcarmen | added yui files | Apr 4 2017 | |||
| 0a272ba736f0 | bendcarmen | Fix of shrine-webclinet assembly.xml settings...wilcard changed from /* to… | Apr 4 2017 | |||
| 6515747cbc8a | bendcarmen | latest | Apr 4 2017 | |||
| c473207eb24d | bendcarmen | latest version | Apr 3 2017 | |||
| 5b4d0b8b474a | bendcarmen | optimized space, added alternating row colors | Mar 31 2017 | |||
| a7150e8fed60 | bendcarmen | Style fixes for layout | Mar 31 2017 | |||
| 7b480f897a49 | bendcarmen | latest version | Mar 31 2017 | |||
| 2cf5749cc2f7 | bendcarmen | latest version optimized for both webkit and gecko | Mar 29 2017 | |||
| c9683d9ae20b | bendcarmen | restyle of table | Mar 28 2017 | |||
| 96d3997134de | bendcarmen | latest version of async query viewer | Mar 28 2017 | |||
| 3a6532cfc68e | bendcarmen | latest | Mar 27 2017 | |||
| 5fc64f51b408 | bendcarmen | latest version | Mar 24 2017 |
