Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b75f793ea4c58786747da3a9571ba3bd938cd181 https://github.com/galaxyproject/galaxy/commit/b75f793ea4c58786747da3a9571ba... Author: John Chilton jmchilton@gmail.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js M lib/galaxy/tools/__init__.py M lib/galaxy/workflow/modules.py

Log Message: ----------- Load tools with collection type source attributes into the workflow editor.

Should allow using filter failed and merge collection tools within workflows.

Commit: ba8a7f0e3a540c99b3d8e7be3ea67008e2e76ff2 https://github.com/galaxyproject/galaxy/commit/ba8a7f0e3a540c99b3d8e7be3ea67... Author: John Chilton jmchilton@gmail.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/mvc/workflow/workflow-view-terminals.js.map M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view-terminals.js

Log Message: ----------- Pack client.

Commit: 01d16358efa5a71f7030c48c302129cca515e6c6 https://github.com/galaxyproject/galaxy/commit/01d16358efa5a71f7030c48c30212... Author: John Chilton jmchilton@gmail.com Date: 2017-08-31 (Thu, 31 Aug 2017)

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

Log Message: ----------- Adjust JS styling for workflow-terminal.js.

Commit: 49f2438622075f3e9cbe9097ad31b177c97f532a https://github.com/galaxyproject/galaxy/commit/49f2438622075f3e9cbe9097ad31b... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2017-08-31 (Thu, 31 Aug 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js M lib/galaxy/tools/__init__.py M lib/galaxy/workflow/modules.py M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/mvc/workflow/workflow-view-terminals.js.map M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view-terminals.js

Log Message: ----------- Merge pull request #4514 from jmchilton/collection_operations

Load tools with collection type source attributes into the workflow editor

Compare: https://github.com/galaxyproject/galaxy/compare/d09ced249d72...49f243862207