Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: d824cca31fcebe97b8c7cfd1040eecbb9e5f03d3 https://github.com/galaxyproject/galaxy/commit/d824cca31fcebe97b8c7cfd1040ee... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-11-12 (Thu, 12 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- In interactive environments, the /import volume can now be made conditional. Also, fix a bug when using a proxy for the node proxy and cookie_path is / Commit: c4351413265796dacc15b8e3fc7382b8514f5b59 https://github.com/galaxyproject/galaxy/commit/c4351413265796dacc15b8e3fc738... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample Log Message: ----------- Built image tag differs from intended. Commit: 64b084067c73cea1de455e4816d73101c3752165 https://github.com/galaxyproject/galaxy/commit/64b084067c73cea1de455e4816d73... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #1076 from natefoo/ie-conditional-import-volume [15.10] Fix a bug in IEs when proxying the proxy Commit: 75e7e4c2cf7a0cb18b8096c8119e4b0cb207e2a3 https://github.com/galaxyproject/galaxy/commit/75e7e4c2cf7a0cb18b8096c8119e4... Author: Dave B <dave@bx.psu.edu> Date: 2015-11-14 (Sat, 14 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Fix 500 error when attempting to update installed repository. Commit: 7150983aab78e4ceb71f8ad2592369523899d768 https://github.com/galaxyproject/galaxy/commit/7150983aab78e4ceb71f8ad259236... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-11-14 (Sat, 14 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Merge pull request #1093 from martenson/release_15.10 [15.10] Fix 500 error when attempting to update installed repository. Commit: 937f99b851e2078152c851a0b552c00b99167747 https://github.com/galaxyproject/galaxy/commit/937f99b851e2078152c851a0b552c... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-11-15 (Sun, 15 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Fix API installation of tool_dependencies This should fix an installation issue with tool_dependencies via the API. Tool dependency repositories to not have any tools specified and with this no metadata associated. It was broken in https://github.com/galaxyproject/galaxy/commit/bb6a784f13ff3f91762244d448843... So I think this should be part of 15.10. Thanks to Greg for fixing this one. Commit: 040118aae35da2c72fbf6332b32e8f3e0025a341 https://github.com/galaxyproject/galaxy/commit/040118aae35da2c72fbf6332b32e8... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-11-16 (Mon, 16 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Encode unicode string before passing to hashlib.sha1(). Fixes #673. Commit: 3ffa607c15a70a532a7d21a0b3b1a46171e53171 https://github.com/galaxyproject/galaxy/commit/3ffa607c15a70a532a7d21a0b3b1a... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Deprecate old library UI in the "Shared Data" menu. Commit: e61e30cde549c448375b555aadfc85b235b4871a https://github.com/galaxyproject/galaxy/commit/e61e30cde549c448375b555aadfc8... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Merge pull request #1100 from martenson/fix-ts-api-install [15.10] Fix API installation of tool_dependencies Commit: 05e66827d40151c0cd1729299fa82a510138359e https://github.com/galaxyproject/galaxy/commit/05e66827d40151c0cd1729299fa82... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Merge pull request #1112 from nsoranzo/release_15.10_data_libraries_beta [15.10] Deprecate old library UI in the "Shared Data" menu. Commit: 27dc31ace9a4e3a28ab2416c8f9cdbe4735c7063 https://github.com/galaxyproject/galaxy/commit/27dc31ace9a4e3a28ab2416c8f9cd... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge pull request #1106 from nsoranzo/release_15.07_library_import_utf8 [15.07] Encode unicode string before passing to hashlib.sha1(). Commit: 73f46f4e08141f78927056fa3e4709d0ab323972 https://github.com/galaxyproject/galaxy/commit/73f46f4e08141f78927056fa3e470... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge branch 'release_15.07' into release_15.10 Compare: https://github.com/galaxyproject/galaxy/compare/a3034ab6d99d...73f46f4e0814