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 4 2017, 23:14 - Pushed
mickmis Oct 25 2017, 14:31 - Parents
- R2664:e24f5086bad5: latest
R2664:a2c6fe2924db: Testing with different drivers, wrote cross table query and can produce it in… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e24f5086bad5 | bendcarmen | latest | Apr 4 2017 | |||
| 973b92b4eb07 | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Apr 4 2017 | |||
| 6284d1140170 | David Walend | DB changes to support previous queries view (for now) SHRINE-1963 | Apr 4 2017 | |||
| b4caec7f62b9 | bendcarmen | added missing yui files | Apr 4 2017 | |||
| d4261b2a6a81 | bendcarmen | attempt to fix yui | Apr 4 2017 | |||
| 149f51424e4e | bendcarmen | adding yui additions | Apr 4 2017 | |||
| 7f59a2b315f3 | bendcarmen | addition of missing js-ext/yui files | Apr 4 2017 | |||
| f7379e5e7ac5 | David Walend | Web API for SHRINE-1962. | Apr 4 2017 | |||
| b84390cc6d4c | bendcarmen | Fix of shrine-webclinet assembly.xml settings...wilcard changed from /* to… | Apr 4 2017 | |||
| 1dbccea73fd8 | David Walend | User authorization for SHRINE-1962. | Apr 4 2017 | |||
| 428879639fe9 | David Walend | First blush of work to get previous queries from a new service. SHRINE-1962. | Apr 3 2017 | |||
| 4ef1018c50a5 | David Walend | Spray subservice in meta-war. Wrapping up SHRINE-1967. | Mar 31 2017 | |||
| adcddf91cab0 | David Walend | Partway to turning tests back on for SHRINE-1967 | Mar 31 2017 | |||
| b677718266fb | David Walend | todos for the next block of work | Mar 30 2017 | |||
| e0d41f28704c | David Walend | Merging 1.22.6 | Mar 29 2017 | |||
| 364cdfe1db60 | Catalyst Bamboo | Merge release branch branches/1.22.5 into master. | Mar 23 2017 | |||
| d948fbe6527e | Catalyst Bamboo | Update POMs with release version 1.22.6. | Mar 23 2017 | |||
| 54e5ad4a20d9 | Catalyst Bamboo | POM version updated to 1.22.6-SNAPSHOT by SChang on build server. (ITEAM-1413) | Mar 23 2017 | |||
| 341e070756c3 | David Walend | Review comments for SHRINE-1949 | Mar 21 2017 | |||
| bcff97d13627 | David Walend | Removing dead code, and permitting expired certs to support SHRINE-1949 | Mar 20 2017 | |||
| 8cf5d9070eb0 | David Walend | Merge remote-tracking branch 'origin/patch/1.22.2.4.1' into branches/1.22.5 | Mar 20 2017 | |||
| cd481d9b795f | David Walend | Updating the pom.xml to use our standard numbering before moving to QA | Mar 20 2017 | |||
| 275baa8d440c | David Walend | Added a response and stopped printing shrine.conf's contents. | Mar 14 2017 | |||
| 61a6bbfc948d | David Walend | pom.xml updates | Mar 13 2017 | |||
| fa452e853b15 | David Walend | Put together a tool to test https connections on the command line | Mar 13 2017 | |||
| 8b75dfb7c897 | Ty | possible update to keystore | Mar 1 2017 | |||
| 3d437cca0dc3 | Catalyst Bamboo | Merge release branch patch/1.22.2.4 into master. | Jan 25 2017 | |||
| 5f67068ab1f7 | Catalyst Bamboo | Update POMs with release version 1.22.4. | Jan 25 2017 | |||
| ca968d2fdfec | Mike Cherry | pom updates (version number and Nexus target) for public release of 1.2.4 | Jan 25 2017 | |||
| 3c333defb7a6 | ben-carmen | Bump of the patch version number to 1.22.2.4.2-SNAPSHOT and fix for SHRINE-1869 | Jan 23 2017 | |||
| 838443c5f370 | ben-carmen | updated webclient .pdf help file | Jan 19 2017 | |||
| 939adb5b1499 | ben-carmen | Fix of SHRINE-1638 | Jan 11 2017 | |||
| 1bba2458fe25 | Ty | dashboard patch fixes | Jan 11 2017 | |||
| 0f5678a64b00 | Ty | version update from 1.22.3 to 1.22.2.4.1-SNAPSHOT | Jan 11 2017 | |||
| 06d364b84374 | Catalyst Bamboo | Merge release branch release/1.22.2.4 into master. | Jan 5 2017 | |||
| 23de2099ce18 | Catalyst Bamboo | Update POMs with release version 1.22.3. | Jan 5 2017 | |||
| 3c9ad07c1202 | Andrew Dion | renaming 'releases-internal' to 'releases' and updating to version 1.22.3… | Jan 4 2017 | |||
| 60c422155cf0 | Catalyst Bamboo | Merge release branch release/1.22.2.4 into master. | Dec 21 2016 | |||
| 5f1835cc9118 | Catalyst Bamboo | Update POMs with release version 1.22.2.4. | Dec 21 2016 | |||
| dbd131381033 | Catalyst Bamboo | Merge release branch release/1.22.2 into master. | Nov 17 2016 | |||
| b853f5375c71 | Catalyst Bamboo | Merge release branch release/1.22.1 into master. | Nov 2 2016 | |||
| 5d7ca9b76d06 | Catalyst Bamboo | Update POMs with release version 1.22.1.4. | Nov 2 2016 | |||
| 8364b69a03e9 | ben-carmen | Fix for SHRINE-1382: QA tier: Query tool: Drop down appearing below Query Name… | Oct 7 2016 | |||
| 43095f57cc20 | ben-carmen | Fix for SHRINE-1446 | Oct 6 2016 | |||
| 6aee660c8daa | ben-carmen | Fix of SHRINE-1446 was not allowing calendar to select date | Sep 29 2016 | |||
| 923f4e10748d | Catalyst Bamboo | Merge release branch hotfix/1.21.2 into master. | Jun 17 2016 | |||
| 30eca828de7c | Catalyst Bamboo | Update POMs with release version 1.21.2. | Jun 17 2016 | |||
| 643f65bf7a95 | David Walend | Possible fix for SHRINE-1524 | Jun 9 2016 | |||
| 6270e5bf8418 | David Walend | New version for SHRINE-1524 hot fix | Jun 7 2016 | |||
| 5d5f9fafee7e | Catalyst Bamboo | Merge release branch hotfix/1.21.1 into master. | May 18 2016 |
