Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ab4db8925cc895e90972de8b22f1919d25423a12 https://github.com/galaxyproject/galaxy/commit/ab4db8925cc895e90972de8b22f19... Author: Evgeny Anatskiy <evgeny.anatskiy@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js A client/galaxy/scripts/components/admin/base-grid.vue A client/galaxy/scripts/components/admin/data-manager-grid.vue A client/galaxy/scripts/components/admin/data-tables-grid.vue A client/galaxy/scripts/components/admin/data-tables.vue A client/galaxy/scripts/components/message.vue M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py Log Message: ----------- rewrite Admin/DataTables with Vue Commit: 4516958e9d56ae78fbb606dbeb7664f57cf242b6 https://github.com/galaxyproject/galaxy/commit/4516958e9d56ae78fbb606dbeb766... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.js Log Message: ----------- Minor formatting. Commit: 44a1c0bcbcf51dff72d3132f36e2ab106a121ad0 https://github.com/galaxyproject/galaxy/commit/44a1c0bcbcf51dff72d3132f36e2a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.js A client/galaxy/scripts/components/Message.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 R client/galaxy/scripts/components/admin/base-grid.vue R client/galaxy/scripts/components/admin/data-manager-grid.vue R client/galaxy/scripts/components/admin/data-tables-grid.vue R client/galaxy/scripts/components/admin/data-tables.vue R client/galaxy/scripts/components/message.vue Log Message: ----------- Rename new .vue components. Commit: fe8c009f48d9ed39bd8a7af41d26dc61b1219717 https://github.com/galaxyproject/galaxy/commit/fe8c009f48d9ed39bd8a7af41d26d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.js R client/galaxy/scripts/components/UserAPIKeys.vue A client/galaxy/scripts/components/admin/UserAPIKeys.vue Log Message: ----------- Move UserAPIKeys to components/admin Commit: 0e13c14e9ebca17c385f09df977cb58653be424e https://github.com/galaxyproject/galaxy/commit/0e13c14e9ebca17c385f09df977cb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-11 (Mon, 11 Dec 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/tool-panel.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/onload.js M config/plugins/interactive_environments/hicbrowser/config/allowed_images.yml.sample M config/plugins/webhooks/demo/tour_generator/static/script.js 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/set_metadata_tool.xml 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/visualization/data_providers/genome.py M lib/galaxy/webapps/galaxy/controllers/root.py 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/masthead.bundled.js M static/scripts/bundled/viz.bundled.js M static/scripts/bundled/workflow.bundled.js A static/scripts/libs/bibtex.js M static/scripts/mvc/tours.js M static/scripts/mvc/workflow/workflow-canvas.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/onload.js M templates/webapps/galaxy/workflow/editor.mako A test/integration/resubmission_dynamic_job_conf.xml M test/integration/resubmission_rules/rules.py M test/integration/test_job_resubmission.py 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 M tools/data_source/upload.xml Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into admin_data_tables_vue Commit: 203630c509be0eca1fb150bfa680b8c0b152aa11 https://github.com/galaxyproject/galaxy/commit/203630c509be0eca1fb150bfa680b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: R .ci/py3_sources.txt M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js 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/object_store_conf.xml.sample M config/openid_conf.xml.sample M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M lib/galaxy/config.py M lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/datatypes/proteomics.py 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/handler.py M lib/galaxy/jobs/runners/chronos.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/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/imp_exp/__init__.py M lib/galaxy/tools/parameters/basic.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/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/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/jobs.py R lib/galaxy/webapps/reports/controllers/sample_tracking.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/controllers/repository_review.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/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/util/hg_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/tool_dependency_util.py R openid/yahoo.xml 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/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/libs.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/bibtex.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/toolshed/repository-view.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 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 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/selenium_tests/test_tool_form.py M test/shed_functional/base/twilltestcase.py M tools/data_source/upload.py M tools/genomespace/genomespace_importer.py M tools/stats/aggregate_scores_in_intervals.py Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into admin_data_tables_vue Commit: f9d84f876f1c782b0d1580c23aea3b8465ed826c https://github.com/galaxyproject/galaxy/commit/f9d84f876f1c782b0d1580c23aea3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: 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 Log Message: ----------- Build client. Commit: 0d8520fe2df1c24c625d27ee8308b4daff0565dc https://github.com/galaxyproject/galaxy/commit/0d8520fe2df1c24c625d27ee8308b... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.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 lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/data_manager.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 Log Message: ----------- Merge pull request #5191 from dannon/admin_data_tables_vue Admin data tables vue Compare: https://github.com/galaxyproject/galaxy/compare/9aa596df8b68...0d8520fe2df1