[galaxyproject/galaxy] dbab6f: Workaround for #1739 - fixing up subworkflow inut ...
Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: dbab6f5b979f19c33c3cd1aeb5c459dcc5612eec https://github.com/galaxyproject/galaxy/commit/dbab6f5b979f19c33c3cd1aeb5c45... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-22 (Mon, 22 Feb 2016) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M static/maps/mvc/workflow/workflow-terminals.js.map 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/workflow/workflow-terminals.js M test/qunit/tests/workflow_editor_tests.js Log Message: ----------- Workaround for #1739 - fixing up subworkflow inut connections. Do the same relaxed thing we do for inputs of type 'input' as we do for outputs of this type. Someday we should have better tracking, but such a change is probably not wise for a release branch. Commit: 5b720b4a02408a0601e7ecaf4fb2374c8c5753a7 https://github.com/galaxyproject/galaxy/commit/5b720b4a02408a0601e7ecaf4fb23... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-02-23 (Tue, 23 Feb 2016) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M static/maps/mvc/workflow/workflow-terminals.js.map 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/workflow/workflow-terminals.js M test/qunit/tests/workflow_editor_tests.js Log Message: ----------- Merge pull request #1774 from jmchilton/wf_fixes [16.01] Workaround for #1739 - fixing up subworkflow input connections. Commit: 4c815a7d0589a00df8c8fffba730a79030ad7791 https://github.com/galaxyproject/galaxy/commit/4c815a7d0589a00df8c8fffba730a... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-02-23 (Tue, 23 Feb 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py Log Message: ----------- Merge pull request #1778 from nsoranzo/release_16.01_fix_download_file [16.01] Strip URL of download_file and download_by_url install actions. Commit: 390d3b7eb70b438d215d66180342aa86c9e1e7f1 https://github.com/galaxyproject/galaxy/commit/390d3b7eb70b438d215d66180342a... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-23 (Tue, 23 Feb 2016) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M static/maps/mvc/workflow/workflow-terminals.js.map M static/scripts/mvc/workflow/workflow-terminals.js M test/qunit/tests/workflow_editor_tests.js Log Message: ----------- Merge branch 'release_16.01' into dev Conflicts: static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/f06b8205897a...390d3b7eb70b
participants (1)
-
GitHub