Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 72960de216cac3d37de168f4eb8bcc760dd68632 https://github.com/galaxyproject/galaxy/commit/72960de216cac3d37de168f4eb8bc... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- adjust menu tooltips to be oneliners Commit: 710c2639f94faac0ef2f999456e183330e4efa54 https://github.com/galaxyproject/galaxy/commit/710c2639f94faac0ef2f999456e18... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/ui/ui-misc.js A client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/style/less/base.less M client/galaxy/style/less/ui.less M config/galaxy.ini.sample M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M lib/galaxy/auth/__init__.py M lib/galaxy/config.py M lib/galaxy/managers/configuration.py M lib/galaxy/managers/users.py M lib/galaxy/model/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/web/form_builder.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/controllers/user.py M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/ui/ui-misc.js.map A static/maps/mvc/user/user-preferences.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/layout/menu.js M static/scripts/layout/page.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/ui/ui-misc.js A static/scripts/mvc/user/user-preferences.js M static/style/blue/base.css M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako R templates/user/change_password.mako R templates/user/communication_settings.mako R templates/user/edit_address.mako R templates/user/new_address.mako R templates/user/permissions.mako M templates/user/register.mako R templates/user/toolbox_filters.mako R templates/user/username.mako R templates/webapps/galaxy/user/api_keys.mako R templates/webapps/galaxy/user/manage_info.mako A templates/webapps/tool_shed/user/api_keys.mako A templates/webapps/tool_shed/user/change_password.mako A templates/webapps/tool_shed/user/index.mako A templates/webapps/tool_shed/user/username.mako A test/api/test_configuration.py M test/api/test_users.py R test/casperjs/api-configuration-tests.js M test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py M test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py Log Message: ----------- Merge branch 'dev' into adjust-menu-tooltips Conflicts: static/maps/layout/menu.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/layout/menu.js Commit: bf8cffa2b32fd2af33be60a802c2fc49c3d406f9 https://github.com/galaxyproject/galaxy/commit/bf8cffa2b32fd2af33be60a802c2f... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- repack client Commit: 3b84136d4f0ad15d4965b1ca6baa19e6d51e22d4 https://github.com/galaxyproject/galaxy/commit/3b84136d4f0ad15d4965b1ca6baa1... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- Merge pull request #3230 from martenson/adjust-menu-tooltips adjust menu tooltips to be oneliners Compare: https://github.com/galaxyproject/galaxy/compare/ead8e15f42a4...3b84136d4f0a