Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2db85b3dd9ede81691ebff7d72d58acfa38524c7 https://github.com/galaxyproject/galaxy/commit/2db85b3dd9ede81691ebff7d72d58... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-item-li.js M client/galaxy/style/less/history.less M static/style/blue/base.css Log Message: ----------- Swaps nametags to a div, sets a max-height (intentionally such that it clips a second line of tags, promoting curiosity to find the scroll Commit: 79465fd13cb2902aa3bb9f284e6e3fc0c86460d1 https://github.com/galaxyproject/galaxy/commit/79465fd13cb2902aa3bb9f284e6e3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-item-li.js Log Message: ----------- Add tooltip with number of nametags. Commit: 067d1c2abe391fe5d3f1794ce8945d9e4ea1b4e7 https://github.com/galaxyproject/galaxy/commit/067d1c2abe391fe5d3f1794ce8945... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Constrain nametags in select2 boxes to 5 matching tags. Commit: cb635d22fb2ad93d13fe67bef7865cf3102f7f7f https://github.com/galaxyproject/galaxy/commit/cb635d22fb2ad93d13fe67bef7865... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Add an 'extra tags' block in the select interface since we're so limited on space. Commit: 21c18b5a30243c7b107bdc0168115da24e2f7fb3 https://github.com/galaxyproject/galaxy/commit/21c18b5a30243c7b107bdc0168115... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-item-li.js Log Message: ----------- Refactor tag templating, changes order of operations and filtering to improve performance issues noticeable with many tags Commit: ee1655307ddb152f8289f42e3fa67e371fd33288 https://github.com/galaxyproject/galaxy/commit/ee1655307ddb152f8289f42e3fa67... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-item-li.js M client/galaxy/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Attempt to fix matched tags counting in select2 (internal state is shared and wonky here). Some cleanup to help see what's going on. Commit: c389a84d71caf5850d101940c132580a17059673 https://github.com/galaxyproject/galaxy/commit/c389a84d71caf5850d101940c1325... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Fix select2 tag filtering, counting, indication of extra tags. Commit: 35e1d18c06def858a8ee96986074eb14e2fccb66 https://github.com/galaxyproject/galaxy/commit/35e1d18c06def858a8ee96986074e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-default.js Log Message: ----------- More fat arrow functions and elimination of self in uiselectdefault Commit: 3fcc3c970078f5adc789569a1b80ef47e9c206e2 https://github.com/galaxyproject/galaxy/commit/3fcc3c970078f5adc789569a1b80e... 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 M client/galaxy/scripts/apps/panels/history-panel.js M client/galaxy/scripts/apps/panels/tool-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/generic-nav-view.js M client/galaxy/scripts/layout/modal.js M client/galaxy/scripts/layout/scratchbook.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/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/form/form-repeat.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-dataset-view.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/library/library-librarytoolbar-view.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/toolshed/repo-status-view.js M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/toolshed/shed-list-view.js M client/galaxy/scripts/mvc/toolshed/workflows-view.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/scripts/mvc/user/user-custom-builds.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-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/ja/locale.js M client/galaxy/scripts/nls/locale.js M client/galaxy/scripts/onload.js A client/galaxy/scripts/reports/run_stats.js R client/galaxy/scripts/reports_webapp/run_stats.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/sweepster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/filters.js M client/galaxy/scripts/viz/trackster/tracks.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/object_store_conf.xml.sample M config/openid_conf.xml.sample M config/plugins/interactive_environments/hicbrowser/config/allowed_images.yml.sample M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M config/plugins/webhooks/demo/tour_generator/static/script.js M contrib/galaxy.fedora-init M contrib/nagios/check_galaxy.py A doc/source/admin/cluster.md M doc/source/admin/index.rst A doc/source/admin/jobs.md A doc/source/admin/production.md A doc/source/admin/scaling.md A doc/source/admin/special_topics/apache.md A doc/source/admin/special_topics/ftp.md M doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/job_metrics.md A doc/source/admin/special_topics/nginx.md M doc/source/conf.py M lib/galaxy/config.py M lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/converters/cram_to_bam.py M lib/galaxy/datatypes/converters/interval_to_tabix_converter.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/set_metadata_tool.xml M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/test/1.bam A lib/galaxy/datatypes/test/1.vcf A lib/galaxy/datatypes/test/1.vcf.gz A lib/galaxy/datatypes/test/2.cram A lib/galaxy/datatypes/test/2.shuffled.bam M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt 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/model/__init__.py M lib/galaxy/model/metadata.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/objectstore/__init__.py A lib/galaxy/objectstore/cloud.py M lib/galaxy/openid/providers.py M lib/galaxy/security/__init__.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/data/__init__.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/history_query.py M lib/galaxy/tools/parameters/output_collect.py A lib/galaxy/tools/repositories.py M lib/galaxy/util/biostar.py M lib/galaxy/util/permutations.py A lib/galaxy/util/renamed_temporary_file.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/visualization/genomes.py M lib/galaxy/web/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/form_builder.py R lib/galaxy/web/framework/formbuilder.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/framework/webapp.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/library_contents.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/api/workflows.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 R lib/galaxy/webapps/reports/controllers/sample_tracking.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/api/tools.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/controllers/repository_review.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/webapps/tool_shed/security/__init__.py M lib/galaxy/webapps/tool_shed/util/hgweb_config.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.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 M lib/tool_shed/grids/util.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/data_table_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/hg_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/tool_dependency_util.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py R openid/yahoo.xml 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/adminToolshed.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/library.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/bundled/masthead.bundled.js M static/scripts/bundled/viz.bundled.js M static/scripts/bundled/workflow.bundled.js M static/scripts/galaxy.pages.js M static/scripts/layout/generic-nav-view.js M static/scripts/layout/scratchbook.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/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/dataset/data.js M static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-error.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/form/form-repeat.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/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-librarytoolbar-view.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/toolshed/repo-status-view.js M static/scripts/mvc/toolshed/repository-queue-view.js M static/scripts/mvc/toolshed/repository-view.js M static/scripts/mvc/toolshed/shed-list-view.js M static/scripts/mvc/toolshed/workflows-view.js M static/scripts/mvc/tours.js M static/scripts/mvc/ui/ui-frames.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-genomespace.js M static/scripts/mvc/upload/collection/collection-row.js M static/scripts/mvc/upload/collection/collection-view.js M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/upload/upload-button.js M static/scripts/mvc/upload/upload-view.js M static/scripts/mvc/user/user-custom-builds.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow-canvas.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/mvc/workflow/workflow.js M static/scripts/nls/fr/locale.js M static/scripts/nls/ja/locale.js M static/scripts/nls/locale.js M static/scripts/onload.js A static/scripts/reports/run_stats.js R static/scripts/reports_webapp/run_stats.js M static/scripts/viz/circster.js M static/scripts/viz/phyloviz.js M static/scripts/viz/sweepster.js M static/scripts/viz/trackster.js M static/scripts/viz/trackster/filters.js M static/scripts/viz/trackster/tracks.js M static/scripts/viz/visualization.js M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako M templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako M templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako M templates/admin/tool_shed_repository/reselect_tool_panel_section.mako M templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako R templates/common/select_template.mako R templates/common/template_common.mako M templates/display_common.mako R templates/form.mako 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 M templates/user/register.mako M templates/webapps/galaxy/workflow/editor.mako R templates/webapps/reports/grid.mako M templates/webapps/reports/index.mako R templates/webapps/reports/requests_per_month_all.mako R templates/webapps/reports/requests_per_user.mako R templates/webapps/reports/requests_user_per_month.mako M templates/webapps/reports/run_stats.mako M templates/webapps/tool_shed/admin/dataset_security/group/group_create.mako M templates/webapps/tool_shed/admin/dataset_security/role/role_create.mako M templates/webapps/tool_shed/category/grid.mako M templates/webapps/tool_shed/category/valid_grid.mako M templates/webapps/tool_shed/common/common.mako M templates/webapps/tool_shed/common/grid_common.mako M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako M templates/webapps/tool_shed/repository/common.mako M templates/webapps/tool_shed/repository/find_tools.mako M templates/webapps/tool_shed/repository/find_workflows.mako M templates/webapps/tool_shed/repository/manage_repository.mako M templates/webapps/tool_shed/repository/preview_tools_in_changeset.mako M templates/webapps/tool_shed/repository/tool_form.mako M templates/webapps/tool_shed/repository/view_repository.mako M templates/webapps/tool_shed/repository_review/browse_review.mako M templates/webapps/tool_shed/repository_review/edit_review.mako M templates/webapps/tool_shed/repository_review/grid.mako M templates/webapps/tool_shed/repository_review/reviews_of_changeset_revision.mako M templates/webapps/tool_shed/user/manage_email_alerts.mako M test/api/test_tools_upload.py M test/api/test_workflows.py M test/base/driver_util.py M test/base/populators.py M test/functional/webhooks/phdcomics/helper/__init__.py A test/integration/resubmission_dynamic_job_conf.xml M test/integration/resubmission_rules/rules.py M test/integration/test_job_resubmission.py M test/integration/test_upload_configuration_options.py M test/selenium_tests/test_tool_form.py M test/shed_functional/base/twilltestcase.py A test/shed_functional/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample A test/unit/datatypes/converters/__init__.py A test/unit/datatypes/converters/test_interval_to_tabix.py A test/unit/datatypes/test_bam.py A test/unit/datatypes/test_bcf.py A test/unit/datatypes/test_cram.py A test/unit/datatypes/test_vcf.py A test/unit/datatypes/util.py A test/unit/tools/test_tool_validation.py M tools/data_source/upload.py M tools/data_source/upload.xml M tools/genomespace/genomespace_importer.py M tools/stats/aggregate_scores_in_intervals.py M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into tag_limit_size Commit: d2d0e4169c93223f645a5e647862a105d9f93d47 https://github.com/galaxyproject/galaxy/commit/d2d0e4169c93223f645a5e647862a... 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/bundled/libs.bundled.js M static/scripts/mvc/history/history-item-li.js M static/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Rebuild client after upstream/dev merge. Commit: 62a3a5c5968c5eeca27fd9e25f05bd718666a70b https://github.com/galaxyproject/galaxy/commit/62a3a5c5968c5eeca27fd9e25f05b... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-item-li.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/style/less/history.less M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/history/history-item-li.js M static/scripts/mvc/ui/ui-select-default.js M static/style/blue/base.css Log Message: ----------- Merge pull request #5155 from dannon/tag_limit_size Dataset hashtag display improvements Compare: https://github.com/galaxyproject/galaxy/compare/be44b9b5eb5c...62a3a5c5968c