Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1c9ff98b81a803de48eafa5deb6f9d5e95733c9d https://github.com/galaxyproject/galaxy/commit/1c9ff98b81a803de48eafa5deb6f9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/layout/router.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/layout/router.js M static/scripts/mvc/dataset/dataset-li-edit.js Log Message: ----------- Load dataset edit attributes without page refresh Commit: dcad663cee2ce50f7b35871e51e50554b0d9b727 https://github.com/galaxyproject/galaxy/commit/dcad663cee2ce50f7b35871e51e50... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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/dataset/dataset-li-edit.js Log Message: ----------- Load dataset errors without page refresh Commit: ecd0dc4244cff688491dec7f2404ef65d1e1d861 https://github.com/galaxyproject/galaxy/commit/ecd0dc4244cff688491dec7f2404e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Pin pydocstyles for stable release. Commit: 012aaf832027ba905b492645ebdeea9d903b6726 https://github.com/galaxyproject/galaxy/commit/012aaf832027ba905b492645ebdee... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Pin pydocstyle... Commit: 220fdccd57cda5268d2beb482c1d4469cb8b5d94 https://github.com/galaxyproject/galaxy/commit/220fdccd57cda5268d2beb482c1d4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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/dataset/dataset-li-edit.js Log Message: ----------- Do not rely on the existence of the analysis app router Commit: a0f63b671f29f41d078c23b0421b981b3ac0bcdd https://github.com/galaxyproject/galaxy/commit/a0f63b671f29f41d078c23b0421b9... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Merge pull request #4775 from jmchilton/pin_pydocstyle [17.09] Pin pydocstyles for stable release. Commit: f64b7fcfb124756ed8dc65bbfdfbe6b2f0cb66e0 https://github.com/galaxyproject/galaxy/commit/f64b7fcfb124756ed8dc65bbfdfbe... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Merge pull request #4777 from jmchilton/release_17.01_pydocstyle_ping [17.01] Pin linting functions in tox.ini. Commit: 1635f46430b176f03b7c3982f4d02287e7d4a5e1 https://github.com/galaxyproject/galaxy/commit/1635f46430b176f03b7c3982f4d02... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Commit: 27e3e724cded1b5c99cc902dc478653feb84e505 https://github.com/galaxyproject/galaxy/commit/27e3e724cded1b5c99cc902dc4786... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M tox.ini Log Message: ----------- Merge branch 'release_17.05' into release_17.09 Commit: 2b18a0b8d5f7316e8a5e5fbc84e9c1062e519fa2 https://github.com/galaxyproject/galaxy/commit/2b18a0b8d5f7316e8a5e5fbc84e9c... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/layout/router.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/layout/router.js M static/scripts/mvc/dataset/dataset-li-edit.js Log Message: ----------- Merge pull request #4773 from guerler/fix_edit_reload.000 [17.09] Load dataset attribute editing and errors without page refresh Commit: fb7015bf70aaf3468b34f9d5a464df18edcae7ac https://github.com/galaxyproject/galaxy/commit/fb7015bf70aaf3468b34f9d5a464d... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M lib/galaxy/tools/parser/xml.py Log Message: ----------- Bug fix for XML warning during tool loads. Commit: fd8e2e1927f0c6248e6d7ae4c5338015328bf9a0 https://github.com/galaxyproject/galaxy/commit/fd8e2e1927f0c6248e6d7ae4c5338... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-10-10 (Tue, 10 Oct 2017) Changed paths: M lib/galaxy/tools/parser/xml.py Log Message: ----------- Merge pull request #4784 from jmchilton/tool_xml_warning [17.09] Bug fix for XML warning during tool loads. Commit: 24308fb6053dcecbf20d6e7a8a8e9b7d96fe07db https://github.com/galaxyproject/galaxy/commit/24308fb6053dcecbf20d6e7a8a8e9... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-10-12 (Thu, 12 Oct 2017) Changed paths: M templates/show_params.mako Log Message: ----------- Fix listify import in show_params.mako This fixes a problem reported on the [mailing list](http://dev.list.galaxyproject.org/Show-history-structure-Error-Undefined-obj...). I am not sure why importing at the top of the file is not enough though. Commit: a83123ef5e384f95778a1293f293e4b9a919054b https://github.com/galaxyproject/galaxy/commit/a83123ef5e384f95778a1293f293e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-12 (Thu, 12 Oct 2017) Changed paths: M templates/show_params.mako Log Message: ----------- Merge pull request #4794 from mvdbeek/fix_listify_import_in_show_params [17.05][BUG] Fix listify import in show params Commit: ebdadb68ad7caaa4afbde544e46ad57b4ab49dba https://github.com/galaxyproject/galaxy/commit/ebdadb68ad7caaa4afbde544e46ad... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-12 (Thu, 12 Oct 2017) Changed paths: M templates/show_params.mako Log Message: ----------- Merge remote-tracking branch 'upstream/release_17.05' into release_17.09 Commit: 7ceaec4a22f0e30752877c8d235d4f4904896f94 https://github.com/galaxyproject/galaxy/commit/7ceaec4a22f0e30752877c8d235d4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-12 (Thu, 12 Oct 2017) Changed paths: M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/package-lock.json M lib/galaxy/tools/parser/xml.py M static/maps/layout/router.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/layout/router.js M static/scripts/mvc/dataset/dataset-li-edit.js M templates/show_params.mako Log Message: ----------- Merge remote-tracking branch 'upstream/release_17.09' into dev Commit: 06f6fdd580ff7e53576eee154c4731946c505dcf https://github.com/galaxyproject/galaxy/commit/06f6fdd580ff7e53576eee154c473... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-12 (Thu, 12 Oct 2017) Changed paths: M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/package-lock.json M lib/galaxy/tools/parser/xml.py M static/maps/layout/router.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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/layout/router.js M static/scripts/mvc/dataset/dataset-li-edit.js M templates/show_params.mako Log Message: ----------- Merge pull request #4796 from dannon/dev Merges 17.09 -> dev Compare: https://github.com/galaxyproject/galaxy/compare/dfb2cc2f363f...06f6fdd580ff