Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 106fb79c8b7bd8d2faa69f9bd007efe504183012 https://github.com/galaxyproject/galaxy/commit/106fb79c8b7bd8d2faa69f9bd007e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-09-28 (Fri, 28 Sep 2018) Changed paths: M client/galaxy/style/scss/base.scss Log Message: ----------- Drop incorrect flex designation for panel inner; these are generally single line styles with floats. Fixes header for "Published History" view, etc. Commit: 71df0e44652fca8755869248935dc2bdeba39208 https://github.com/galaxyproject/galaxy/commit/71df0e44652fca8755869248935dc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-09-28 (Fri, 28 Sep 2018) Changed paths: M client/galaxy/scripts/components/Sharing.vue M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/yarn.lock M static/style/blue/base.css Log Message: ----------- New integrity hashes for yarn? Typo, artifacts (which will be gone soon!) Commit: d0b6bc6ddc7391527e98a4ece4e33396229c2d25 https://github.com/galaxyproject/galaxy/commit/d0b6bc6ddc7391527e98a4ece4e33... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-09-28 (Fri, 28 Sep 2018) Changed paths: M client/galaxy/style/scss/base.scss M static/style/blue/base.css M templates/webapps/galaxy/page/editor.mako Log Message: ----------- panel-body will always be full height Commit: ab660686c26241ec4959711603919b80442d32a0 https://github.com/galaxyproject/galaxy/commit/ab660686c26241ec4959711603919... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-28 (Fri, 28 Sep 2018) Changed paths: M test/api/test_tools.py A test/functional/tools/identifier_in_conditional.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Add test for single and multi-input identifiers test_identifier_map_over_input_in_conditional fails at the moment (same issue as in https://github.com/galaxyproject/galaxy/issues/6182) Commit: 73f8f3129b07cbe96c10da161a547bf2008706e2 https://github.com/galaxyproject/galaxy/commit/73f8f3129b07cbe96c10da161a547... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M lib/galaxy/tools/parameters/wrapped.py Log Message: ----------- Partially fix missing element identifier This makes sure that any toplevel `|__identifier__` is passed on to nested inputs. Commit: f8d9a9e33a994a97c537ef15f1993fbe5d5866ea https://github.com/galaxyproject/galaxy/commit/f8d9a9e33a994a97c537ef15f1993... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M lib/galaxy/tools/evaluation.py M lib/galaxy/util/__init__.py Log Message: ----------- Attempt to recover wrapper datasets Otherwise we create new wrappers that lack the element identifier. Commit: c6d915b8f2d470517dfa6504fa635c69cc546b64 https://github.com/galaxyproject/galaxy/commit/c6d915b8f2d470517dfa6504fa635... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Parse length to integer When using the little up/down button we get strings instead of integers, and those fail the rule validation. Fixes https://github.com/galaxyproject/galaxy/issues/6800 Commit: 2d78dbb9ec1d4d1ba7240d384b27bb6bb83c24b5 https://github.com/galaxyproject/galaxy/commit/2d78dbb9ec1d4d1ba7240d384b27b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Build client Commit: 565f611389e434b6df57d39ad5c01ae037e46e76 https://github.com/galaxyproject/galaxy/commit/565f611389e434b6df57d39ad5c01... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M config/plugins/webhooks/demo/tour_generator/__init__.py M templates/show_params.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/tool_shed/repository/tool_form.mako Log Message: ----------- Fix remaining selenium py3 erorrs Commit: 2e7adfbee4835f1374dffe7ba49760cfc19fdb0e https://github.com/galaxyproject/galaxy/commit/2e7adfbee4835f1374dffe7ba4976... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-29 (Sat, 29 Sep 2018) Changed paths: M lib/galaxy/web/framework/helpers/__init__.py Log Message: ----------- Cast to bytestring in md5 function Commit: a47887639d50b2e5da55d9121b8d8e55509a9cd3 https://github.com/galaxyproject/galaxy/commit/a47887639d50b2e5da55d9121b8d8... Author: Dannon <dannon.baker@gmail.com> Date: 2018-09-30 (Sun, 30 Sep 2018) Changed paths: M config/plugins/webhooks/demo/tour_generator/__init__.py M lib/galaxy/web/framework/helpers/__init__.py M templates/show_params.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/tool_shed/repository/tool_form.mako Log Message: ----------- Merge pull request #6803 from mvdbeek/finish_py3_selenium [18.09] Fix remaining selenium py3 errors Commit: e226edc5ade76dd0ec2e3d8db2e799567e8c11d7 https://github.com/galaxyproject/galaxy/commit/e226edc5ade76dd0ec2e3d8db2e79... Author: John Chilton <jmchilton@gmail.com> Date: 2018-09-30 (Sun, 30 Sep 2018) Changed paths: M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/util/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_in_conditional.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #6798 from mvdbeek/fix_element_identifier_for_non_multiple_true_mapover_in_conditionals [18.09] Fix element identifier for non multiple true mapover in conditionals Commit: d3ab953be3c553cfd71347322538c3adab6d7515 https://github.com/galaxyproject/galaxy/commit/d3ab953be3c553cfd71347322538c... Author: John Chilton <jmchilton@gmail.com> Date: 2018-10-01 (Mon, 01 Oct 2018) Changed paths: M client/galaxy/scripts/components/Sharing.vue M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/style/scss/base.scss M client/yarn.lock M static/style/blue/base.css M templates/webapps/galaxy/page/editor.mako Log Message: ----------- Merge pull request #6791 from dannon/flex-style-fixes [18.09] Flex-related style fixes Commit: 2aad3b2ced20189ab4e500bd501797a876089ee9 https://github.com/galaxyproject/galaxy/commit/2aad3b2ced20189ab4e500bd50179... Author: Dannon <dannon.baker@gmail.com> Date: 2018-10-01 (Mon, 01 Oct 2018) Changed paths: M client/galaxy/scripts/mvc/rules/rule-definitions.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Merge pull request #6802 from mvdbeek/fix_int_parsing_rules [18.05] Cast rule.length to int when parsing rules Commit: 87463f4be6334849b0e121bd534fada090aeb1d8 https://github.com/galaxyproject/galaxy/commit/87463f4be6334849b0e121bd534fa... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-10-01 (Mon, 01 Oct 2018) Changed paths: M client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.05' into release_18.09 Commit: 55c90960e9a69e8576489ffffba7a0c482748c60 https://github.com/galaxyproject/galaxy/commit/55c90960e9a69e8576489ffffba7a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-10-01 (Mon, 01 Oct 2018) Changed paths: M client/galaxy/scripts/components/Sharing.vue M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/rules/rule-definitions.js M client/galaxy/style/scss/base.scss M client/yarn.lock M config/plugins/webhooks/demo/tour_generator/__init__.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/util/__init__.py M lib/galaxy/web/framework/helpers/__init__.py M static/style/blue/base.css M templates/show_params.mako M templates/webapps/galaxy/page/editor.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/tool_shed/repository/tool_form.mako M test/api/test_tools.py A test/functional/tools/identifier_in_conditional.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/4c0a20853c61...55c90960e9a6 **NOTE:** This service has 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.