Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3aa01b060477fe3fe0f59c73ca3ee75605e08182 https://github.com/galaxyproject/galaxy/commit/3aa01b060477fe3fe0f59c73ca3ee... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-04-24 (Tue, 24 Apr 2018) Changed paths: M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- initial pass fixing toolshed nav structure -- need to follow up on dependencies Commit: 4d66d8025107bbeba5cf15ac5f177d600d7bf2d1 https://github.com/galaxyproject/galaxy/commit/4d66d8025107bbeba5cf15ac5f177... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-04-25 (Wed, 25 Apr 2018) Changed paths: M client/galaxy/scripts/apps/extended.js M client/galaxy/scripts/toolshed/groups/group-list-view.js M client/yarn.lock M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Fixes to toolshed/menu for BS4 Commit: cbaff1dca2e34cd869227844a04a761332a7eb27 https://github.com/galaxyproject/galaxy/commit/cbaff1dca2e34cd869227844a04a7... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M doc/source/admin/scaling.md Log Message: ----------- Correct uWSGI UNIX domain socket syntax. Commit: 352ba5f634ff5469039afa4cb6ec5b6fecabe6c6 https://github.com/galaxyproject/galaxy/commit/352ba5f634ff5469039afa4cb6ec5... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/mvc/upload/upload-button.js Log Message: ----------- show tooltip only on hover for upload button Commit: 5265e93be9fc2cf8c65400d8c1853169377868a9 https://github.com/galaxyproject/galaxy/commit/5265e93be9fc2cf8c65400d8c1853... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js Log Message: ----------- move some tooltips to the top so they don't interfere with other actions when shown Commit: 20e9e0a018967e413380728275b843615ba0c6f4 https://github.com/galaxyproject/galaxy/commit/20e9e0a018967e413380728275b84... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Format 'logged in as' correctly for the toolshed Commit: 103cb51ec368438642504c3f98b76c363db478bb https://github.com/galaxyproject/galaxy/commit/103cb51ec368438642504c3f98b76... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M doc/source/admin/scaling.md Log Message: ----------- Merge pull request #6003 from natefoo/uwsgi-socket-docs [18.01] Correct uWSGI UNIX domain socket syntax in docs Commit: bf0543743ff832375e1b7128bdaa4fc5b0714038 https://github.com/galaxyproject/galaxy/commit/bf0543743ff832375e1b7128bdaa4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/upload/upload-button.js Log Message: ----------- Merge remote-tracking branch 'martenson/tooltip-ux' into release_18.05 Commit: 3a45c1617a0f2b24c6cea344a30aab51c36947ce https://github.com/galaxyproject/galaxy/commit/3a45c1617a0f2b24c6cea344a30aa... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/yarn.lock Log Message: ----------- Client build/format on merge to 18.05 Commit: 4a7bc238a6ed80d3e2791bd567e5f2c0e8edb3a8 https://github.com/galaxyproject/galaxy/commit/4a7bc238a6ed80d3e2791bd567e5f... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/apps/extended.js M client/galaxy/scripts/toolshed/groups/group-list-view.js M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Merge pull request #5979 from dannon/fix_toolshed_nav Fix toolshed nav for BS4 Commit: 916078beb0b5936644e666dc91b6c99e8f6aab35 https://github.com/galaxyproject/galaxy/commit/916078beb0b5936644e666dc91b6c... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M doc/source/admin/scaling.md Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Commit: acc9889815460b7f7ac4652e226e9f9209f8fc9d https://github.com/galaxyproject/galaxy/commit/acc9889815460b7f7ac4652e226e9... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M client/galaxy/scripts/apps/extended.js M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/toolshed/groups/group-list-view.js M client/yarn.lock M doc/source/admin/scaling.md M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Merge branch 'release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/6a8c4dc7e287...acc988981546