Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: aad5d9a2e557e935bd88f725deb10d0ed82468d8 https://github.com/galaxyproject/galaxy/commit/aad5d9a2e557e935bd88f725deb10... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-21 (Thu, 21 Jan 2016) Changed paths: M lib/galaxy/version.py Log Message: ----------- Bump 15.10 version to 15.10.1 (and apparently it has been incorrectly set to 15.10.dev all this time). Commit: 868acc362f6ce8a8b3559fcb88ebb4c060321905 https://github.com/galaxyproject/galaxy/commit/868acc362f6ce8a8b3559fcb88ebb... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-01-21 (Thu, 21 Jan 2016) Changed paths: M lib/galaxy/version.py Log Message: ----------- Merge pull request #1555 from natefoo/release_15.10 [15.10] Bump 15.10 version to 15.10.1 Commit: 37b98b773ea378bdd4a7845d60f589f7454f2291 https://github.com/galaxyproject/galaxy/commit/37b98b773ea378bdd4a7845d60f58... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M lib/galaxy/config.py Log Message: ----------- Load whitelist regardless of whether the setting is explicit in config. This is a sensible enough default, and requiring the option to be set in galaxy.ini is cumbersome and unnecessary since it's admin-only functionality. Commit: aabc916ed20ac7f25174ce4d552b735253697081 https://github.com/galaxyproject/galaxy/commit/aabc916ed20ac7f25174ce4d552b7... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #1749 from dannon/whitelist_loading Load whitelist regardless of whether the setting is explicit in config. 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… Commit: 587d450402f8b618e4922a04aa87fc5625edce82 https://github.com/galaxyproject/galaxy/commit/587d450402f8b618e4922a04aa87f... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/tool_shed/util/encoding_util.py Log Message: ----------- Fix installation of Tool Shed repositories containing non-ASCII characters in the description. Fix #1702. Commit: 476734d8651009e38505408be2e5f7331800680b https://github.com/galaxyproject/galaxy/commit/476734d8651009e38505408be2e5f... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/tool_shed/util/encoding_util.py Log Message: ----------- Merge pull request #1759 from nsoranzo/release_15.10_fix_for_1702 [15.10] Fix installation of Tool Shed repositories containing non-ASCII characters in the description. Commit: 3f34131ff506836d400f8d55b696d8044546b162 https://github.com/galaxyproject/galaxy/commit/3f34131ff506836d400f8d55b696d... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/tool_shed/util/encoding_util.py Log Message: ----------- Merge branch 'release_15.10' into release_16.01 Conflicts: lib/galaxy/version.py Commit: a0537762f2861247109ead028c33eaca2bd42dbc https://github.com/galaxyproject/galaxy/commit/a0537762f2861247109ead028c33e... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M client/galaxy/scripts/mvc/ui/popup-menu.js M lib/galaxy/config.py M lib/tool_shed/util/encoding_util.py 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 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 branch 'release_16.01' into dev Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/68e6312a6410...a0537762f286