Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 807586ace8d90b33b24a9584af73a6a4dc763b34 https://github.com/galaxyproject/galaxy/commit/807586ace8d90b33b24a9584af73a... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/visualization/visualization-model.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M config/plugins/visualizations/charts/Gruntfile.js M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/visualizations/scatterplot/templates/scatterplot.mako M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/special_tools.py M scripts/common_startup.sh R static/maps/libs/backbone/backbone.js.map M static/maps/mvc/form/form-select-content.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/visualization/visualization-model.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map R static/scripts/libs/backbone/backbone.js M static/scripts/mvc/form/form-select-content.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/visualization/visualization-model.js M static/scripts/mvc/workflow/workflow-view.js M test/api/test_workflows.py A test/functional/tools/for_workflows/1.bam A test/functional/tools/for_workflows/mapper.xml A test/functional/tools/for_workflows/pileup.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge release_16.01 into dev. Commit: fdb90c729f859dd6a581d71817bc0bfb3a03abd9 https://github.com/galaxyproject/galaxy/commit/fdb90c729f859dd6a581d71817bc0... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/visualization/visualization-model.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M config/plugins/visualizations/charts/Gruntfile.js M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/visualizations/scatterplot/templates/scatterplot.mako M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/special_tools.py M scripts/common_startup.sh R static/maps/libs/backbone/backbone.js.map M static/maps/mvc/form/form-select-content.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/visualization/visualization-model.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map R static/scripts/libs/backbone/backbone.js M static/scripts/mvc/form/form-select-content.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/visualization/visualization-model.js M static/scripts/mvc/workflow/workflow-view.js M test/api/test_workflows.py A test/functional/tools/for_workflows/1.bam A test/functional/tools/for_workflows/mapper.xml A test/functional/tools/for_workflows/pileup.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #1583 from jmchilton/dev_merge_2 Merge release_16.01 into dev. Compare: https://github.com/galaxyproject/galaxy/compare/585b93fd1868...fdb90c729f85