Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8d3f1b7fbbe1d9acc7d93bc70a27e3f52c8cf9ae https://github.com/galaxyproject/galaxy/commit/8d3f1b7fbbe1d9acc7d93bc70a27e... Author: Qiang Gu guqiang01@gmail.com Date: 2018-06-22 (Fri, 22 Jun 2018)

Changed paths: A client/galaxy/scripts/components/DataDialog.vue A client/galaxy/scripts/layout/data.js M client/galaxy/scripts/layout/modal.js M client/galaxy/scripts/layout/page.js M config/datatypes_conf.xml.sample M config/plugins/visualizations/msa/config/msa.xml M lib/galaxy/datatypes/binary.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/relabel_from_file.xml M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/buildapp.py M scripts/grt/export.py M test/api/test_jobs.py

Log Message: ----------- Merge branch 'dev' into data_column_1

Commit: df17fad74a160ed8e8c71097d027b418af9c67e7 https://github.com/galaxyproject/galaxy/commit/df17fad74a160ed8e8c71097d027b... Author: Qiang Gu guqiang01@gmail.com Date: 2018-06-22 (Fri, 22 Jun 2018)

Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/model/metadata.py M lib/galaxy/tools/__init__.py M test/api/test_tools.py

Log Message: ----------- Merge branch 'dev' into data_column_1

Commit: ca57b770901c0204e63dec836856cf75dae09acb https://github.com/galaxyproject/galaxy/commit/ca57b770901c0204e63dec836856c... Author: Qiang Gu guqiang01@gmail.com Date: 2018-06-24 (Sun, 24 Jun 2018)

Changed paths: M lib/galaxy/tools/parameters/wrapped_json.py

Log Message: ----------- fix data_column cast error when multiple is false

Commit: 88132f9d1609f2e6bf804d9e148e397cd0c2aeee https://github.com/galaxyproject/galaxy/commit/88132f9d1609f2e6bf804d9e148e3... Author: mvdbeek m.vandenbeek@gmail.com Date: 2018-06-30 (Sat, 30 Jun 2018)

Changed paths: A test-data/11.tabular A test-data/configfile.json A test/functional/tools/column_param_configfile.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Test dumping multiple="false" data_column param as json

Tests https://github.com/galaxyproject/galaxy/pull/6389

Commit: 2da83ae3fef08703016fb9567807e04d0baeb084 https://github.com/galaxyproject/galaxy/commit/2da83ae3fef08703016fb9567807e... Author: Qiang Gu 36086881+qiagu@users.noreply.github.com Date: 2018-06-30 (Sat, 30 Jun 2018)

Changed paths: A test-data/11.tabular A test-data/configfile.json A test/functional/tools/column_param_configfile.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Merge pull request #1 from mvdbeek/qiagu-data_column_1

Test dumping multiple="false" data_column param as json

Commit: c9df2ef9be73cf12644cb436cf7d4d23c7308174 https://github.com/galaxyproject/galaxy/commit/c9df2ef9be73cf12644cb436cf7d4... Author: Qiang Gu 36086881+qiagu@users.noreply.github.com Date: 2018-07-10 (Tue, 10 Jul 2018)

Changed paths: M test-data/configfile.json

Log Message: ----------- Update configfile.json

Commit: 53709df8cfb8fd384d60d221786c4167d7aa9658 https://github.com/galaxyproject/galaxy/commit/53709df8cfb8fd384d60d221786c4... Author: Qiang Gu guqiang01@gmail.com Date: 2018-07-11 (Wed, 11 Jul 2018)

Changed paths: M test-data/configfile.json

Log Message: ----------- Revert "Update configfile.json"

This reverts commit c9df2ef9be73cf12644cb436cf7d4d23c7308174.

Commit: 20f10fe6db8ceb73c843c2a5609ab5fa5cf2f4ba https://github.com/galaxyproject/galaxy/commit/20f10fe6db8ceb73c843c2a5609ab... Author: Dannon dannon.baker@gmail.com Date: 2018-07-18 (Wed, 18 Jul 2018)

Changed paths: M lib/galaxy/tools/parameters/wrapped_json.py A test-data/11.tabular A test-data/configfile.json A test/functional/tools/column_param_configfile.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Merge pull request #6389 from qiagu/data_column_1

fix data_column cast error when multiple is false

Compare: https://github.com/galaxyproject/galaxy/compare/adb082a805d2...20f10fe6db8c **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.