Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0ff61d9ffc93063f8c2e6261a1ea6c36c1176d77 https://github.com/galaxyproject/galaxy/commit/0ff61d9ffc93063f8c2e6261a1ea6... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Fix Registry.get_datatype_by_extension() to return None if ext is unknown Without this fix, the Cheetah expression: $dataset.is_of_type('unknown_ext') in a tool command would be equivalent to: $dataset.is_of_type('txt') meaning that if the dataset datatype is a subclass of Text, the expression would evaluate to True without any warning. xref. https://github.com/galaxyproject/tools-iuc/issues/1373 Also add missing `xml` datatype to `test/functional/tools/sample_datatypes_conf.xml` which is needed by 3 test tools. Commit: c8eff858d68cdbea85524c4e366cc479ba556dcd https://github.com/galaxyproject/galaxy/commit/c8eff858d68cdbea85524c4e366cc... Author: guerler <aysam.guerler@gmail.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Remove float style from color picker label Commit: bd2d52800e7776ead1c8c7af53995d13cd288397 https://github.com/galaxyproject/galaxy/commit/bd2d52800e7776ead1c8c7af53995... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Merge pull request #4233 from guerler/fix_color_picker_release [17.05] Remove float style from color picker label Commit: 5a39d47b0adde675fc195c5d8b9c82c13917a233 https://github.com/galaxyproject/galaxy/commit/5a39d47b0adde675fc195c5d8b9c8... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Merge pull request #4230 from nsoranzo/release_16.07_backport_4224 [16.07] Backport #4224 Commit: fada8d2a60e625cf16fce7e20715422f86d6f40c https://github.com/galaxyproject/galaxy/commit/fada8d2a60e625cf16fce7e207154... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Commit: bfb3ce6e79074c42803444701e814c65631ac0cd https://github.com/galaxyproject/galaxy/commit/bfb3ce6e79074c42803444701e814... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Conflicts: test/functional/tools/sample_datatypes_conf.xml Commit: d0893b91ae281a17b3ae1bc210f197c6f259103c https://github.com/galaxyproject/galaxy/commit/d0893b91ae281a17b3ae1bc210f19... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Commit: 9eb3c0f40a425b74adc03ee0e72442a292225c98 https://github.com/galaxyproject/galaxy/commit/9eb3c0f40a425b74adc03ee0e7244... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M client/galaxy/style/less/ui.less M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/style/blue/base.css M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Merge branch 'release_17.05' into dev Conflicts: static/style/blue/base.css test/functional/tools/sample_datatypes_conf.xml Compare: https://github.com/galaxyproject/galaxy/compare/7baf86f7c137...9eb3c0f40a42