Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bab709c755ef2ba83849c9457f9558d79a11eaf3 https://github.com/galaxyproject/galaxy/commit/bab709c755ef2ba83849c9457f955... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Request information about tool dependencies from toolshed and make available in prepare_for_install Commit: 72f417ef977030ce092219b7565f2cb6650e5a2c https://github.com/galaxyproject/galaxy/commit/72f417ef977030ce092219b7565f2... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Display requirement status on TS install This commit displays tool requirements as defined in the tool xml during the install confirmation dialog. If a tool dependency is defined in the tool XML, but not in a tool_dependencies.xml, a warning is shown if conda is not activated. This should close #3257. Commit: f20c478bd963c9eb907b711af659f17ef47c171f https://github.com/galaxyproject/galaxy/commit/f20c478bd963c9eb907b711af659f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Use Tool Shed instead of toolshed Commit: 622f2997376bceb30b822f6c5f1b3a0096e5e2f9 https://github.com/galaxyproject/galaxy/commit/622f2997376bceb30b822f6c5f1b3... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge pull request #3262 from mvdbeek/conda_only_improvements [16.10] Display tool requirements for conda-only tools Commit: 5b1b191f2ee555be0247310e1a6c303d783d9ffa https://github.com/galaxyproject/galaxy/commit/5b1b191f2ee555be0247310e1a6c3... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/982a35df087a...5b1b191f2ee5