Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy 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: 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

Compare: https://github.com/galaxyproject/galaxy/compare/bd63c04c2e19...3a45c1617a0f