Merge release branch release/1.21.0 into master.
Description
Description
Details
Details
- Committed
Catalyst Bamboo <catalyst-iteam@hms.harvard.edu> May 17 2016, 22:05 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:6779dd2d3eb1: Update POMs with release version 1.21.0.
R2664:d6b3abb0be0d: Merge release branch hotfix/1.20.1 into master. - Branches
- Unknown
- Tags
- References
- tag: 1.21.0
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
6779dd2d3eb1 | Catalyst Bamboo | Update POMs with release version 1.21.0. | May 17 2016 | |||
73097831e653 | Keith Dwyer | [webclient] add updated webclient help PDF | May 17 2016 | |||
bde71070baca | David Walend | Another try at getting better text for SHRINE-1484 | May 12 2016 | |||
9d892c177392 | David Walend | Another try at getting better text for SHRINE-1484 | May 12 2016 | |||
7c651ea77a89 | David Walend | Another try at getting better text for SHRINE-1484 | May 12 2016 | |||
39d318d64c74 | David Walend | Another try at better text for SHRINE-1484 | May 12 2016 | |||
4fdbbf7cb712 | David Walend | Another try at better text for SHRINE-1484 | May 12 2016 | |||
9bb9098238da | David Walend | Trying for better text in SHRINE-1484 | May 12 2016 | |||
c63e2c788d4b | David Walend | See if I get a better message for SHRINE-1484 | May 12 2016 | |||
564564fe16d3 | David Walend | Removing logging to learn about SHRINE-1492 | May 12 2016 | |||
b9fc8bc1b2ec | David Walend | Probing to learn what for SHRINE-1492 is about | May 12 2016 | |||
03aabc24b265 | David Walend | Possible hack for SHRINE-1484 | May 12 2016 | |||
25e100e900ee | David Walend | Revert "Pulled a lot of the adapter init into AdapterComponents.apply() for… | May 10 2016 | |||
f66199c37bbe | David Walend | Pulled a lot of the adapter init into AdapterComponents.apply() for SHRINE-1041 | May 10 2016 | |||
f04178162d53 | Keith Dwyer | [Webclient] Merge in dev-shrine-webclient v1.7.07-SHRINE-4 | May 10 2016 | |||
ac5958d42f24 | David Walend | Moved inner classes out to fix URL for SHRINE-1491 | May 9 2016 | |||
c46ed1838f17 | Keith Dwyer | [shrine-webclient] merging 3rd set of changes from Nich | Apr 28 2016 | |||
bec05a6519af | Keith Dwyer | [shrine-webclient] revert changes to SHRINE cell's cell_config_data.js | Apr 13 2016 | |||
b8cb9bca86e3 | Keith Dwyer | [shrine-webclient] merge in v1.7.07-SHRINE-2 tag of dev-shrine-webclient | Apr 13 2016 | |||
51d2496f3dc4 | David Walend | fix for SHRINE-1418 bower gets too picky about names | Apr 5 2016 | |||
254038708f59 | Keith Dwyer | Fix syntax errors in adapter.sql (for ERROR_RESULT table) | Apr 4 2016 | |||
e0bf0ff6404b | David Walend | ErrorResponse for SHRINE-1394 | Mar 31 2016 | |||
e9edbb89f39c | David Walend | Log cleanup from SHRINE-1394 | Mar 31 2016 | |||
bbbd9392797f | David Walend | Maybe the righ xml for a ReadQueryDefinitionResponse, part of SHRINE-1394 | Mar 31 2016 | |||
521e6417e838 | David Walend | Now checking the cache in doReadQueryDefinition(). Possible fix for SHRINE-1394. | Mar 31 2016 | |||
408dec668efd | David Walend | Now logging problems when first creating an ErrorResponse. Fix for SHRINE-1409. | Mar 30 2016 | |||
e5cea54eed07 | David Walend | Now logging problems when first creating an ErrorResponse | Mar 30 2016 | |||
68337afb5bf2 | Keith Dwyer | [shrine-webclient] cherrypick changes made by Ben between 1.20.1 and 1.21.0… | Mar 29 2016 | |||
50cbf5255674 | Keith Dwyer | [shrine-webclient] change default domain in i2b2_config_data.js | Mar 29 2016 | |||
0e73872ba51a | Keith Dwyer | bring in SHRINE-ified i2b2 1.7.07 webclient (and genericised config URLs) | Mar 29 2016 | |||
d0fe8abcc120 | David Walend | Possible fix for SHRINE-1374 - happy's xml should come back with an empty… | Mar 23 2016 | |||
3b88331b487c | David Walend | Logging to figure out SHRINE-1374 | Mar 23 2016 | |||
495e4ea71f9b | David Walend | Possible fix for SHRINE-1325 - URL value for the network hub box in the QEP… | Mar 23 2016 | |||
23c410f3c6de | David Walend | Missing database statements for SHRINE-1388 | Mar 22 2016 | |||
6876058f4207 | David Walend | Attempted fix of SHRINE-1383 . Adding a field to the wierdly limited shrine… | Mar 21 2016 | |||
a150561c40c7 | David Walend | Attempt to fix SHRINE-1383 , use the networkStatusQuery term from the config… | Mar 21 2016 | |||
e6a987d5692a | David Walend | Fix for SHRINE-1366 . Allow access to the happy service from anywhere. | Mar 21 2016 | |||
f146bb0dafa6 | David Walend | Possible fix for SHRINE-1388 | Mar 18 2016 | |||
eb668c28e49a | David Walend | Removed logging for SHRINE-1377 | Mar 17 2016 | |||
18ee728afe67 | David Walend | Updated mssql and oracle qep audit schemas for SHRINE-1377 | Mar 17 2016 | |||
3a20bb0b9ad2 | David Walend | Making the ResultOutputType optional. More hope for SHRINE-1377 | Mar 17 2016 | |||
6bfec45d6a47 | David Walend | Some understanding and maybe a fix for SHRINE-1377 | Mar 17 2016 | |||
2f9190722c4a | David Walend | Added some logging to see what is going on | Mar 17 2016 | |||
6c50f60966df | David Walend | Possibly a fix for SHRINE-1377 - QueryResults with ERRORs don't have result… | Mar 16 2016 | |||
6cbb20c19235 | David Walend | Added sorting to selectPreviousQueriesByUserAndDomain() to pick most recent… | Mar 16 2016 | |||
94c104a31659 | David Walend | Updated a dashboard test, then commented it out. Needs VPN to work | Mar 15 2016 | |||
82b00fbbce97 | David Walend | Merging 1.20.1 changes | Mar 15 2016 | |||
167d0df8cf68 | David Walend | Overloaded toString in KeyStoreDescriptor to redact the password for SHRINE-1371 | Mar 14 2016 | |||
f769de87b136 | David Walend | Added a trap for SqlExceptions coming from the QEP's database. | Mar 8 2016 | |||
f145827ebd51 | David Walend | Added new problem response for trouble running a query in the qep | Mar 8 2016 |