Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 26d48c876cd2bd39bd8c0e404d54e6de520ce1df https://github.com/galaxyproject/galaxy/commit/26d48c876cd2bd39bd8c0e404d54e... Author: Pierrick Roger Mele <pierrick.rogermele@icloud.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M lib/galaxy/datatypes/tabular.py A tools/mtbls-dwnld Log Message: ----------- Fix empty tabular output error when using discover_datasets. Commit: 4b9b3724e87e7ea0c6b81da36df5f6b00124c6c6 https://github.com/galaxyproject/galaxy/commit/4b9b3724e87e7ea0c6b81da36df5f... Author: Pierrick Roger Mele <pierrick.rogermele@icloud.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: R tools/mtbls-dwnld Log Message: ----------- Remove tool symbolic link added by accident. Commit: edbe273a95d727278b37c4457912e27355ec2cf3 https://github.com/galaxyproject/galaxy/commit/edbe273a95d727278b37c4457912e... Author: Pierrick Roger Mele <pierrick.rogermele@icloud.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M .gitignore M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/tool-panel.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/mvc/grid/grid-view.js A client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/history-view-edit-current.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/webhooks.js M client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/base.less M config/plugins/interactive_environments/neo/config/allowed_images.yml.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/neo/config/neo.xml M config/plugins/webhooks/demo/search/config/searchover.yaml M config/plugins/webhooks/demo/search/static/script.js M config/plugins/webhooks/demo/tool_list/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/config/tour_generator.yml A config/plugins/webhooks/demo/tour_generator/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/static/script.js A config/plugins/webhooks/demo/tour_generator/static/styles.css M cron/updateucsc.sh.sample M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/registry.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_build_tool.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/wrappers.py M lib/galaxy/webapps/galaxy/api/webhooks.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M scripts/api/library_upload_dir.py M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/layout/panel.js.map M static/maps/mvc/grid/grid-view.js.map A static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/history-view-edit-current.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/webhooks.js.map M static/maps/mvc/workflow/workflow-configure-menu.js.map M static/maps/mvc/workflow/workflow.js.map M static/maps/onload.js.map M static/maps/utils/utils.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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 M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/layout/panel.js M static/scripts/mvc/grid/grid-view.js A static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/history-view-edit-current.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/webhooks.js M static/scripts/mvc/workflow/workflow-configure-menu.js M static/scripts/mvc/workflow/workflow.js M static/scripts/onload.js M static/scripts/utils/utils.js M static/style/blue/base.css M templates/js-app.mako R templates/webapps/galaxy/history/grid.mako R templates/webapps/galaxy/history/grid_js.mako R templates/webapps/galaxy/visualization/list_published.mako R templates/webapps/galaxy/workflow/import.mako R templates/webapps/galaxy/workflow/list_published.mako R templates/webapps/galaxy/workflow/run.mako M test/functional/tools/sample_datatypes_conf.xml M test/functional/webhooks/phdcomics/helper/__init__.py M test/functional/webhooks/trans_object/helper/__init__.py M tools/filters/wc_gnu.xml Log Message: ----------- Merge branch 'dev' into issue-4231-fix-empty-tabular-output Commit: 8b0187317564d70b3a5bc5f67ee78461879fd43e https://github.com/galaxyproject/galaxy/commit/8b0187317564d70b3a5bc5f67ee78... Author: Pierrick Roger Mele <pierrick.rogermele@icloud.com> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Implement Nicola Sorenzo's proposal for set_meta() method. Commit: 2a737d0b794d03d16774bcd6250561eda92d9abc https://github.com/galaxyproject/galaxy/commit/2a737d0b794d03d16774bcd625056... Author: Pierrick Roger Mele <pierrick.rogermele@icloud.com> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Set two blank lines before class definition, in order for travis linting to pass. Commit: ba5549b47193f1ac87a2fa8d145e3d4d1541c554 https://github.com/galaxyproject/galaxy/commit/ba5549b47193f1ac87a2fa8d145e3... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge pull request #4240 from pierrickrogermele/issue-4231-fix-empty-tabular-output Fix empty tabular output error when using discover_datasets. Compare: https://github.com/galaxyproject/galaxy/compare/e7731684518e...ba5549b47193