Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7a1d7fcaf4672c0a3ad382b07362b969180797d2 https://github.com/galaxyproject/galaxy/commit/7a1d7fcaf4672c0a3ad382b07362b... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-14 (Thu, 14 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- download behaves badly on firefox, preventing right clicking to copy the url here

Commit: 0ab21a2f4ed195711d0a55fa369dbc2fc09b123a https://github.com/galaxyproject/galaxy/commit/0ab21a2f4ed195711d0a55fa369db... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-14 (Thu, 14 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- We preventdefault on this anyway, so the void(0) doesn't do anything. This allows right click copy on primary dataset regardless of whether or not there are extra meta files.

Commit: ab084ffd4b9a797d3ccee35ffcdc1953970b88a0 https://github.com/galaxyproject/galaxy/commit/ab084ffd4b9a797d3ccee35ffcdc1... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-14 (Thu, 14 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- Convert download blob to template literals instead of array concats.

Commit: d3d6e723539618bea80a9f18b1895cc82aee280b https://github.com/galaxyproject/galaxy/commit/d3d6e723539618bea80a9f18b1895... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-14 (Thu, 14 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- Use the local var for urls.download

Commit: ca8ec7395860f82a3622a5c21821a9341a3e1267 https://github.com/galaxyproject/galaxy/commit/ca8ec7395860f82a3622a5c21821a... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-18 (Mon, 18 Dec 2017)

Changed paths: A .ci/check_py3_compatibility.sh M .ci/first_startup.sh R .ci/py3_sources.txt M .travis.yml M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js A client/galaxy/scripts/components/Message.vue R client/galaxy/scripts/components/UserAPIKeys.vue A client/galaxy/scripts/components/admin/BaseGrid.vue A client/galaxy/scripts/components/admin/DataManagerGrid.vue A client/galaxy/scripts/components/admin/DataTables.vue A client/galaxy/scripts/components/admin/DataTablesGrid.vue A client/galaxy/scripts/components/admin/UserAPIKeys.vue M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/layout/modal.js A client/galaxy/scripts/legacy/grid/grid-model.js A client/galaxy/scripts/legacy/grid/grid-template.js A client/galaxy/scripts/legacy/grid/grid-view.js M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-shared.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/mvc/workflow/workflow.js A client/galaxy/scripts/reports/run_stats.js R client/galaxy/scripts/reports_webapp/run_stats.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/visualization.js M client/gulpfile.js M client/package.json M client/webpack.config.js M client/yarn.lock M config/job_conf.xml.sample_advanced M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M contrib/galaxy.fedora-init M contrib/nagios/check_galaxy.py M doc/source/admin/production.md M doc/source/admin/special_topics/apache.md M doc/source/admin/special_topics/job_metrics.md M doc/source/admin/special_topics/nginx.md M lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/chronos.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/workflows.py M lib/galaxy/openid/providers.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/cwl/representation.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/history_query.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/util/biostar.py M lib/galaxy/util/permutations.py M lib/galaxy/util/script.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/batch.py M lib/galaxy/web/framework/middleware/profile.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/middleware/translogger.py M lib/galaxy/web/security/__init__.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/web/stack/transport.py M lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/api/datatypes.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/toolshed.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/async.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/reports/controllers/history.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/reports/controllers/users.py M lib/galaxy/webapps/reports/controllers/workflows.py A lib/galaxy/webapps/reports/framework/__init__.py A lib/galaxy/webapps/reports/framework/grids.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/security/__init__.py M lib/galaxy/webapps/tool_shed/util/hgweb_config.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/grids/repository_review_grids.py R scripts/api/form_create_from_xml.py R scripts/api/request_type_create_from_xml.py R scripts/api/requests_update_state.py R scripts/api/sample_configurations/sample_tracking/request_form.xml R scripts/api/sample_configurations/sample_tracking/request_type.xml R scripts/api/sample_configurations/sample_tracking/sample_form.xml R scripts/api/sample_dataset_update_status.py R scripts/api/sample_update_state.py R scripts/api/sequencer_configuration_create.py M scripts/build_universe_config.py M scripts/data_libraries/build_lucene_index.py M scripts/galaxy-main M scripts/helper.py M scripts/loc_files/create_all_fasta_loc.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/create_nib_seq_loc_file.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.py M scripts/microbes/ncbi_to_ucsc.py M scripts/microbes/util.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/paster.py M scripts/set_dataset_sizes.py M scripts/set_user_disk_usage.py M scripts/summarize_timings.py M scripts/sync_reports_config.py M scripts/tool_shed/api/get_filtered_repository_revisions.py M scripts/tool_shed/bootstrap_tool_shed/bootstrap_util.py M scripts/tool_shed/bootstrap_tool_shed/create_user_with_api_key.py M scripts/tool_shed/check_download_urls.py M scripts/tool_shed/migrate_tools_to_repositories.py M scripts/transfer.py M scripts/update_shed_config_path.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/galaxy.pages.js A static/scripts/legacy/grid/grid-model.js A static/scripts/legacy/grid/grid-template.js A static/scripts/legacy/grid/grid-view.js R static/scripts/libs/vue.js M static/scripts/mvc/grid/grid-model.js M static/scripts/mvc/grid/grid-shared.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/history-list.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/user/user-preferences.js A static/scripts/reports/run_stats.js R static/scripts/reports_webapp/run_stats.js M static/scripts/viz/trackster.js M static/scripts/viz/visualization.js R templates/grid_base.mako R templates/grid_base_async.mako A templates/legacy/grid_base.mako A templates/legacy/grid_base_async.mako R templates/panels.mako M templates/user/index.mako M templates/user/openid_manage.mako R templates/webapps/reports/grid.mako M templates/webapps/reports/run_stats.mako M templates/webapps/tool_shed/category/grid.mako M templates/webapps/tool_shed/category/valid_grid.mako M templates/webapps/tool_shed/common/grid_common.mako M templates/webapps/tool_shed/repository_review/grid.mako M test/api/test_tools_upload.py M test/base/driver_util.py M test/base/populators.py M test/functional/webhooks/phdcomics/helper/__init__.py M test/integration/test_upload_configuration_options.py M test/selenium_tests/test_tool_form.py M tools/data_source/upload.py M tools/genomespace/genomespace_importer.py M tox.ini

Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into download_fixes

Commit: d93a2b437972d08c3df38f2c8020b04fb659f696 https://github.com/galaxyproject/galaxy/commit/d93a2b437972d08c3df38f2c8020b... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-18 (Mon, 18 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- Client-format.

Commit: 202305687abcf887541d6d16fc71e96f9afb63d9 https://github.com/galaxyproject/galaxy/commit/202305687abcf887541d6d16fc71e... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-18 (Mon, 18 Dec 2017)

Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- Rebuild client again.

Commit: be44b9b5eb5c87eb79e561c2ebceba75106bf5b3 https://github.com/galaxyproject/galaxy/commit/be44b9b5eb5c87eb79e561c2ebceb... Author: Björn Grüning bjoern@gruenings.eu Date: 2017-12-19 (Tue, 19 Dec 2017)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/dataset/dataset-li.js

Log Message: ----------- Merge pull request #5125 from dannon/download_fixes

Download fixes

Compare: https://github.com/galaxyproject/galaxy/compare/1880230e5fdf...be44b9b5eb5c