Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f3aee70c9547c349061cbf22760d604f5f30c821 https://github.com/galaxyproject/galaxy/commit/f3aee70c9547c349061cbf22760d6... Author: John Chilton jmchilton@gmail.com Date: 2017-04-13 (Thu, 13 Apr 2017)

Changed paths: M lib/galaxy/tools/__init__.py

Log Message: ----------- More careful inspection of fixes for MAF tools requiring Galaxy.

Add two tools that required the hack, and remove one tool that doesn't seem to require it. Tracked in comment on #3934.

Commit: 60e00088c8b27c04734c7f7adb3cdae6a9a9580f https://github.com/galaxyproject/galaxy/commit/60e00088c8b27c04734c7f7adb3cd... Author: John Chilton jmchilton@gmail.com Date: 2017-04-24 (Mon, 24 Apr 2017)

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

Log Message: ----------- Fix edge case for workflow mapping handling when tools not available.

Fixes #3960.

Commit: 3fcd78564630fae9c4670cfbe198572f94f688c0 https://github.com/galaxyproject/galaxy/commit/3fcd78564630fae9c4670cfbe1985... Author: Martin Cech marten@bx.psu.edu Date: 2017-04-27 (Thu, 27 Apr 2017)

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

Log Message: ----------- Merge pull request #3962 from jmchilton/workflow_editor_mapping_test

[17.01] Fix edge case for workflow mapping handling when tools not available.

Commit: de46a0edba4c49bafa061a08fc49c5d7f72cbd30 https://github.com/galaxyproject/galaxy/commit/de46a0edba4c49bafa061a08fc49c... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-05-02 (Tue, 02 May 2017)

Changed paths: M lib/galaxy/tools/__init__.py

Log Message: ----------- Merge pull request #3935 from jmchilton/more_maf_fixes

[17.01] More careful inspection of fixes for MAF tools requiring Galaxy.

Commit: 06d0e4fce57fa29e6d7fb02c455b77f6855f783c https://github.com/galaxyproject/galaxy/commit/06d0e4fce57fa29e6d7fb02c455b7... Author: John Chilton jmchilton@gmail.com Date: 2017-05-02 (Tue, 02 May 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M lib/galaxy/tools/__init__.py M static/maps/mvc/workflow/workflow-terminals.js.map M static/scripts/mvc/workflow/workflow-terminals.js

Log Message: ----------- Merge remote-tracking branch 'upstream/release_17.01' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/ecf634a619e9...06d0e4fce57f