Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bb39b7d60b39eeae7f112edb42d9563731a725bf https://github.com/galaxyproject/galaxy/commit/bb39b7d60b39eeae7f112edb42d95... Author: John Chilton jmchilton@gmail.com Date: 2017-12-08 (Fri, 08 Dec 2017)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Provide UI collection output information for subworkflows.

This fixes #5158 and should provide more correct extension based connection information as well.

Includes a backport of #4346 which fixes #3120.

Commit: d1510c739492cf1e7b9d0e2d793dfb4d18d91537 https://github.com/galaxyproject/galaxy/commit/d1510c739492cf1e7b9d0e2d793df... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2018-01-01 (Mon, 01 Jan 2018)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge pull request #5172 from jmchilton/1705_subworkflow_collection_outputs

[17.05] Provide UI collection output information for subworkflows.

Commit: a19596e3eacf63e749352f583be8774d43795d79 https://github.com/galaxyproject/galaxy/commit/a19596e3eacf63e749352f583be87... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-10 (Wed, 10 Jan 2018)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-model.js

Log Message: ----------- Fix dataset-model's edit url

Commit: 9aabaa68594421e920ed6d1ac1d287e561453d8b https://github.com/galaxyproject/galaxy/commit/9aabaa68594421e920ed6d1ac1d28... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-10 (Wed, 10 Jan 2018)

Changed paths: M static/maps/mvc/dataset/dataset-model.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-model.js

Log Message: ----------- Build client

Commit: 40f9c6bb858da82e21679281d3cc644271f53eb8 https://github.com/galaxyproject/galaxy/commit/40f9c6bb858da82e21679281d3cc6... Author: Martin Cech marten@bx.psu.edu Date: 2018-01-10 (Wed, 10 Jan 2018)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-model.js M static/maps/mvc/dataset/dataset-model.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-model.js

Log Message: ----------- Merge pull request #5289 from dannon/dataset_edit_fix

[17.09] Fix dataset edit link

Commit: 27c9fff8b9333d67c039cdbd5c7f1840f095633d https://github.com/galaxyproject/galaxy/commit/27c9fff8b9333d67c039cdbd5c7f1... Author: NCEichner norbert.eichner@ur.de Date: 2018-01-11 (Thu, 11 Jan 2018)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- #5187

In order to get rid of the conda error described in #5187 I raised the version number beginning from which conda is allowed to use the '--offline' parameter again to "4.4"

Commit: 201c6ca8812b243d7ff824df58a3b2fd64a88289 https://github.com/galaxyproject/galaxy/commit/201c6ca8812b243d7ff824df58a3b... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-11 (Thu, 11 Jan 2018)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Merge pull request #5298 from nsoranzo/release_17.09_backport_5233

[17.09] Backport #5233

Commit: a81f3e4e8c5fb06c2cd33569380a188b44a9da8a https://github.com/galaxyproject/galaxy/commit/a81f3e4e8c5fb06c2cd33569380a1... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-01-11 (Thu, 11 Jan 2018)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge branch 'release_17.05' into release_17.09

Conflicts: lib/galaxy/workflow/modules.py

Commit: 79651a1080112df0826cc74130f65bd793d0fdc8 https://github.com/galaxyproject/galaxy/commit/79651a1080112df0826cc74130f65... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-11 (Thu, 11 Jan 2018)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge branch 'release_17.09' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/db8721e6b869...79651a108011