Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ce0780abef5fd1e832175975b6243525a6e4cbad https://github.com/galaxyproject/galaxy/commit/ce0780abef5fd1e832175975b6243... Author: yhoogstrate <y.hoogstrate@gmail.com> Date: 2017-01-16 (Mon, 16 Jan 2017) Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/controllers/user.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js Log Message: ----------- Custom dbkey builds: additional variable escaping Commit: 1b589f252ed12eefc48c37f018e04faf142e5898 https://github.com/galaxyproject/galaxy/commit/1b589f252ed12eefc48c37f018e04... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-23 (Mon, 23 Jan 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/ui/ui-misc.js M config/galaxy.ini.sample A config/local_conda_mapping.yml.sample M doc/schema_template.md M lib/galaxy/config.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/model/orm/scripts.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/dependencies.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py A lib/galaxy/tools/deps/resolvers/default_conda_mapping.yml M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/errors.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/util/galaxyops/__init__.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/verify/asserts/__init__.py M lib/galaxy/tools/verify/test_data.py M lib/galaxy/tools/wrappers.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/object_wrapper.py A lib/galaxy/util/oset.py M lib/galaxy/util/properties.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/util/shed_util_common.py M run.sh A scripts/manage_tool_dependencies.py M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-misc.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.map M static/scripts/mvc/form/form-view.js M static/scripts/mvc/ui/ui-misc.js M test/docker/base/run_test_wrapper.sh M test/functional/tools/column_param.xml A test/functional/tools/explicit_conversion.xml M test/functional/tools/implicit_conversion.xml A test/functional/tools/legacy_r.xml M test/functional/tools/samples_tool_conf.xml M test/galaxy_selenium/navigates_galaxy.py M test/integration/test_resolvers.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_history_sharing.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_workflow_editor.py M test/selenium_tests/test_workflow_management.py M test/unit/tools/test_tool_deps.py M tools/plotting/bar_chart.xml Log Message: ----------- Merge remote-tracking branch 'jmchilton/dev' into escape_vis Conflicts: static/scripts/bundled/libs.bundled.js.map Commit: d19f22e3fabfd7f22b6970fe857ed636462ca8e5 https://github.com/galaxyproject/galaxy/commit/d19f22e3fabfd7f22b6970fe857ed... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-23 (Mon, 23 Jan 2017) Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/controllers/user.py M static/maps/viz/trackster/tracks.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.map M static/scripts/viz/trackster/tracks.js Log Message: ----------- Merge pull request #3448 from yhoogstrate/escape_vis Custom dbkey builds: additional variable escaping Compare: https://github.com/galaxyproject/galaxy/compare/8daa58adcc6c...d19f22e3fabf