Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4f9d5df34fb84e2547a280ab7536491a66e1da28 https://github.com/galaxyproject/galaxy/commit/4f9d5df34fb84e2547a280ab75364... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-22 (Fri, 22 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako Log Message: ----------- WIP a bunch of GIE javascript that probabaly won't work Commit: 04b03b28530455ff850f41215c2cfa15b597ef19 https://github.com/galaxyproject/galaxy/commit/04b03b28530455ff850f41215c2cf... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-22 (Fri, 22 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js Log Message: ----------- Make the URL spinner actually work. Commit: 744ea8289ee29572775d2d606ab31a15e2cf4b12 https://github.com/galaxyproject/galaxy/commit/744ea8289ee29572775d2d606ab31... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Update versions of conda and conda-build Creating environments for (some) Python packages now requires conda 4.3 due to the conda-forge `python`: ``` $ conda create -n __crossmap@0.2.2 crossmap=0.2.2 Fetching package metadata ............... ... Linking packages ... Installing conda-forge::wheel-0.30.0-py_1 requires a minimum conda version of 4.3. ``` Commit: 7edeedd7fe123ad8740f830e4c7b5e8478552137 https://github.com/galaxyproject/galaxy/commit/7edeedd7fe123ad8740f830e4c7b5... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js Log Message: ----------- Additional GIE spinning fixes for when the error condition is not a timeout. Commit: 180bfe718485bdfd05233402d4720f67f114d88f https://github.com/galaxyproject/galaxy/commit/180bfe718485bdfd05233402d4720... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js Log Message: ----------- Treat timeouts and errors the same, except that timeouts step the ajax timeout of the next request. Also fixes for toastr messages. Commit: 9075976669be95c4ee1b505fb952d246660a6f2c https://github.com/galaxyproject/galaxy/commit/9075976669be95c4ee1b505fb952d... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Support conda create --offline for Conda >= 4.3.18. Commit: 40900d76a96bb76542653e2c2bf886c7d88e9552 https://github.com/galaxyproject/galaxy/commit/40900d76a96bb76542653e2c2bf88... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M static/maps/galaxy.interactive_environments.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/galaxy.interactive_environments.js Log Message: ----------- Re-enable keepalive, build client. Commit: c235382ceefb09e28c987621164f9f40450f1ed1 https://github.com/galaxyproject/galaxy/commit/c235382ceefb09e28c987621164f9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M config/plugins/interactive_environments/jupyter/templates/jupyter.mako Log Message: ----------- No need for this keep_alive invocation after all; removes the commented out code. Commit: 1c5c046a63d6afd160d6cb7dcafd4ec273ec029a https://github.com/galaxyproject/galaxy/commit/1c5c046a63d6afd160d6cb7dcafd4... Author: John Chilton <jmchilton@gmail.com> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Merge pull request #4701 from nsoranzo/release_17.09_update_conda_version [17.09] Update versions of conda and conda-build Commit: 242755ee9f6a267e416a525bbf69ef513c35a2f4 https://github.com/galaxyproject/galaxy/commit/242755ee9f6a267e416a525bbf69e... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M static/maps/galaxy.interactive_environments.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/galaxy.interactive_environments.js Log Message: ----------- Merge pull request #7 from dannon/gie_fixes Re-enable keepalive, build client. Commit: 8230d14fad3765585517e02a6b74126835f46fce https://github.com/galaxyproject/galaxy/commit/8230d14fad3765585517e02a6b741... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M static/maps/galaxy.interactive_environments.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/galaxy.interactive_environments.js Log Message: ----------- Merge pull request #4680 from natefoo/gie-client [17.09] Client side fixes for GIEs Commit: 319489c88ea933c1837015c386cae18ebf518d18 https://github.com/galaxyproject/galaxy/commit/319489c88ea933c1837015c386cae... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M client/galaxy/scripts/galaxy.interactive_environments.js M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M lib/galaxy/tools/deps/conda_util.py M static/maps/galaxy.interactive_environments.js.map M static/scripts/galaxy.interactive_environments.js Log Message: ----------- Merge branch 'release_17.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/8f33cc627f53...319489c88ea9