Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 128a9112bb1635c1c49ac7dc1a99b531933ea659 https://github.com/galaxyproject/galaxy/commit/128a9112bb1635c1c49ac7dc1a99b... Author: MatthewRalston <mrals89@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Checks for api_key before checking for header from SSO. Also fixes the NoneType issue discovered in #972. Commit: 4e12c5e782249c3aea1ddbdd5bd2f363111e78b6 https://github.com/galaxyproject/galaxy/commit/4e12c5e782249c3aea1ddbdd5bd2f... Author: MatthewRalston <mrals89@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Fixes NoneType problem in a simpler way. Thanks @nsoranzo. Commit: 6473057f3b63ce615727800babbaf439ed66bb3f https://github.com/galaxyproject/galaxy/commit/6473057f3b63ce615727800babbaf... Author: Matt Ralston <mrals89@gmail.com> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Adds whitespace Commit: 774487ddcc9c0e793b6b15b26c971c3df5822644 https://github.com/galaxyproject/galaxy/commit/774487ddcc9c0e793b6b15b26c971... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- Fix citation-model to fail silently/gracefully when a non-parsable bibtex entry is tried Commit: d225aebc8879b3e96963724d3b5b11aec1d50ed5 https://github.com/galaxyproject/galaxy/commit/d225aebc8879b3e96963724d3b5b1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- Merge pull request #1884 from carlfeberhard/release_15.10 [15.10] Fix citation-model to fail silently/gracefully Commit: e2a03646fd7c47a0ead962c9842e74f977dab8eb https://github.com/galaxyproject/galaxy/commit/e2a03646fd7c47a0ead962c9842e7... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Fix farbtastic's use of deprecated jquery fns by loading jq-migrate in galaxy.panels.mako Commit: 9cff686d6d94a8d4a47c4c5cdc9d380fe686a8c4 https://github.com/galaxyproject/galaxy/commit/9cff686d6d94a8d4a47c4c5cdc9d3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge pull request #1972 from carlfeberhard/release_15.10 [15.10] Fix farbtastic's use of deprecated jquery fns by loading jq-migrate i… Commit: a2114fdd0e234a3253cec79a02e30899ca081359 https://github.com/galaxyproject/galaxy/commit/a2114fdd0e234a3253cec79a02e30... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Merge pull request #1801 from MatthewRalston/api_key_patch [15.10] Checks for api_key before checking for header from SSO. Commit: f85aaa4a27a1067a108c05fd1f74fa6060aa4565 https://github.com/galaxyproject/galaxy/commit/f85aaa4a27a1067a108c05fd1f74f... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- port of middleware fix for TS (#2106) Commit: c0d65092fbbd1ad7380a0b17d3d9a949145d6170 https://github.com/galaxyproject/galaxy/commit/c0d65092fbbd1ad7380a0b17d3d9a... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- Merge pull request #2154 from martenson/port-middleware-fix [16.01] Port middleware fix Commit: e26bff23ed05eeeb7bac469b95a4ee6509dd537c https://github.com/galaxyproject/galaxy/commit/e26bff23ed05eeeb7bac469b95a4e... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M lib/galaxy/web/framework/middleware/remoteuser.py M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge 'release_15.10' with 'release_16.01' Commit: 570baa5bb6020a2a8b7592dda8e952225ce7beec https://github.com/galaxyproject/galaxy/commit/570baa5bb6020a2a8b7592dda8e95... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Fix bad merge: when HTTP_GX_SECRET is None Commit: 68ce6ce49cc8c3d6f252a52a6bf9ac90f64328a3 https://github.com/galaxyproject/galaxy/commit/68ce6ce49cc8c3d6f252a52a6bf9a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M lib/galaxy/web/framework/middleware/remoteuser.py M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge pull request #2169 from carlfeberhard/release_16.01 [16.01] Merge 15.10 with 16.01 Commit: 8b49814859dc4dcc85d5a4b3b8945f3f7e3342f4 https://github.com/galaxyproject/galaxy/commit/8b49814859dc4dcc85d5a4b3b8945... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M lib/galaxy/web/framework/middleware/remoteuser.py M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge 16.01 into 16.04 Compare: https://github.com/galaxyproject/galaxy/compare/f013cf2021ec...8b49814859dc