Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4431d735c8908b19bbcd1ca594ec1a194cf4d299 https://github.com/galaxyproject/galaxy/commit/4431d735c8908b19bbcd1ca594ec1... Author: guerler <aysam.guerler@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/utilities/tabular-form.js Log Message: ----------- Extend list of tabular datatypes for bar diagrams Commit: 22687410c4829dd9a0e44f55ee93b1020c8eab20 https://github.com/galaxyproject/galaxy/commit/22687410c4829dd9a0e44f55ee93b... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Ensure Conda prefix and cached environment are absolute paths Otherwise when Conda commands are executed from the job working directory, they will break. Commit: 879e3d69606e1a4b98bd34f75bf905b9da6edcfa https://github.com/galaxyproject/galaxy/commit/879e3d69606e1a4b98bd34f75bf90... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Skip building cache if force_rebuild is False Also: - re-raise exception if rmtree() fails - change hash(ed)_requirements to hash(ed)_dependencies Commit: 7c9d9d2231ecc113f7d69737a4aa4ec140b7e48c https://github.com/galaxyproject/galaxy/commit/7c9d9d2231ecc113f7d69737a4aa4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Apply a fix similar to 36134bca694c9dc6b2584fb661dfbce4ddb793e6 for the workflow editor. Not ideal, but this is old code we're replacing as the editor is overhauled. Commit: 5a7f9e876e28ea773b79af9bbb887de7cff4aaa7 https://github.com/galaxyproject/galaxy/commit/5a7f9e876e28ea773b79af9bbb887... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-11 (Sun, 11 Dec 2016) Changed paths: M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Correctly update TS repo status Execute build_dependency_cache() only if using a cached dependency manager. Set tool versions only if the TS repo contains tools. Raise exception if fetch_tool_versions() fails, previously the error message never reached the UI. Commit: 9dda310cd35e18c3ef86c5b09a021fc359fe5011 https://github.com/galaxyproject/galaxy/commit/9dda310cd35e18c3ef86c5b09a021... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-11 (Sun, 11 Dec 2016) Changed paths: M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge pull request #3296 from dannon/workflow_editor_toolsearch_messagebox_fix [16.10] Workflow editor 'messagebox' fix. Commit: 22c7fcf3fff19ed9f271ada3cd8c007a96444768 https://github.com/galaxyproject/galaxy/commit/22c7fcf3fff19ed9f271ada3cd8c0... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-11 (Sun, 11 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Merge pull request #3295 from nsoranzo/release_16.10_tool_install_fixes [16.10] Tool install fixes Commit: 2c833499b130aca72ab78d112692f2a9f0d4d9e6 https://github.com/galaxyproject/galaxy/commit/2c833499b130aca72ab78d112692f... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-11 (Sun, 11 Dec 2016) Changed paths: M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/utilities/tabular-form.js Log Message: ----------- Merge pull request #3287 from guerler/fix_chart_datatypes [16.10] Rely on tabular subclass matching through vizframework layer Commit: 584114a4698076b79d77124b27867d6ea2386188 https://github.com/galaxyproject/galaxy/commit/584114a4698076b79d77124b27867... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-12 (Mon, 12 Dec 2016) Changed paths: M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/utilities/tabular-form.js M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/tool_shed/galaxy_install/install_manager.py M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge branch 'release_16.10' into dev Conflicts: config/plugins/visualizations/charts/static/repository/build/registry.js config/plugins/visualizations/charts/static/repository/build/registry.js.map Compare: https://github.com/galaxyproject/galaxy/compare/c7568a1d871b...584114a46980