Branch: refs/heads/datamanager_conda_install Home: https://github.com/galaxyproject/galaxy Commit: b7820d1269ca6bf7571ab6d0305504e9826a5872 https://github.com/galaxyproject/galaxy/commit/b7820d1269ca6bf7571ab6d030550... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako Log Message: ----------- Allow display of install_resolver_checkbox when installing data manager tools Commit: 2abc7b0d2b0c422a4f7c89ae7bdf767088323be2 https://github.com/galaxyproject/galaxy/commit/2abc7b0d2b0c422a4f7c89ae7bdf7... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-08 (Wed, 08 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: ----------- Merge select_shed_tool_panel_config.mako functionality into select_tool_panel_section.mako Commit: 7d7e36e5d40c3418f5712d9f9a9e8bd4140c5bc5 https://github.com/galaxyproject/galaxy/commit/7d7e36e5d40c3418f5712d9f9a9e8... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-08 (Wed, 08 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: 7372d5a339794f8eecc31afbc7f21c983c50b7a6 https://github.com/galaxyproject/galaxy/commit/7372d5a339794f8eecc31afbc7f21... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-03-08 (Wed, 08 Mar 2017) Changed paths: M test/shed_functional/functional/test_1150_datatype_converters.py Log Message: ----------- Adjust wording of datatype converter install test. Compare: https://github.com/galaxyproject/galaxy/compare/b7820d1269ca^...7372d5a33979