Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 84de6b4ed31906756c3c219eda3f4462773d0a21 https://github.com/galaxyproject/galaxy/commit/84de6b4ed31906756c3c219eda3f4... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-02-17 (Wed, 17 Feb 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/popup-menu.js M static/maps/mvc/ui/popup-menu.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/popup-menu.js M templates/webapps/galaxy/history/display.mako

Log Message: ----------- Fix target or window.location when importing histories from display.mako (shared with me->view) to allow for iframes; silence popup-menu.js when menu is closed due to location change

Commit: 80a858a3afd970ca086992744b46725eb829b94e https://github.com/galaxyproject/galaxy/commit/80a858a3afd970ca086992744b467... Author: Martin Cech cech.marten@gmail.com Date: 2016-02-17 (Wed, 17 Feb 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/popup-menu.js M static/maps/mvc/ui/popup-menu.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/popup-menu.js M templates/webapps/galaxy/history/display.mako

Log Message: ----------- Merge pull request #1753 from carlfeberhard/release_16.01

[16.01] Fix target or window.location when importing histories from display.m…

Compare: https://github.com/galaxyproject/galaxy/compare/aabc916ed20a...80a858a3afd9