Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 68433b1eff0a93704544a49f3d8f3a912d97c285 https://github.com/galaxyproject/galaxy/commit/68433b1eff0a93704544a49f3d8f3... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-25 (Thu, 25 May 2017)

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

Log Message: ----------- Force uniqueness of preserved tags (so, don't allow many inputs with a 'name:foo' tag to add a ton of 'name:foo' tags to a dataset; just use one)

Commit: b6e8d3e8acd00c1a595f15f2654c1b7809ecc831 https://github.com/galaxyproject/galaxy/commit/b6e8d3e8acd00c1a595f15f2654c1... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-26 (Fri, 26 May 2017)

Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/tools/actions/__init__.py

Log Message: ----------- Slight refactoring to use a dict for unique'ing preserved tags. TODO: enhance object builtins to compare correctly so we can use a set, maybe. Not a big deal unless/until we have a second type of preserved tag though.

Commit: dd06a01746f2ace048b9e1e604756e648a6ef1fd https://github.com/galaxyproject/galaxy/commit/dd06a01746f2ace048b9e1e604756... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-26 (Fri, 26 May 2017)

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

Log Message: ----------- Handle *both* paths for tag appending using the now-dict correctly.

Commit: 2ac04bbf095573f2621ffeea0e2fdeb59b21da53 https://github.com/galaxyproject/galaxy/commit/2ac04bbf095573f2621ffeea0e2fd... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-26 (Fri, 26 May 2017)

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

Log Message: ----------- Uniqueify hashtag display

Commit: 3d16319a15b7ac2f947eca24c36957894ae00afe https://github.com/galaxyproject/galaxy/commit/3d16319a15b7ac2f947eca24c3695... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2017-05-27 (Sat, 27 May 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M lib/galaxy/managers/collections.py M lib/galaxy/tools/actions/__init__.py M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hdca-li.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-li.js M static/scripts/mvc/history/hdca-li.js

Log Message: ----------- Merge pull request #4114 from dannon/force_uniqueness_preserved_tags

[17.05] Force uniqueness of preserved tags

Commit: 55336d2c3142051f605231e6db1cb6a45639417c https://github.com/galaxyproject/galaxy/commit/55336d2c3142051f605231e6db1cb... Author: John Chilton jmchilton@gmail.com Date: 2017-05-28 (Sun, 28 May 2017)

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

Log Message: ----------- Fix legacy Python path for genome diversity tools from miller lab.

Fixes #4108.

Commit: 96e1cf58f480549cf5b39647c8772863405f582f https://github.com/galaxyproject/galaxy/commit/96e1cf58f480549cf5b39647c8772... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2017-05-29 (Mon, 29 May 2017)

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

Log Message: ----------- Merge pull request #4117 from jmchilton/genome_diversity_fixes

[17.01] Fix legacy Python path for genome diversity tools from miller lab.

Commit: 42e274d3342720037d441222b9fb1bbcbce2d7c1 https://github.com/galaxyproject/galaxy/commit/42e274d3342720037d441222b9fb1... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-30 (Tue, 30 May 2017)

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

Log Message: ----------- Merge pull request #4122 from galaxyproject/release_17.01

[17.05] merge Release 17.01

Commit: b6597d43f39b621ada9e0aaffc47134f7daf47b3 https://github.com/galaxyproject/galaxy/commit/b6597d43f39b621ada9e0aaffc471... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-31 (Wed, 31 May 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M lib/galaxy/managers/collections.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hdca-li.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-li.js M static/scripts/mvc/history/hdca-li.js

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

Compare: https://github.com/galaxyproject/galaxy/compare/5845af256239...b6597d43f39b