Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3a17db8f205f57902b35b2245c8367802beb5faa https://github.com/galaxyproject/galaxy/commit/3a17db8f205f57902b35b2245c836... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-model.js Log Message: ----------- Backbone model url fixes (urlRoot isn't necessary in many of these situations, and only complicates (and breaks) some things Convert history-contents urlroot to instance var remove outdated comment Commit: 2e7dd84583dd3f138346cf6c930fe82011da2fd7 https://github.com/galaxyproject/galaxy/commit/2e7dd84583dd3f138346cf6c930fe... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/extended.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.js Log Message: ----------- Rebuild client w/ maps. Commit: c2307f3f1aae8f46fd1023accdf0a6c1c435eba3 https://github.com/galaxyproject/galaxy/commit/c2307f3f1aae8f46fd1023accdf0a... Author: M Bernt <m.bernt@ufz.de> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- added missing level fatal_oom to xsd Commit: 8d75a67386f72814c17ad1abef5d0154b247a521 https://github.com/galaxyproject/galaxy/commit/8d75a67386f72814c17ad1abef5d0... Author: M Bernt <m.bernt@ufz.de> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- also added missing documentation Commit: fc47618f6798d48f3ab903a8ea6231067bf0fed2 https://github.com/galaxyproject/galaxy/commit/fc47618f6798d48f3ab903a8ea623... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: A scripts/plugin_staging.py Log Message: ----------- Initial python-based plugin staging. to be used from common startup. Commit: e110489cc55f25b7d5ec7b9e5cbc5d914215b806 https://github.com/galaxyproject/galaxy/commit/e110489cc55f25b7d5ec7b9e5cbc5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M scripts/common_startup.sh Log Message: ----------- Call plugin static dir regeneration in the event client isn't being built (which also does this, albeit slightly differently) Commit: 9ac0161891a92db7a359e13a74e831ec17a79317 https://github.com/galaxyproject/galaxy/commit/9ac0161891a92db7a359e13a74e83... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M doc/source/admin/cluster.md Log Message: ----------- Update description for installing pbs-python Commit: 370ea25d2c58b7e55f6bc062062e9a962a08ea7d https://github.com/galaxyproject/galaxy/commit/370ea25d2c58b7e55f6bc062062e9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M scripts/plugin_staging.py Log Message: ----------- Minor refactoring, comments. Commit: 8364ebebcd81b6f8bf6c1122e5271a5c5eb23868 https://github.com/galaxyproject/galaxy/commit/8364ebebcd81b6f8bf6c1122e5271... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M scripts/get_uwsgi_args.py Log Message: ----------- Add static-safe mapping for uwsgi for plugin static dirs, which are accessible via symlink Commit: 4cdd210bb27cd1c271e69c8dfd46585f0c232ef9 https://github.com/galaxyproject/galaxy/commit/4cdd210bb27cd1c271e69c8dfd465... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M scripts/plugin_staging.py Log Message: ----------- Use os.pardir instead of ../. Thanks @nsoranzo Commit: 37ad1a8bdce963b4152331685e3755a60777e633 https://github.com/galaxyproject/galaxy/commit/37ad1a8bdce963b4152331685e375... Author: Nicola Soranzo <nicola.soranzo@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M doc/source/admin/cluster.md Log Message: ----------- Merge pull request #6345 from mvdbeek/update_pbs_python_doc [18.01] Update description for installing pbs-python Commit: cddee94e4bb043381433030e34f3f9129382830f https://github.com/galaxyproject/galaxy/commit/cddee94e4bb043381433030e34f3f... Author: Nicola Soranzo <nicola.soranzo@gmail.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Small fixes Commit: 12a05c782099da0eb846069fe96355fb50212fef https://github.com/galaxyproject/galaxy/commit/12a05c782099da0eb846069fe9635... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M scripts/common_startup.sh M scripts/get_uwsgi_args.py A scripts/plugin_staging.py Log Message: ----------- Merge pull request #6344 from dannon/python_static_staging [18.05] Visualization static staging Commit: a2ff5efbce3023b12a774600b331867d7320898a https://github.com/galaxyproject/galaxy/commit/a2ff5efbce3023b12a774600b3318... Author: John Chilton <jmchilton@gmail.com> Date: 2018-06-16 (Sat, 16 Jun 2018) Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Merge pull request #6341 from bernt-matthias/release_18.05_fix_xsd [18.05] Added missing level fatal_oom to xsd Commit: 3707fb4eb1287a95edf8532c9c7856a3b7560d9f https://github.com/galaxyproject/galaxy/commit/3707fb4eb1287a95edf8532c9c785... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2018-06-17 (Sun, 17 Jun 2018) Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-model.js M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/extended.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.js Log Message: ----------- Merge pull request #6336 from dannon/backport_url_fix_flattened [18.01] Backport backbone url fixes (flattened) Commit: e8beea0d60c1a4b88b67cc3f176e11ae76215f67 https://github.com/galaxyproject/galaxy/commit/e8beea0d60c1a4b88b67cc3f176e1... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-06-17 (Sun, 17 Jun 2018) Changed paths: M doc/source/admin/cluster.md Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Commit: 6e02c9aff7650f6dad05ff18683ac19b10648ee4 https://github.com/galaxyproject/galaxy/commit/6e02c9aff7650f6dad05ff18683ac... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-06-17 (Sun, 17 Jun 2018) Changed paths: M doc/source/admin/cluster.md M lib/galaxy/tools/xsd/galaxy.xsd M scripts/common_startup.sh M scripts/get_uwsgi_args.py A scripts/plugin_staging.py Log Message: ----------- Merge branch 'release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/02974b79c7a9...6e02c9aff765 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.