Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ac409cf558914ec128b507a812d67b79bf1be615 https://github.com/galaxyproject/galaxy/commit/ac409cf558914ec128b507a812d67... Author: Steven Weaver <sweaver@temple.edu> Date: 2018-03-15 (Thu, 15 Mar 2018) Changed paths: A config/plugins/visualizations/hivtrace/config/hivtrace.xml A config/plugins/visualizations/hivtrace/static/448c34a56d699c29117adc64c43affeb.woff2 A config/plugins/visualizations/hivtrace/static/674f50d287a8c48dc19ba404d20fe713.eot A config/plugins/visualizations/hivtrace/static/89889688147bd7575d6327160d64e760.svg A config/plugins/visualizations/hivtrace/static/912ec66d7572ff821749319396470bde.svg A config/plugins/visualizations/hivtrace/static/af7ae505a9eed503f8b8e6982036873e.woff2 A config/plugins/visualizations/hivtrace/static/b06871f281fee6b241d60582ae9369b9.ttf A config/plugins/visualizations/hivtrace/static/e18bbf611f2a2e43afc071aa2f4e1512.ttf A config/plugins/visualizations/hivtrace/static/f4769f9bdb7466be65088239c12046d1.eot A config/plugins/visualizations/hivtrace/static/fa2772327f55d8198301fdb8bcfc8158.woff A config/plugins/visualizations/hivtrace/static/fee66e712a8a08eef5805a46892932ad.woff A config/plugins/visualizations/hivtrace/static/hivtrace.css A config/plugins/visualizations/hivtrace/static/hivtrace.css.map A config/plugins/visualizations/hivtrace/static/hivtrace.js A config/plugins/visualizations/hivtrace/static/hivtrace.js.map A config/plugins/visualizations/hivtrace/static/vendor.js A config/plugins/visualizations/hivtrace/static/vendor.js.map A config/plugins/visualizations/hivtrace/templates/index.mako Log Message: ----------- adding initial hivtrace-viz visualization Commit: f1b5849f33463670bf37ba9dab1d296a8efa8851 https://github.com/galaxyproject/galaxy/commit/f1b5849f33463670bf37ba9dab1d2... Author: Steven Weaver <sweaver@temple.edu> Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M .ci/flake8_blacklist.txt M .gitignore M CONTRIBUTING.md M Makefile M README.rst M client/.babelrc M client/README.md M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/components/HistoryImport.vue A client/galaxy/scripts/components/PluginList.vue A client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/components/admin/DataTablesGrid.vue M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/legacy/grid/grid-view.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/collection/list-collection-creator.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-model.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/form/form-wrapper.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/history-list.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/job-states-model.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-slider.js M client/galaxy/scripts/mvc/ui/ui-thumbnails.js A client/galaxy/scripts/mvc/upload/collection/rules-input-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/upload-ftp.js A client/galaxy/scripts/mvc/upload/upload-utils.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/visualization/chart/components/model.js M client/galaxy/scripts/mvc/visualization/chart/utilities/datasets.js M client/galaxy/scripts/mvc/visualization/chart/utilities/jobs.js M client/galaxy/scripts/mvc/visualization/chart/views/groups.js M client/galaxy/scripts/mvc/visualization/chart/views/menu.js M client/galaxy/scripts/mvc/visualization/chart/views/viewer.js M client/galaxy/scripts/mvc/visualization/visualization-model.js R client/galaxy/scripts/mvc/visualization/visualization-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/ui/pagination.js M client/galaxy/scripts/ui/peek-column-selector.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/sweepster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/style/less/charts.less M client/galaxy/style/less/upload.less M client/gulpfile.js M client/package.json M client/webpack.config.js M client/yarn.lock M config/datatypes_conf.xml.sample M config/galaxy.yml.sample M config/job_conf.xml.sample_advanced M config/plugins/interactive_environments/common/templates/ie.mako M config/plugins/visualizations/common/templates/chart_entry_point.mako M config/plugins/visualizations/csg/config/csg.xml A config/plugins/visualizations/csg/static/logo.png M config/plugins/visualizations/csg/templates/csg.mako M config/plugins/visualizations/cytoscape/config/cytoscape.xml M config/plugins/visualizations/drawrna/config/drawrna.xml M config/plugins/visualizations/example/config/example.xml M config/plugins/visualizations/graphviz/config/graphviz.xml M config/plugins/visualizations/graphviz/templates/graphviz.mako M config/plugins/visualizations/heatmap/heatmap_cluster/config/heatmap_cluster.xml M config/plugins/visualizations/heatmap/heatmap_default/config/heatmap_default.xml M config/plugins/visualizations/heatmap/heatmap_default/config/heatmap_shared.xml M config/plugins/visualizations/jqplot/jqplot_bar/config/jqplot_bar.xml M config/plugins/visualizations/jqplot/jqplot_box/config/jqplot_box.xml M config/plugins/visualizations/jqplot/jqplot_histogram/config/jqplot_histogram.xml M config/plugins/visualizations/jqplot/jqplot_line/config/jqplot_line.xml M config/plugins/visualizations/jqplot/jqplot_scatter/config/jqplot_scatter.xml M config/plugins/visualizations/msa/config/msa.xml M config/plugins/visualizations/msa/static/script.js M config/plugins/visualizations/ngl/config/ngl.xml M config/plugins/visualizations/nvd3/nvd3_bar/config/nvd3_bar.xml M config/plugins/visualizations/nvd3/nvd3_bar/src/nvd3.js M config/plugins/visualizations/nvd3/nvd3_bar/static/nvd3.js M config/plugins/visualizations/nvd3/nvd3_bar_stacked/config/nvd3_bar_stacked.xml M config/plugins/visualizations/nvd3/nvd3_histogram/config/nvd3_histogram.xml M config/plugins/visualizations/nvd3/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml M config/plugins/visualizations/nvd3/nvd3_horizontal/config/nvd3_horizontal.xml M config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml M config/plugins/visualizations/nvd3/nvd3_line/config/nvd3_line.xml M config/plugins/visualizations/nvd3/nvd3_line_focus/config/nvd3_line_focus.xml M config/plugins/visualizations/nvd3/nvd3_pie/config/nvd3_pie.xml M config/plugins/visualizations/nvd3/nvd3_scatter/config/nvd3_scatter.xml M config/plugins/visualizations/nvd3/nvd3_stackedarea/config/nvd3_stackedarea.xml M config/plugins/visualizations/nvd3/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml M config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml M config/plugins/visualizations/phylocanvas/config/phylocanvas.xml M config/plugins/visualizations/phyloviz/config/phyloviz.xml A config/plugins/visualizations/phyloviz/static/logo.png M config/plugins/visualizations/pv/config/pv.xml A config/plugins/visualizations/scatterplot/.babelrc M config/plugins/visualizations/scatterplot/package.json A config/plugins/visualizations/scatterplot/src/jqglobals.js M config/plugins/visualizations/scatterplot/src/scatterplot.js A config/plugins/visualizations/scatterplot/static/logo.png M config/plugins/visualizations/scatterplot/static/scatterplot.js M config/plugins/visualizations/scatterplot/templates/scatterplot.mako M config/plugins/visualizations/trackster/config/trackster.xml A config/plugins/visualizations/trackster/static/logo.png M config/plugins/visualizations/unipept/config/unipept.xml M config/plugins/visualizations/unipept/templates/unipept.mako M config/plugins/visualizations/venn/config/venn.xml M config/plugins/visualizations/venn/src/script.js M config/plugins/visualizations/venn/static/script.js M config/reports.yml.sample M config/tool_conf.xml.main M config/tool_conf.xml.sample M config/tool_shed.yml.sample A config/workflow_resource_mapper_conf.yml.sample A config/workflow_resource_params_conf.xml.sample M doc/source/admin/cluster.md M doc/source/admin/galaxy_options.rst M doc/source/admin/nginx.md M doc/source/admin/scaling.md M doc/source/releases/18.01_announce.rst M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/converters/bed_gff_or_vcf_to_bigwig_converter.xml A lib/galaxy/datatypes/converters/genbankgz_to_genbank.xml M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/registry.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/1.genbank A lib/galaxy/datatypes/test/1.genbank.gz M lib/galaxy/datatypes/util/gff_util.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt R lib/galaxy/dependencies/pinned-hashed-requirements.txt A lib/galaxy/dependencies/pinned-requirements.txt R lib/galaxy/dependencies/pinned-requirements.txt A lib/galaxy/dependencies/pipfiles/default/Pipfile A lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock R lib/galaxy/dependencies/pipfiles/develop/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/flake8/Pipfile.lock R lib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/update.sh R lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/dynamic_tool_destination.py M lib/galaxy/jobs/mapper.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/util/job_script/MEMORY_STATEMENT.sh M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/orm/engine_factory.py M lib/galaxy/model/orm/scripts.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/security/passwords.py M lib/galaxy/security/validate_user_input.py M lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/data_fetch.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/tools/error_reports/plugins/sentry.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/repositories.py M lib/galaxy/tools/verify/interactor.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/script.py M lib/galaxy/visualization/plugins/config_parser.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/visualization/plugins/registry.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/statsd.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/_fetch_util.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/jobs.py A lib/galaxy/webapps/galaxy/api/plugins.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/config_schema.yml M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/workflow/modules.py A lib/galaxy/workflow/resources/__init__.py A lib/galaxy/workflow/resources/example.py.sample M lib/galaxy/workflow/run_request.py M lib/galaxy_ext/metadata/set_metadata.py M lib/tool_shed/util/hg_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py A scripts/apply_tags.py M scripts/bootstrap_history.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/cleanup_datasets/populate_uuid.py R scripts/cleanup_datasets/remove_renamed_datasets_from_disk.py R scripts/cleanup_datasets/rename_purged_datasets.py M scripts/cleanup_datasets/update_dataset_size.py M scripts/cleanup_datasets/update_metadata.py M scripts/common_startup.sh M scripts/communication/communication_server.py R scripts/data_libraries/build_lucene_index.py R scripts/data_libraries/build_lucene_index.sh R scripts/data_libraries/build_whoosh_index.py R scripts/data_libraries/build_whoosh_index.sh M scripts/db_shell.py M scripts/galaxy-main M scripts/get_uwsgi_args.py M scripts/grt/export.py M scripts/grt/grt.yml.sample M scripts/grt/upload.py M scripts/helper.py M scripts/manage_db.py R scripts/others/incorrect_gops_jobs.py R scripts/others/incorrect_gops_jobs.sh R scripts/others/incorrect_gops_join_jobs.py R scripts/others/incorrect_gops_join_jobs.sh M scripts/runtime_stats.py M scripts/secret_decoder_ring.py M scripts/set_dataset_sizes.py M scripts/set_user_disk_usage.py M scripts/sync_reports_config.py M scripts/transfer.py M static/style/blue/base.css R templates/admin/view_data_tables_registry.mako M templates/admin/view_datatypes_registry.mako M templates/webapps/galaxy/admin/view_display_applications.mako M templates/webapps/galaxy/data_manager/index.mako A test-data/rules/PRJDA60709.tsv A test-data/rules/PRJDB3920.tsv A test-data/rules/PRJNA355367.tsv A test-data/rules/uniprot.json A test-data/rules/uniprot.tsv M test/api/test_libraries.py M test/api/test_tools.py M test/api/test_tools_upload.py M test/api/test_workflows.py M test/base/populators.py M test/docker/base/Dockerfile M test/functional/tools/sample_datatypes_conf.xml M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/galaxy_selenium/smart_components.py A test/integration/test_scripts.py M test/integration/test_upload_configuration_options.py M test/selenium_tests/framework.py A test/selenium_tests/test_admin_app.py M test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_jupyter.py M test/selenium_tests/test_library_to_collections.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_uploads.py M test/shed_functional/test_data/emboss/datatypes/datatypes_conf.xml A test/unit/jobs/dynamic_tool_destination/data/job_conf.xml M test/unit/jobs/dynamic_tool_destination/data/priority_tool_destination.yml M test/unit/jobs/dynamic_tool_destination/data/test_no_verbose.yml M test/unit/jobs/dynamic_tool_destination/data/test_num_input_datasets.yml M test/unit/jobs/dynamic_tool_destination/data/tool_destination.yml M test/unit/jobs/dynamic_tool_destination/mockGalaxy.py M test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py M test/unit/jobs/dynamic_tool_destination/ymltests.py M test/unit/unittest_utils/galaxy_mock.py M test/unit/visualizations/plugins/test_VisualizationPlugin.py M test/unit/visualizations/plugins/test_VisualizationsRegistry.py M tools/data_source/upload.py M tools/data_source/upload.xml M tox.ini Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into dev Commit: ff15eeddbc8083ecd56a0dbaa03ca8cda7226111 https://github.com/galaxyproject/galaxy/commit/ff15eeddbc8083ecd56a0dbaa03ca... Author: Steven Weaver <sweaver@temple.edu> Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M config/plugins/visualizations/hivtrace/templates/index.mako Log Message: ----------- updating hivtrace plugin to use new static paths Commit: cea328effab5b56e9fca19b1a20f3289165a595a https://github.com/galaxyproject/galaxy/commit/cea328effab5b56e9fca19b1a20f3... Author: Steven Weaver <sweaver@temple.edu> Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M config/datatypes_conf.xml.sample M config/plugins/visualizations/hivtrace/config/hivtrace.xml Log Message: ----------- adding hivtrace datatype and updating visualization to use it Commit: 8ed3854f07e93f28774f76ed83f505471153ddb7 https://github.com/galaxyproject/galaxy/commit/8ed3854f07e93f28774f76ed83f50... Author: Dannon <dannon.baker@gmail.com> Date: 2018-04-17 (Tue, 17 Apr 2018) Changed paths: M config/datatypes_conf.xml.sample A config/plugins/visualizations/hivtrace/config/hivtrace.xml A config/plugins/visualizations/hivtrace/static/448c34a56d699c29117adc64c43affeb.woff2 A config/plugins/visualizations/hivtrace/static/674f50d287a8c48dc19ba404d20fe713.eot A config/plugins/visualizations/hivtrace/static/89889688147bd7575d6327160d64e760.svg A config/plugins/visualizations/hivtrace/static/912ec66d7572ff821749319396470bde.svg A config/plugins/visualizations/hivtrace/static/af7ae505a9eed503f8b8e6982036873e.woff2 A config/plugins/visualizations/hivtrace/static/b06871f281fee6b241d60582ae9369b9.ttf A config/plugins/visualizations/hivtrace/static/e18bbf611f2a2e43afc071aa2f4e1512.ttf A config/plugins/visualizations/hivtrace/static/f4769f9bdb7466be65088239c12046d1.eot A config/plugins/visualizations/hivtrace/static/fa2772327f55d8198301fdb8bcfc8158.woff A config/plugins/visualizations/hivtrace/static/fee66e712a8a08eef5805a46892932ad.woff A config/plugins/visualizations/hivtrace/static/hivtrace.css A config/plugins/visualizations/hivtrace/static/hivtrace.css.map A config/plugins/visualizations/hivtrace/static/hivtrace.js A config/plugins/visualizations/hivtrace/static/hivtrace.js.map A config/plugins/visualizations/hivtrace/static/vendor.js A config/plugins/visualizations/hivtrace/static/vendor.js.map A config/plugins/visualizations/hivtrace/templates/index.mako Log Message: ----------- Merge pull request #5869 from veg/dev HIV-TRACE visualization plug-in Compare: https://github.com/galaxyproject/galaxy/compare/2ad87ac71b52...8ed3854f07e9