Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: 7988ae59f5b94b952bd1965b76250ad3f21525d6 https://github.com/galaxyproject/galaxy/commit/7988ae59f5b94b952bd1965b76250... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py R templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Allow display of install_resolver_checkbox when installing data manager tools by merging select_shed_tool_panel_config.mako functionality into select_tool_panel_section.mako (thx @nsoranzo for this suggestion). Commit: e8922295bd5753e0be262f141b25a05622972ee6 https://github.com/galaxyproject/galaxy/commit/e8922295bd5753e0be262f141b25a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Remove checks for `includes_tools_for_display_in_tool_panel` and `includes_tools_for_display_in_tool_panel` when determining if initiate_repository_installation.mako should be posted to. It is sufficient to check that select_tool_panel_section_button has been clicked. Commit: 2df727cb05d8d15e14a23a4f8c1da920bfde999d https://github.com/galaxyproject/galaxy/commit/2df727cb05d8d15e14a23a4f8c1da... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M test/shed_functional/functional/test_1150_datatype_converters.py Log Message: ----------- Adjust wording of datatype converter install test. Commit: cfa3e29cadf0960f01735a2ad43b64ac9c17e031 https://github.com/galaxyproject/galaxy/commit/cfa3e29cadf0960f01735a2ad43b6... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py R templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M test/shed_functional/functional/test_1150_datatype_converters.py Log Message: ----------- Merge pull request #3686 from mvdbeek/datamanager_conda_install [17.01] Allow display of install_resolver_checkbox when installing data manag… Compare: https://github.com/galaxyproject/galaxy/compare/fa37f67786b8...cfa3e29cadf0