[galaxy-commits] [galaxyproject/galaxy] 504e2a: Add client route for toolshed browsing grid

23 Oct 2017


      Branch: refs/heads/dev
  Home:   https://github.com/galaxyproject/galaxy
  Commit: 504e2aa96a7ed63e9574bc0e8fa27c39c379a903
      https://github.com/galaxyproject/galaxy/commit/504e2aa96a7ed63e9574bc0e8fa27...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/apps/admin.js
    M lib/galaxy/webapps/galaxy/buildapp.py

  Log Message:
  -----------
  Add client route for toolshed browsing grid


  Commit: 98fa946e21d98647d6b742d89934ed7a83d65650
      https://github.com/galaxyproject/galaxy/commit/98fa946e21d98647d6b742d89934e...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/mvc/history/history-view.js
    M config/datatypes_conf.xml.sample
    M config/galaxy.ini.sample
    M lib/galaxy/__init__.py
    M lib/galaxy/app.py
    M lib/galaxy/config.py
    M lib/galaxy/datatypes/binary.py
    A lib/galaxy/datatypes/test/postgresql_fake.tar.bz2
    M lib/galaxy/jobs/actions/post.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/model/tool_shed_install/__init__.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/tools/parameters/__init__.py
    M lib/galaxy/tools/parameters/basic.py
    M lib/galaxy/tools/parameters/grouping.py
    M lib/galaxy/tools/parser/output_objects.py
    M lib/galaxy/tools/toolbox/base.py
    M lib/galaxy/tools/toolbox/panel.py
    M lib/galaxy/util/__init__.py
    R lib/galaxy/util/backports/__init__.py
    M lib/galaxy/util/biostar.py
    M lib/galaxy/util/handlers.py
    M lib/galaxy/util/hash_util.py
    M lib/galaxy/util/image_util.py
    R lib/galaxy/util/log/__init__.py
    R lib/galaxy/util/log/fluent_log.py
    A lib/galaxy/util/logging/__init__.py
    A lib/galaxy/util/logging/fluent_log.py
    M lib/galaxy/util/object_wrapper.py
    M lib/galaxy/util/pastescript/serve.py
    M lib/galaxy/util/streamball.py
    M lib/galaxy/util/submodules.py
    M lib/galaxy/webapps/tool_shed/model/__init__.py
    M static/maps/mvc/history/history-view.js.map
    M static/maps/mvc/history/options-menu.js.map
    M static/scripts/bundled/analysis.bundled.js
    M static/scripts/bundled/analysis.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/mvc/history/history-view.js
    M static/scripts/mvc/history/options-menu.js
    A test-data/selenium-test-notebook.ipynb
    M test/api/test_tools.py
    A test/api/test_tools_upload.py
    M test/base/api.py
    M test/base/api_util.py
    A test/base/constants.py
    M test/base/populators.py
    M test/galaxy_selenium/data.py
    M test/galaxy_selenium/has_driver.py
    M test/galaxy_selenium/navigates_galaxy.py
    M test/galaxy_selenium/navigation-data.yml
    A test/galaxy_selenium/navigation.yml
    M test/integration/test_upload_configuration_options.py
    M test/selenium_tests/framework.py
    M test/selenium_tests/test_anon_history.py
    M test/selenium_tests/test_collection_builders.py
    M test/selenium_tests/test_custom_builds.py
    M test/selenium_tests/test_history_options.py
    M test/selenium_tests/test_history_panel.py
    A test/selenium_tests/test_jupyter.py
    A test/selenium_tests/test_library_contents.py
    A test/selenium_tests/test_library_landing.py
    A test/selenium_tests/test_navigates_galaxy.py
    M test/selenium_tests/test_published_histories_grid.py
    M test/selenium_tests/test_registration.py
    M test/selenium_tests/test_saved_histories.py
    M test/selenium_tests/test_uploads.py
    M test/selenium_tests/test_workflow_editor.py
    M test/selenium_tests/test_workflow_management.py
    M test/selenium_tests/test_workflow_run.py
    M tools/data_source/upload.py
    M tools/data_source/upload.xml

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: b93eb72858ed1866380acf35cfd2bfd4edd9e183
      https://github.com/galaxyproject/galaxy/commit/b93eb72858ed1866380acf35cfd2b...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/apps/admin.js
    M client/galaxy/scripts/apps/panels/admin-panel.js
    M lib/galaxy/webapps/galaxy/buildapp.py
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map

  Log Message:
  -----------
  Load manage repo grid without mako


  Commit: e19006d0f803e77372b1f9a858e0197240a1bd2f
      https://github.com/galaxyproject/galaxy/commit/e19006d0f803e77372b1f9a858e01...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Fix check_for_updates operation without self redirect


  Commit: 0b2ae99693edfccca2c5fca0ec727fcd14b07e24
      https://github.com/galaxyproject/galaxy/commit/0b2ae99693edfccca2c5fca0ec727...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Revise operation handling for repository management grid


  Commit: 1115547d6b48746199f168ce5359dff15469a795
      https://github.com/galaxyproject/galaxy/commit/1115547d6b48746199f168ce5359d...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Change redirects to client side route for repositories


  Commit: d46d45aa26bbe4a3b4bf84a6d9a2e8b8e60a1ce4
      https://github.com/galaxyproject/galaxy/commit/d46d45aa26bbe4a3b4bf84a6d9a2e...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
    M templates/admin/tool_shed_repository/repository_actions_menu.mako

  Log Message:
  -----------
  Fix redirect in pull down menu for repository manager


  Commit: 791c45f05ea28e34340e26399f4256de746a7554
      https://github.com/galaxyproject/galaxy/commit/791c45f05ea28e34340e26399f425...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Add support for multirow operation


  Commit: fa6133eed4c518c7b26220ef6063a630ef05cc74
      https://github.com/galaxyproject/galaxy/commit/fa6133eed4c518c7b26220ef6063a...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Fix error handling status for repositories endpoint


  Commit: e31b37eab116fbe0b185843c4a9b2c6b047ab1de
      https://github.com/galaxyproject/galaxy/commit/e31b37eab116fbe0b185843c4a9b2...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/mvc/library/library-folderlist-view.js
    M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
    M client/galaxy/scripts/onload.js
    M config/galaxy.ini.sample
    M lib/galaxy/dependencies/conditional-requirements.txt
    M lib/galaxy/web/security/__init__.py
    M static/maps/mvc/library/library-folderlist-view.js.map
    M static/maps/mvc/library/library-foldertoolbar-view.js.map
    M static/maps/onload.js.map
    M static/scripts/bundled/libs.bundled.js
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/mvc/library/library-folderlist-view.js
    M static/scripts/mvc/library/library-foldertoolbar-view.js
    M static/scripts/onload.js
    M test/unit/test_security_helper.py
    M tools/filters/joiner.xml

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: 200a74a5feeba4cd7f46331809b2d373a92961dd
      https://github.com/galaxyproject/galaxy/commit/200a74a5feeba4cd7f46331809b2d...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Remove spaces


  Commit: e04002fdff530f4a67c5bcd260d6489bfc1ce9a7
      https://github.com/galaxyproject/galaxy/commit/e04002fdff530f4a67c5bcd260d64...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Fix global update call operation


  Commit: 323bc3d1dc374c6978121d92eac1b3734b1a15b4
      https://github.com/galaxyproject/galaxy/commit/323bc3d1dc374c6978121d92eac1b...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/apps/admin.js
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map

  Log Message:
  -----------
  Re-add forms route


  Commit: 84218e38c0fe8c8b9c606598ccf9c2ac1a26148d
      https://github.com/galaxyproject/galaxy/commit/84218e38c0fe8c8b9c606598ccf9c...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Fix url for global operation


  Commit: 4db19d25e58321f64c9d54794ee81cc39bd39e89
      https://github.com/galaxyproject/galaxy/commit/4db19d25e58321f64c9d54794ee81...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py

  Log Message:
  -----------
  Fix url route in test case


  Commit: 88bb5a1f36fe0be558901e8214dc298d427de730
      https://github.com/galaxyproject/galaxy/commit/88bb5a1f36fe0be558901e8214dc2...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M test/shed_functional/base/twilltestcase.py

  Log Message:
  -----------
  Redirect url in shared twillcase helper


  Commit: 2a84f37a305a244d0d880a1d4ed9c00541d8f73c
      https://github.com/galaxyproject/galaxy/commit/2a84f37a305a244d0d880a1d4ed9c...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-05 (Thu, 05 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/mvc/grid/grid-view.js
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
    M static/maps/mvc/grid/grid-view.js.map
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.js.map
    M static/scripts/bundled/analysis.bundled.js
    M static/scripts/bundled/analysis.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/mvc/grid/grid-view.js

  Log Message:
  -----------
  Revise inbound/center handling


  Commit: 6a52dcc4e50774667417af379699b474cef9f04e
      https://github.com/galaxyproject/galaxy/commit/6a52dcc4e50774667417af379699b...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-05 (Thu, 05 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/dataset.py

  Log Message:
  -----------
  Remove inbound handler


  Commit: f1d53ef2a60b6b664d38d7dbfa13419022b6ff71
      https://github.com/galaxyproject/galaxy/commit/f1d53ef2a60b6b664d38d7dbfa134...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-05 (Thu, 05 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/layout/page.js
    M static/maps/layout/page.js.map
    M static/scripts/bundled/libs.bundled.js
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/layout/page.js

  Log Message:
  -----------
  Remove unused inbound pseudo class


  Commit: 31fd8a30805c5bb9cc788624a0890c78a7bdcc15
      https://github.com/galaxyproject/galaxy/commit/31fd8a30805c5bb9cc788624a0890...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Add center redirect support for operations

Redirect updates request to center panel

Remove center redirect


  Commit: 857af99c610ca37afea38711560b52c36b2391ff
      https://github.com/galaxyproject/galaxy/commit/857af99c610ca37afea38711560b5...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M .ci/flake8_lint_include_list.txt
    M .ci/jenkins/selenium/Dockerfile
    M .ci/jenkins/selenium/docker-compose.yml
    M .ci/jenkins/selenium/galaxy.ini
    M .ci/jenkins/selenium/run_galaxy.bash
    M .ci/jenkins/selenium/run_tests.sh
    M .ci/py3_sources.txt
    M client/galaxy/scripts/layout/router.js
    M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.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-view.js
    A client/galaxy/scripts/mvc/lazy/lazy-limited.js
    M client/galaxy/scripts/mvc/ui/ui-select-default.js
    M client/galaxy/scripts/mvc/upload/collection/collection-view.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
    A client/galaxy/scripts/mvc/upload/upload-extension.js
    M client/galaxy/scripts/mvc/upload/upload-ftp.js
    M client/galaxy/scripts/mvc/upload/upload-view.js
    M client/galaxy/scripts/utils/uploadbox.js
    M client/galaxy/style/less/ui.less
    M client/galaxy/style/less/upload.less
    M client/package-lock.json
    M config/error_report.yml.sample
    M contrib/galaxy_config_merger.py
    M lib/galaxy/config.py
    M lib/galaxy/dataset_collections/type_description.py
    M lib/galaxy/datatypes/converters/bed_to_gff_converter.py
    M lib/galaxy/datatypes/converters/gff_to_bed_converter.py
    M lib/galaxy/datatypes/converters/interval_to_bed_converter.py
    M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py
    M lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
    M lib/galaxy/datatypes/converters/maf_to_interval_converter.py
    M lib/galaxy/datatypes/converters/picard_interval_list_to_bed6_converter.py
    M lib/galaxy/datatypes/dataproviders/base.py
    M lib/galaxy/datatypes/mothur.py
    A lib/galaxy/datatypes/test/mothur_datatypetest_false_2.mothur.freq
    M lib/galaxy/datatypes/text.py
    M lib/galaxy/jobs/__init__.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/model/custom_types.py
    M lib/galaxy/model/mapping.py
    M lib/galaxy/model/search.py
    M lib/galaxy/objectstore/s3.py
    M lib/galaxy/security/__init__.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/tools/deps/containers.py
    A lib/galaxy/tools/error_reports/plugins/github.py
    M lib/galaxy/tools/evaluation.py
    M lib/galaxy/tools/flatten_collection.xml
    M lib/galaxy/tools/imp_exp/__init__.py
    M lib/galaxy/tools/parameters/__init__.py
    M lib/galaxy/tools/parameters/basic.py
    M lib/galaxy/tools/parameters/input_translation.py
    M lib/galaxy/tools/parameters/meta.py
    M lib/galaxy/tools/parameters/sanitize.py
    M lib/galaxy/tools/parameters/validation.py
    M lib/galaxy/tools/parser/xml.py
    M lib/galaxy/tools/util/maf_utilities.py
    M lib/galaxy/tools/xsd/galaxy.xsd
    M lib/galaxy/util/jstree.py
    M lib/galaxy/visualization/data_providers/basic.py
    M lib/galaxy/visualization/plugins/interactive_environments.py
    M lib/galaxy/web/form_builder.py
    M lib/galaxy/webapps/galaxy/controllers/admin.py
    M lib/galaxy/webapps/galaxy/controllers/dataset.py
    M lib/galaxy/webapps/galaxy/controllers/history.py
    M lib/galaxy/webapps/galaxy/controllers/root.py
    M lib/galaxy/webapps/reports/controllers/tools.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0001_initial_tables.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0002_add_tool_suite_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0003_review_and_review_association_tables.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0004_repository_tables.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0005_drop_tool_related_tables.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0006_add_email_alerts_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0007_add_long_description_times_downloaded_columns.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0008_add_repository_metadata_table.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0009_add_malicious_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0010_add_new_repo_alert_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0011_add_tool_versions_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0012_add_downloadable_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0013_add_review_tables.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0014_add_deprecated_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0015_add_api_keys_table.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0016_add_do_not_test_tools_functionally_correct_errors_columns.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0017_add_galaxy_utility_columns_to_repository_metadata_table.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0018_add_repository_metadata_flag_columns.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0019_add_skip_tool_test_table_and_test_install_error_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0020_add_repository_type_column.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0021_change_repository_type_value.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0022_add_repository_admin_roles.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0024_password_reset.py
    M lib/galaxy/webapps/tool_shed/model/migrate/versions/0025_session_timeout.py
    M lib/galaxy/workflow/modules.py
    M lib/galaxy_ext/metadata/set_metadata.py
    M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
    M run.sh
    M run_tests.sh
    M scripts/api/copy_hda_to_library_folder.py
    M scripts/api/library_upload_dir.py
    M scripts/api/workflow_import.py
    M scripts/cleanup_datasets/admin_cleanup_datasets.py
    M scripts/cleanup_datasets/cleanup_datasets.py
    M scripts/cleanup_datasets/populate_uuid.py
    M scripts/cleanup_datasets/remove_renamed_datasets_from_disk.py
    M scripts/cleanup_datasets/rename_purged_datasets.py
    M scripts/cleanup_datasets/update_dataset_size.py
    M scripts/cleanup_datasets/update_metadata.py
    M scripts/db_shell.py
    M scripts/extract_toolbox_sections.py
    M scripts/get_platforms.py
    M scripts/helper.py
    M scripts/loc_files/create_all_fasta_loc.py
    M scripts/manage_tools.py
    M scripts/metagenomics/convert_title.py
    M scripts/microbes/BeautifulSoup.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/migrate_tools/migrate_tools.py
    M scripts/others/incorrect_gops_jobs.py
    M scripts/others/incorrect_gops_join_jobs.py
    M scripts/set_dataset_sizes.py
    M scripts/set_user_disk_usage.py
    M scripts/slideshow/build_slideshow.py
    M scripts/tool_shed/api/add_repository_registry_entry.py
    M scripts/tool_shed/api/common.py
    M scripts/tool_shed/api/create_categories.py
    M scripts/tool_shed/api/create_users.py
    M scripts/tool_shed/api/export.py
    M scripts/tool_shed/api/get_filtered_repository_revisions.py
    M scripts/tool_shed/api/remove_repository_registry_entry.py
    M scripts/tool_shed/api/reset_metadata_on_repositories.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/build_ts_whoosh_index.py
    M scripts/tool_shed/check_download_urls.py
    M scripts/tool_shed/check_filesystem_for_empty_tool_dependency_installation_paths.py
    M scripts/tool_shed/check_s3_for_empty_tool_dependency_installation_paths.py
    M scripts/tool_shed/clean_up_tool_dependency_directory.py
    M scripts/tool_shed/deprecate_repositories_without_metadata.py
    M scripts/tool_shed/migrate_tools_to_repositories.py
    M scripts/tool_shed/show_tool_dependency_installation_dir_contents.py
    M scripts/tools/maf/check_loc_file.py
    M scripts/update_shed_config_path.py
    M setup.cfg
    M static/maps/layout/router.js.map
    M static/maps/mvc/dataset/dataset-edit-attributes.js.map
    M static/maps/mvc/dataset/dataset-li-edit.js.map
    M static/maps/mvc/dataset/dataset-model.js.map
    M static/maps/mvc/form/form-parameters.js.map
    M static/maps/mvc/form/form-view.js.map
    A static/maps/mvc/lazy/lazy-limited.js.map
    M static/maps/mvc/ui/ui-select-default.js.map
    M static/maps/mvc/upload/collection/collection-view.js.map
    M static/maps/mvc/upload/composite/composite-view.js.map
    M static/maps/mvc/upload/default/default-row.js.map
    M static/maps/mvc/upload/default/default-view.js.map
    A static/maps/mvc/upload/upload-extension.js.map
    M static/maps/mvc/upload/upload-ftp.js.map
    M static/maps/mvc/upload/upload-view.js.map
    M static/maps/utils/uploadbox.js.map
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.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/layout/router.js
    M static/scripts/mvc/dataset/dataset-edit-attributes.js
    M static/scripts/mvc/dataset/dataset-li-edit.js
    M static/scripts/mvc/dataset/dataset-model.js
    M static/scripts/mvc/form/form-parameters.js
    M static/scripts/mvc/form/form-view.js
    A static/scripts/mvc/lazy/lazy-limited.js
    M static/scripts/mvc/ui/ui-select-default.js
    M static/scripts/mvc/upload/collection/collection-view.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
    A static/scripts/mvc/upload/upload-extension.js
    M static/scripts/mvc/upload/upload-ftp.js
    M static/scripts/mvc/upload/upload-view.js
    M static/scripts/utils/uploadbox.js
    M static/style/blue/base.css
    M templates/sharing_base.mako
    M templates/show_params.mako
    M test/api/test_tools_upload.py
    M test/base/populators.py
    A test/galaxy_selenium/components.py
    M test/galaxy_selenium/data.py
    M test/galaxy_selenium/has_driver.py
    M test/galaxy_selenium/navigates_galaxy.py
    M test/galaxy_selenium/navigation.yml
    A test/galaxy_selenium/smart_components.py
    M test/integration/test_upload_configuration_options.py
    M test/qunit/tests/upload_dialog_tests.js
    M test/selenium_tests/framework.py
    M test/selenium_tests/test_anon_history.py
    M test/selenium_tests/test_custom_builds.py
    M test/selenium_tests/test_history_dataset_state.py
    M test/selenium_tests/test_history_options.py
    M test/selenium_tests/test_history_panel.py
    M test/selenium_tests/test_history_sharing.py
    M test/selenium_tests/test_library_contents.py
    M test/selenium_tests/test_published_histories_grid.py
    M test/selenium_tests/test_registration.py
    M test/selenium_tests/test_saved_histories.py
    M test/unit/managers/test_CollectionManager.py
    M test/unit/managers/test_HistoryContentsManager.py
    M test/unit/managers/test_HistoryManager.py
    M test/unit/unittest_utils/galaxy_mock.py
    M test/unit/visualizations/plugins/test_VisualizationsRegistry.py
    M tools/data_source/fetch.py
    M tools/data_source/genbank.py
    M tools/data_source/import.py
    M tools/data_source/microbial_import.py
    M tools/filters/bed_to_gff_converter.py
    M tools/filters/gtf_to_bedgraph_converter.py
    M tools/filters/ucsc_gene_bed_to_exon_bed.py
    M tools/filters/ucsc_gene_bed_to_exon_bed.xml
    M tools/filters/ucsc_gene_bed_to_intron_bed.py
    M tools/filters/ucsc_gene_table_to_intervals.py
    M tools/metag_tools/shrimp_wrapper.py
    M tools/sr_assembly/velvetg_wrapper.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: 6c7efc284201aed56c1d8383cb596e8ab0001b83
      https://github.com/galaxyproject/galaxy/commit/6c7efc284201aed56c1d8383cb596...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Display uninstall form in center panel, remove redirect


  Commit: 8f2db7f3177cd5d499473b3228085f41f136d52b
      https://github.com/galaxyproject/galaxy/commit/8f2db7f3177cd5d499473b3228085...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Redirect operations to manage repository instead of grid


  Commit: 3f5b3f1f734dd83e09aff23ce5170ac358444ed9
      https://github.com/galaxyproject/galaxy/commit/3f5b3f1f734dd83e09aff23ce5170...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Remove redirects for repository revision installation


  Commit: 3811278d97c3d9469824e2f7e250a10fda5a8082
      https://github.com/galaxyproject/galaxy/commit/3811278d97c3d9469824e2f7e250a...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Show activation mako in center panel


  Commit: 145a7bd75782d117b1577dc5b9530fae4ae7cc49
      https://github.com/galaxyproject/galaxy/commit/145a7bd75782d117b1577dc5b9530...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Replace remaining redirects from makos in iframes with error messages


  Commit: 50322cedb9ea51a7d5765278b37db778a6287847
      https://github.com/galaxyproject/galaxy/commit/50322cedb9ea51a7d5765278b37db...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Fix a redirect to success message


  Commit: 5c8ca35ba6d874bae565aeb42edc124469d25d2d
      https://github.com/galaxyproject/galaxy/commit/5c8ca35ba6d874bae565aeb42edc1...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Show error message when installing latest revision fails


  Commit: 368a86b50303044ab999320d56934870f0df45ba
      https://github.com/galaxyproject/galaxy/commit/368a86b50303044ab999320d56934...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    R templates/admin/tool_shed_repository/repair_repository.mako
    M templates/admin/tool_shed_repository/repository_actions_menu.mako

  Log Message:
  -----------
  Remove deprecated repair repository feature


  Commit: c161d51423154a23058f60ef9436cfef20120bd5
      https://github.com/galaxyproject/galaxy/commit/c161d51423154a23058f60ef9436c...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Remove unused status parameter


  Commit: 34b07b807b1ff8464a314ed6ed3e52cd0aa1e1d0
      https://github.com/galaxyproject/galaxy/commit/34b07b807b1ff8464a314ed6ed3e5...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

  Log Message:
  -----------
  Remove unused message parameter


  Commit: 3c5fc3fc424cd2470ebe435b216d2090b3196305
      https://github.com/galaxyproject/galaxy/commit/3c5fc3fc424cd2470ebe435b216d2...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Use message mako to display purging success message


  Commit: f191a1ef44b06140f7c0d106669e77749b069fe1
      https://github.com/galaxyproject/galaxy/commit/f191a1ef44b06140f7c0d106669e7...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

  Log Message:
  -----------
  Remove debug statement


  Commit: eec678ca7c1bf9c4c7515c7ef9f0453cffec2230
      https://github.com/galaxyproject/galaxy/commit/eec678ca7c1bf9c4c7515c7ef9f04...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M test/shed_functional/base/twilltestcase.py
    M test/shed_functional/functional/test_1430_repair_installed_repository.py

  Log Message:
  -----------
  Remove repair tests


  Commit: 098059c619909b049f9571d38afe582dbb602f7f
      https://github.com/galaxyproject/galaxy/commit/098059c619909b049f9571d38afe5...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M test/shed_functional/base/twilltestcase.py

  Log Message:
  -----------
  Remove message test


  Commit: bc9b0253eeaa779cb819f55aa9443407b10f96a7
      https://github.com/galaxyproject/galaxy/commit/bc9b0253eeaa779cb819f55aa9443...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M .ci/flake8_lint_include_list.txt
    R .ci/flake8_py3_wrapper.sh
    M .ci/py3_sources.txt
    M .gitignore
    M Makefile
    A client/.babelrc
    M client/GruntFile.js
    M client/README.md
    M client/bower.json
    M client/galaxy/scripts/apps/panels/history-panel.js
    R client/galaxy/scripts/libs/backbone.js
    R client/galaxy/scripts/libs/bibtex.js
    R client/galaxy/scripts/libs/d3.js
    R client/galaxy/scripts/libs/jquery.complexify.js
    R client/galaxy/scripts/libs/jquery/jquery.cookie.js
    R client/galaxy/scripts/libs/jquery/jquery.js
    R client/galaxy/scripts/libs/jquery/jquery.migrate.js
    R client/galaxy/scripts/libs/jquery/jquery.mousewheel.js
    R client/galaxy/scripts/libs/raven.js
    R client/galaxy/scripts/libs/require.js
    R client/galaxy/scripts/libs/underscore.js
    M client/galaxy/scripts/mvc/citation/citation-model.js
    M client/galaxy/scripts/mvc/collection/base-creator.js
    M client/galaxy/scripts/mvc/history/multi-panel.js
    M client/galaxy/scripts/mvc/tool/tool-form.js
    M client/galaxy/scripts/mvc/tours.js
    M client/galaxy/scripts/mvc/ui/ui-modal.js
    M client/galaxy/scripts/mvc/upload/upload-view.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-view.js
    M client/galaxy/scripts/utils/config.js
    M client/galaxy/scripts/viz/trackster/tracks.js
    M client/grunt-tasks/install-libs.js
    M client/grunt-tasks/style.js
    R client/grunt-tasks/webpack.js
    A client/gulpfile.js
    R client/package-lock.json
    M client/package.json
    M client/webpack.config.js
    A client/yarn.lock
    M config/plugins/visualizations/charts/static/repository/build/registry.js
    M config/plugins/visualizations/charts/static/repository/build/registry.js.map
    M config/plugins/visualizations/charts/webpack.config.js
    M lib/galaxy/jobs/__init__.py
    M lib/galaxy/managers/collections.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/security/__init__.py
    M lib/galaxy/tools/parameters/dynamic_options.py
    M lib/galaxy/util/__init__.py
    M lib/galaxy/util/jstree.py
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/webapps/galaxy/api/library_datasets.py
    M lib/galaxy/webapps/galaxy/buildapp.py
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/galaxy/webapps/galaxy/controllers/forms.py
    M lib/galaxy/webapps/galaxy/controllers/history.py
    M lib/galaxy/webapps/galaxy/controllers/library_common.py
    M lib/galaxy/webapps/reports/controllers/tools.py
    M lib/galaxy/webapps/tool_shed/config.py
    M lib/galaxy/webapps/tool_shed/model/__init__.py
    M lib/galaxy/webapps/tool_shed/search/repo_search.py
    M lib/mimeparse.py
    M scripts/microbes/BeautifulSoup.py
    M scripts/microbes/harvest_bacteria.py
    M scripts/tool_shed/api/common.py
    M scripts/tool_shed/build_ts_whoosh_index.py
    M scripts/tool_shed/deprecate_repositories_without_metadata.py
    M static/maps/admin.toolshed.js.map
    M static/maps/galaxy.interactive_environments.js.map
    M static/maps/galaxy.js.map
    M static/maps/galaxy.library.js.map
    M static/maps/galaxy.pages.js.map
    M static/maps/i18n.js.map
    M static/maps/layout/generic-nav-view.js.map
    M static/maps/layout/masthead.js.map
    M static/maps/layout/menu.js.map
    M static/maps/layout/modal.js.map
    M static/maps/layout/page.js.map
    M static/maps/layout/panel.js.map
    M static/maps/layout/router.js.map
    M static/maps/layout/scratchbook.js.map
    M static/maps/libs/backbone.js.map
    M static/maps/libs/bbi/bigwig.js.map
    M static/maps/libs/bbi/jquery-ajax-native.js.map
    M static/maps/libs/bbi/jszlib.js.map
    M static/maps/libs/bbi/spans.js.map
    M static/maps/libs/bibtex.js.map
    M static/maps/libs/bootstrap-tour.js.map
    M static/maps/libs/bootstrap.js.map
    M static/maps/libs/d3.js.map
    M static/maps/libs/farbtastic.js.map
    M static/maps/libs/jquery.complexify.js.map
    M static/maps/libs/jquery.sparklines.js.map
    R static/maps/libs/jquery/jqtouch.js.map
    M static/maps/libs/jquery/jquery-ui.js.map
    M static/maps/libs/jquery/jquery.autocomplete.js.map
    M static/maps/libs/jquery/jquery.cookie.js.map
    M static/maps/libs/jquery/jquery.dynatree.js.map
    M static/maps/libs/jquery/jquery.event.drag.js.map
    M static/maps/libs/jquery/jquery.event.drop.js.map
    M static/maps/libs/jquery/jquery.event.hover.js.map
    M static/maps/libs/jquery/jquery.form.js.map
    M static/maps/libs/jquery/jquery.js.map
    M static/maps/libs/jquery/jquery.migrate.js.map
    M static/maps/libs/jquery/jquery.mousewheel.js.map
    M static/maps/libs/jquery/jquery.rating.js.map
    M static/maps/libs/jquery/jquery.wymeditor.js.map
    M static/maps/libs/jquery/jstorage.js.map
    M static/maps/libs/jquery/jstree.js.map
    M static/maps/libs/jquery/select2.js.map
    M static/maps/libs/raven.js.map
    M static/maps/libs/require.js.map
    M static/maps/libs/toastr.js.map
    M static/maps/libs/underscore.js.map
    M static/maps/mvc/annotation.js.map
    M static/maps/mvc/base-mvc.js.map
    M static/maps/mvc/base/controlled-fetch-collection.js.map
    M static/maps/mvc/citation/citation-model.js.map
    M static/maps/mvc/citation/citation-view.js.map
    M static/maps/mvc/collection/base-creator.js.map
    M static/maps/mvc/collection/collection-li-edit.js.map
    M static/maps/mvc/collection/collection-li.js.map
    M static/maps/mvc/collection/collection-model.js.map
    M static/maps/mvc/collection/collection-view-edit.js.map
    M static/maps/mvc/collection/collection-view.js.map
    M static/maps/mvc/collection/list-collection-creator.js.map
    M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
    M static/maps/mvc/collection/pair-collection-creator.js.map
    M static/maps/mvc/dataset/data.js.map
    M static/maps/mvc/dataset/dataset-choice.js.map
    M static/maps/mvc/dataset/dataset-edit-attributes.js.map
    M static/maps/mvc/dataset/dataset-error.js.map
    M static/maps/mvc/dataset/dataset-li-edit.js.map
    M static/maps/mvc/dataset/dataset-li.js.map
    M static/maps/mvc/dataset/dataset-list.js.map
    M static/maps/mvc/dataset/dataset-model.js.map
    M static/maps/mvc/dataset/states.js.map
    M static/maps/mvc/form/form-data.js.map
    M static/maps/mvc/form/form-input.js.map
    M static/maps/mvc/form/form-parameters.js.map
    M static/maps/mvc/form/form-repeat.js.map
    M static/maps/mvc/form/form-section.js.map
    M static/maps/mvc/form/form-view.js.map
    M static/maps/mvc/form/form-wrapper.js.map
    M static/maps/mvc/grid/grid-model.js.map
    M static/maps/mvc/grid/grid-shared.js.map
    M static/maps/mvc/grid/grid-template.js.map
    M static/maps/mvc/grid/grid-view.js.map
    M static/maps/mvc/history/copy-dialog.js.map
    M static/maps/mvc/history/hda-li-edit.js.map
    M static/maps/mvc/history/hda-li.js.map
    M static/maps/mvc/history/hda-model.js.map
    M static/maps/mvc/history/hdca-li-edit.js.map
    M static/maps/mvc/history/hdca-li.js.map
    M static/maps/mvc/history/hdca-model.js.map
    M static/maps/mvc/history/history-content-model.js.map
    M static/maps/mvc/history/history-contents.js.map
    M static/maps/mvc/history/history-list.js.map
    M static/maps/mvc/history/history-model.js.map
    M static/maps/mvc/history/history-preferences.js.map
    M static/maps/mvc/history/history-structure-view.js.map
    M static/maps/mvc/history/history-view-annotated.js.map
    M static/maps/mvc/history/history-view-edit-current.js.map
    M static/maps/mvc/history/history-view-edit.js.map
    M static/maps/mvc/history/history-view.js.map
    M static/maps/mvc/history/job-dag.js.map
    M static/maps/mvc/history/multi-panel.js.map
    M static/maps/mvc/history/options-menu.js.map
    M static/maps/mvc/job/job-li.js.map
    M static/maps/mvc/job/job-model.js.map
    M static/maps/mvc/job/job-params.js.map
    M static/maps/mvc/lazy/lazy-limited.js.map
    M static/maps/mvc/library/library-dataset-view.js.map
    M static/maps/mvc/library/library-folder-view.js.map
    M static/maps/mvc/library/library-folderlist-view.js.map
    M static/maps/mvc/library/library-folderrow-view.js.map
    M static/maps/mvc/library/library-foldertoolbar-view.js.map
    M static/maps/mvc/library/library-library-view.js.map
    M static/maps/mvc/library/library-librarylist-view.js.map
    M static/maps/mvc/library/library-libraryrow-view.js.map
    M static/maps/mvc/library/library-librarytoolbar-view.js.map
    M static/maps/mvc/library/library-model.js.map
    M static/maps/mvc/list/list-item.js.map
    M static/maps/mvc/list/list-view.js.map
    A static/maps/mvc/page/page-list.js.map
    M static/maps/mvc/tag.js.map
    M static/maps/mvc/tool/tool-form-base.js.map
    M static/maps/mvc/tool/tool-form-composite.js.map
    M static/maps/mvc/tool/tool-form.js.map
    M static/maps/mvc/tool/tool-genomespace.js.map
    M static/maps/mvc/tool/tools.js.map
    M static/maps/mvc/toolshed/categories-view.js.map
    M static/maps/mvc/toolshed/repo-queue-view.js.map
    M static/maps/mvc/toolshed/repo-status-view.js.map
    M static/maps/mvc/toolshed/repositories-view.js.map
    M static/maps/mvc/toolshed/repository-queue-view.js.map
    M static/maps/mvc/toolshed/repository-view.js.map
    M static/maps/mvc/toolshed/shed-list-view.js.map
    M static/maps/mvc/toolshed/toolshed-model.js.map
    M static/maps/mvc/toolshed/util.js.map
    M static/maps/mvc/toolshed/workflows-view.js.map
    M static/maps/mvc/tours.js.map
    M static/maps/mvc/ui/error-modal.js.map
    M static/maps/mvc/ui/icon-button.js.map
    M static/maps/mvc/ui/popup-menu.js.map
    M static/maps/mvc/ui/ui-buttons.js.map
    M static/maps/mvc/ui/ui-color-picker.js.map
    M static/maps/mvc/ui/ui-drilldown.js.map
    M static/maps/mvc/ui/ui-frames.js.map
    M static/maps/mvc/ui/ui-list.js.map
    M static/maps/mvc/ui/ui-misc.js.map
    M static/maps/mvc/ui/ui-modal.js.map
    M static/maps/mvc/ui/ui-options.js.map
    M static/maps/mvc/ui/ui-popover.js.map
    M static/maps/mvc/ui/ui-portlet.js.map
    M static/maps/mvc/ui/ui-select-content.js.map
    M static/maps/mvc/ui/ui-select-default.js.map
    M static/maps/mvc/ui/ui-select-ftp.js.map
    M static/maps/mvc/ui/ui-select-genomespace.js.map
    M static/maps/mvc/ui/ui-select-library.js.map
    M static/maps/mvc/ui/ui-select.js.map
    M static/maps/mvc/ui/ui-slider.js.map
    M static/maps/mvc/ui/ui-table.js.map
    M static/maps/mvc/ui/ui-tabs.js.map
    M static/maps/mvc/ui/ui-thumbnails.js.map
    M static/maps/mvc/upload/collection/collection-row.js.map
    M static/maps/mvc/upload/collection/collection-view.js.map
    M static/maps/mvc/upload/composite/composite-row.js.map
    M static/maps/mvc/upload/composite/composite-view.js.map
    M static/maps/mvc/upload/default/default-row.js.map
    M static/maps/mvc/upload/default/default-view.js.map
    M static/maps/mvc/upload/upload-button.js.map
    M static/maps/mvc/upload/upload-extension.js.map
    M static/maps/mvc/upload/upload-ftp.js.map
    M static/maps/mvc/upload/upload-model.js.map
    M static/maps/mvc/upload/upload-settings.js.map
    M static/maps/mvc/upload/upload-view.js.map
    M static/maps/mvc/user/user-custom-builds.js.map
    M static/maps/mvc/user/user-model.js.map
    M static/maps/mvc/user/user-preferences.js.map
    M static/maps/mvc/user/user-quotameter.js.map
    M static/maps/mvc/visualization/visualization-model.js.map
    M static/maps/mvc/webhooks.js.map
    M static/maps/mvc/workflow/workflow-canvas.js.map
    M static/maps/mvc/workflow/workflow-configure-menu.js.map
    M static/maps/mvc/workflow/workflow-connector.js.map
    M static/maps/mvc/workflow/workflow-forms.js.map
    M static/maps/mvc/workflow/workflow-icons.js.map
    M static/maps/mvc/workflow/workflow-manager.js.map
    M static/maps/mvc/workflow/workflow-model.js.map
    M static/maps/mvc/workflow/workflow-node.js.map
    M static/maps/mvc/workflow/workflow-terminals.js.map
    M static/maps/mvc/workflow/workflow-view-data.js.map
    M static/maps/mvc/workflow/workflow-view-node.js.map
    M static/maps/mvc/workflow/workflow-view-terminals.js.map
    M static/maps/mvc/workflow/workflow-view.js.map
    M static/maps/mvc/workflow/workflow.js.map
    M static/maps/nls/de/locale.js.map
    M static/maps/nls/es/locale.js.map
    M static/maps/nls/fr/locale.js.map
    M static/maps/nls/ja/locale.js.map
    M static/maps/nls/locale.js.map
    M static/maps/nls/zh/locale.js.map
    M static/maps/onload.js.map
    M static/maps/polyfills.js.map
    M static/maps/reports_webapp/run_stats.js.map
    M static/maps/ui/autocom_tagging.js.map
    M static/maps/ui/editable-text.js.map
    M static/maps/ui/fa-icon-button.js.map
    M static/maps/ui/filter-control.js.map
    M static/maps/ui/hoverhighlight.js.map
    M static/maps/ui/loading-indicator.js.map
    M static/maps/ui/mode-button.js.map
    M static/maps/ui/pagination.js.map
    M static/maps/ui/peek-column-selector.js.map
    M static/maps/ui/popupmenu.js.map
    M static/maps/ui/scroll-panel.js.map
    M static/maps/ui/search-input.js.map
    M static/maps/utils/add-logging.js.map
    M static/maps/utils/ajax-queue.js.map
    M static/maps/utils/async-save-text.js.map
    M static/maps/utils/config.js.map
    M static/maps/utils/deferred.js.map
    M static/maps/utils/graph.js.map
    M static/maps/utils/levenshtein.js.map
    M static/maps/utils/localization.js.map
    M static/maps/utils/metrics-logger.js.map
    M static/maps/utils/natural-sort.js.map
    M static/maps/utils/query-string-parsing.js.map
    M static/maps/utils/uploadbox.js.map
    M static/maps/utils/utils.js.map
    M static/maps/viz/bbi-data-manager.js.map
    M static/maps/viz/circster.js.map
    M static/maps/viz/phyloviz.js.map
    M static/maps/viz/sweepster.js.map
    M static/maps/viz/trackster.js.map
    M static/maps/viz/trackster/filters.js.map
    M static/maps/viz/trackster/painters.js.map
    M static/maps/viz/trackster/slotting.js.map
    M static/maps/viz/trackster/tracks.js.map
    M static/maps/viz/trackster/util.js.map
    M static/maps/viz/visualization.js.map
    M static/maps/viz/viz_views.js.map
    M static/scripts/admin.toolshed.js
    R static/scripts/analysis.js
    R static/scripts/app.js
    R static/scripts/app/analysis.js
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.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
    M static/scripts/bundled/login.bundled.js.map
    M static/scripts/galaxy.interactive_environments.js
    M static/scripts/galaxy.js
    M static/scripts/galaxy.library.js
    R static/scripts/galaxy.menu.js
    M static/scripts/galaxy.pages.js
    M static/scripts/i18n.js
    M static/scripts/layout/generic-nav-view.js
    M static/scripts/layout/masthead.js
    M static/scripts/layout/menu.js
    M static/scripts/layout/modal.js
    M static/scripts/layout/page.js
    M static/scripts/layout/panel.js
    M static/scripts/layout/router.js
    M static/scripts/layout/scratchbook.js
    M static/scripts/libs/backbone.js
    M static/scripts/libs/bbi/bigwig.js
    M static/scripts/libs/bbi/jquery-ajax-native.js
    M static/scripts/libs/bbi/jszlib.js
    M static/scripts/libs/bbi/spans.js
    M static/scripts/libs/bibtex.js
    M static/scripts/libs/bootstrap-tour.js
    M static/scripts/libs/bootstrap.js
    R static/scripts/libs/common-libs.js
    M static/scripts/libs/d3.js
    M static/scripts/libs/farbtastic.js
    R static/scripts/libs/jquery.complexify.js
    M static/scripts/libs/jquery.sparklines.js
    R static/scripts/libs/jquery/jqtouch.js
    M static/scripts/libs/jquery/jquery-ui.js
    M static/scripts/libs/jquery/jquery.autocomplete.js
    A static/scripts/libs/jquery/jquery.complexify.js
    M static/scripts/libs/jquery/jquery.cookie.js
    M static/scripts/libs/jquery/jquery.dynatree.js
    M static/scripts/libs/jquery/jquery.event.drag.js
    M static/scripts/libs/jquery/jquery.event.drop.js
    M static/scripts/libs/jquery/jquery.event.hover.js
    M static/scripts/libs/jquery/jquery.form.js
    M static/scripts/libs/jquery/jquery.js
    M static/scripts/libs/jquery/jquery.migrate.js
    M static/scripts/libs/jquery/jquery.mousewheel.js
    M static/scripts/libs/jquery/jquery.rating.js
    M static/scripts/libs/jquery/jquery.wymeditor.js
    M static/scripts/libs/jquery/jstorage.js
    M static/scripts/libs/jquery/jstree.js
    M static/scripts/libs/jquery/select2.js
    M static/scripts/libs/raven.js
    M static/scripts/libs/require.js
    R static/scripts/libs/showdown.js
    M static/scripts/libs/toastr.js
    M static/scripts/libs/underscore.js
    M static/scripts/mvc/annotation.js
    M static/scripts/mvc/base-mvc.js
    M static/scripts/mvc/base/controlled-fetch-collection.js
    M static/scripts/mvc/citation/citation-model.js
    M static/scripts/mvc/citation/citation-view.js
    M static/scripts/mvc/collection/base-creator.js
    M static/scripts/mvc/collection/collection-li-edit.js
    M static/scripts/mvc/collection/collection-li.js
    M static/scripts/mvc/collection/collection-model.js
    M static/scripts/mvc/collection/collection-view-edit.js
    M static/scripts/mvc/collection/collection-view.js
    M static/scripts/mvc/collection/list-collection-creator.js
    M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
    M static/scripts/mvc/collection/pair-collection-creator.js
    M static/scripts/mvc/dataset/data.js
    M static/scripts/mvc/dataset/dataset-choice.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/dataset/dataset-list.js
    M static/scripts/mvc/dataset/dataset-model.js
    M static/scripts/mvc/dataset/states.js
    M static/scripts/mvc/form/form-data.js
    M static/scripts/mvc/form/form-input.js
    M static/scripts/mvc/form/form-parameters.js
    M static/scripts/mvc/form/form-repeat.js
    M static/scripts/mvc/form/form-section.js
    M static/scripts/mvc/form/form-view.js
    M static/scripts/mvc/form/form-wrapper.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/copy-dialog.js
    M static/scripts/mvc/history/hda-li-edit.js
    M static/scripts/mvc/history/hda-li.js
    M static/scripts/mvc/history/hda-model.js
    M static/scripts/mvc/history/hdca-li-edit.js
    M static/scripts/mvc/history/hdca-li.js
    M static/scripts/mvc/history/hdca-model.js
    M static/scripts/mvc/history/history-content-model.js
    M static/scripts/mvc/history/history-contents.js
    M static/scripts/mvc/history/history-list.js
    M static/scripts/mvc/history/history-model.js
    M static/scripts/mvc/history/history-preferences.js
    M static/scripts/mvc/history/history-structure-view.js
    M static/scripts/mvc/history/history-view-annotated.js
    M static/scripts/mvc/history/history-view-edit-current.js
    M static/scripts/mvc/history/history-view-edit.js
    M static/scripts/mvc/history/history-view.js
    M static/scripts/mvc/history/job-dag.js
    M static/scripts/mvc/history/multi-panel.js
    M static/scripts/mvc/history/options-menu.js
    M static/scripts/mvc/job/job-li.js
    M static/scripts/mvc/job/job-model.js
    M static/scripts/mvc/job/job-params.js
    M static/scripts/mvc/lazy/lazy-limited.js
    M static/scripts/mvc/library/library-dataset-view.js
    M static/scripts/mvc/library/library-folder-view.js
    M static/scripts/mvc/library/library-folderlist-view.js
    M static/scripts/mvc/library/library-folderrow-view.js
    M static/scripts/mvc/library/library-foldertoolbar-view.js
    M static/scripts/mvc/library/library-library-view.js
    M static/scripts/mvc/library/library-librarylist-view.js
    M static/scripts/mvc/library/library-libraryrow-view.js
    M static/scripts/mvc/library/library-librarytoolbar-view.js
    M static/scripts/mvc/library/library-model.js
    M static/scripts/mvc/list/list-item.js
    M static/scripts/mvc/list/list-view.js
    M static/scripts/mvc/tag.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/tool/tool-genomespace.js
    R static/scripts/mvc/tool/tool-template.js
    R static/scripts/mvc/tool/tool-webhooks.js
    M static/scripts/mvc/tool/tools.js
    M static/scripts/mvc/toolshed/categories-view.js
    M static/scripts/mvc/toolshed/repo-queue-view.js
    M static/scripts/mvc/toolshed/repo-status-view.js
    M static/scripts/mvc/toolshed/repositories-view.js
    M static/scripts/mvc/toolshed/repository-queue-view.js
    M static/scripts/mvc/toolshed/repository-view.js
    R static/scripts/mvc/toolshed/shed-category-view.js
    M static/scripts/mvc/toolshed/shed-list-view.js
    R static/scripts/mvc/toolshed/shed-repo-details-view.js
    R static/scripts/mvc/toolshed/shed-repo-list-view.js
    R static/scripts/mvc/toolshed/sheds-list-view.js
    M static/scripts/mvc/toolshed/toolshed-model.js
    M static/scripts/mvc/toolshed/util.js
    M static/scripts/mvc/toolshed/workflows-view.js
    M static/scripts/mvc/tours.js
    M static/scripts/mvc/ui/error-modal.js
    M static/scripts/mvc/ui/icon-button.js
    M static/scripts/mvc/ui/popup-menu.js
    M static/scripts/mvc/ui/ui-buttons.js
    M static/scripts/mvc/ui/ui-color-picker.js
    M static/scripts/mvc/ui/ui-drilldown.js
    M static/scripts/mvc/ui/ui-frames.js
    M static/scripts/mvc/ui/ui-list.js
    M static/scripts/mvc/ui/ui-misc.js
    M static/scripts/mvc/ui/ui-modal.js
    M static/scripts/mvc/ui/ui-options.js
    M static/scripts/mvc/ui/ui-popover.js
    M static/scripts/mvc/ui/ui-portlet.js
    M static/scripts/mvc/ui/ui-select-content.js
    M static/scripts/mvc/ui/ui-select-default.js
    M static/scripts/mvc/ui/ui-select-ftp.js
    M static/scripts/mvc/ui/ui-select-genomespace.js
    M static/scripts/mvc/ui/ui-select-library.js
    M static/scripts/mvc/ui/ui-select.js
    M static/scripts/mvc/ui/ui-slider.js
    M static/scripts/mvc/ui/ui-table.js
    M static/scripts/mvc/ui/ui-tabs.js
    M static/scripts/mvc/ui/ui-thumbnails.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-extension.js
    M static/scripts/mvc/upload/upload-ftp.js
    M static/scripts/mvc/upload/upload-model.js
    M static/scripts/mvc/upload/upload-settings.js
    M static/scripts/mvc/upload/upload-view.js
    R static/scripts/mvc/user/change-password.js
    R static/scripts/mvc/user/extra-information.js
    R static/scripts/mvc/user/manage-user-information.js
    M static/scripts/mvc/user/user-custom-builds.js
    M static/scripts/mvc/user/user-model.js
    M static/scripts/mvc/user/user-preferences.js
    M static/scripts/mvc/user/user-quotameter.js
    M static/scripts/mvc/visualization/visualization-model.js
    M static/scripts/mvc/webhooks.js
    M static/scripts/mvc/workflow/workflow-canvas.js
    R static/scripts/mvc/workflow/workflow-configure-menu.js
    M static/scripts/mvc/workflow/workflow-connector.js
    M static/scripts/mvc/workflow/workflow-forms.js
    M static/scripts/mvc/workflow/workflow-icons.js
    M static/scripts/mvc/workflow/workflow-manager.js
    M static/scripts/mvc/workflow/workflow-model.js
    M static/scripts/mvc/workflow/workflow-node.js
    M static/scripts/mvc/workflow/workflow-terminals.js
    M static/scripts/mvc/workflow/workflow-view-data.js
    M static/scripts/mvc/workflow/workflow-view-node.js
    M static/scripts/mvc/workflow/workflow-view-terminals.js
    M static/scripts/mvc/workflow/workflow-view.js
    M static/scripts/mvc/workflow/workflow.js
    M static/scripts/nls/de/locale.js
    M static/scripts/nls/es/locale.js
    M static/scripts/nls/fr/locale.js
    M static/scripts/nls/ja/locale.js
    M static/scripts/nls/locale.js
    M static/scripts/nls/zh/locale.js
    M static/scripts/onload.js
    R static/scripts/packed
    M static/scripts/polyfills.js
    M static/scripts/reports_webapp/run_stats.js
    M static/scripts/ui/autocom_tagging.js
    M static/scripts/ui/editable-text.js
    M static/scripts/ui/fa-icon-button.js
    M static/scripts/ui/filter-control.js
    M static/scripts/ui/hoverhighlight.js
    M static/scripts/ui/loading-indicator.js
    M static/scripts/ui/mode-button.js
    M static/scripts/ui/pagination.js
    M static/scripts/ui/peek-column-selector.js
    M static/scripts/ui/popupmenu.js
    M static/scripts/ui/scroll-panel.js
    M static/scripts/ui/search-input.js
    M static/scripts/utils/add-logging.js
    M static/scripts/utils/ajax-queue.js
    M static/scripts/utils/async-save-text.js
    M static/scripts/utils/config.js
    M static/scripts/utils/deferred.js
    M static/scripts/utils/graph.js
    M static/scripts/utils/levenshtein.js
    M static/scripts/utils/localization.js
    M static/scripts/utils/metrics-logger.js
    M static/scripts/utils/natural-sort.js
    M static/scripts/utils/query-string-parsing.js
    M static/scripts/utils/uploadbox.js
    M static/scripts/utils/utils.js
    M static/scripts/viz/bbi-data-manager.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/painters.js
    M static/scripts/viz/trackster/slotting.js
    M static/scripts/viz/trackster/tracks.js
    M static/scripts/viz/trackster/util.js
    M static/scripts/viz/visualization.js
    M static/scripts/viz/viz_views.js
    M templates/base.mako
    M templates/base/base_panels.mako
    M templates/display_base.mako
    M templates/js-app.mako
    M templates/webapps/galaxy/galaxy.panels.mako
    A test/functional/tools/empty_datasets.xml
    M test/functional/tools/samples_tool_conf.xml
    M test/qunit/test-common.js
    R test/qunit/test-libs/sinon-1.17.3.js
    A test/qunit/test-libs/sinon-1.17.7.js
    M tox.ini

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: 0167e41ac1fd95ce7d5d026d7618cb3b127f5db6
      https://github.com/galaxyproject/galaxy/commit/0167e41ac1fd95ce7d5d026d7618c...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/admin.toolshed.js
    M client/galaxy/scripts/apps/admin.js
    M client/galaxy/scripts/apps/analysis.js
    M client/galaxy/scripts/apps/login.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
    M client/galaxy/scripts/galaxy.interactive_environments.js
    M client/galaxy/scripts/galaxy.js
    M client/galaxy/scripts/galaxy.library.js
    M client/galaxy/scripts/galaxy.pages.js
    M client/galaxy/scripts/i18n.js
    M client/galaxy/scripts/layout/generic-nav-view.js
    M client/galaxy/scripts/layout/masthead.js
    M client/galaxy/scripts/layout/menu.js
    M client/galaxy/scripts/layout/modal.js
    M client/galaxy/scripts/layout/page.js
    M client/galaxy/scripts/layout/panel.js
    M client/galaxy/scripts/layout/router.js
    M client/galaxy/scripts/layout/scratchbook.js
    M client/galaxy/scripts/mvc/annotation.js
    M client/galaxy/scripts/mvc/base-mvc.js
    M client/galaxy/scripts/mvc/base/controlled-fetch-collection.js
    M client/galaxy/scripts/mvc/citation/citation-model.js
    M client/galaxy/scripts/mvc/citation/citation-view.js
    M client/galaxy/scripts/mvc/collection/base-creator.js
    M client/galaxy/scripts/mvc/collection/collection-li-edit.js
    M client/galaxy/scripts/mvc/collection/collection-li.js
    M client/galaxy/scripts/mvc/collection/collection-model.js
    M client/galaxy/scripts/mvc/collection/collection-view-edit.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/collection/list-of-pairs-collection-creator.js
    M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
    M client/galaxy/scripts/mvc/dataset/data.js
    M client/galaxy/scripts/mvc/dataset/dataset-choice.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/dataset/dataset-list.js
    M client/galaxy/scripts/mvc/dataset/dataset-model.js
    M client/galaxy/scripts/mvc/dataset/states.js
    M client/galaxy/scripts/mvc/form/form-data.js
    M client/galaxy/scripts/mvc/form/form-input.js
    M client/galaxy/scripts/mvc/form/form-parameters.js
    M client/galaxy/scripts/mvc/form/form-repeat.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/copy-dialog.js
    M client/galaxy/scripts/mvc/history/hda-li-edit.js
    M client/galaxy/scripts/mvc/history/hda-li.js
    M client/galaxy/scripts/mvc/history/hda-model.js
    M client/galaxy/scripts/mvc/history/hdca-li-edit.js
    M client/galaxy/scripts/mvc/history/hdca-li.js
    M client/galaxy/scripts/mvc/history/hdca-model.js
    M client/galaxy/scripts/mvc/history/history-content-model.js
    M client/galaxy/scripts/mvc/history/history-contents.js
    M client/galaxy/scripts/mvc/history/history-list.js
    M client/galaxy/scripts/mvc/history/history-model.js
    M client/galaxy/scripts/mvc/history/history-preferences.js
    M client/galaxy/scripts/mvc/history/history-structure-view.js
    M client/galaxy/scripts/mvc/history/history-view-annotated.js
    M client/galaxy/scripts/mvc/history/history-view-edit-current.js
    M client/galaxy/scripts/mvc/history/history-view-edit.js
    M client/galaxy/scripts/mvc/history/history-view.js
    M client/galaxy/scripts/mvc/history/job-dag.js
    M client/galaxy/scripts/mvc/history/multi-panel.js
    M client/galaxy/scripts/mvc/history/options-menu.js
    M client/galaxy/scripts/mvc/job/job-li.js
    M client/galaxy/scripts/mvc/job/job-model.js
    M client/galaxy/scripts/mvc/job/job-params.js
    M client/galaxy/scripts/mvc/lazy/lazy-limited.js
    M client/galaxy/scripts/mvc/library/library-dataset-view.js
    M client/galaxy/scripts/mvc/library/library-folder-view.js
    M client/galaxy/scripts/mvc/library/library-folderlist-view.js
    M client/galaxy/scripts/mvc/library/library-folderrow-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-librarylist-view.js
    M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
    M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
    M client/galaxy/scripts/mvc/library/library-model.js
    M client/galaxy/scripts/mvc/list/list-item.js
    M client/galaxy/scripts/mvc/list/list-view.js
    M client/galaxy/scripts/mvc/tag.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/tool/tool-genomespace.js
    M client/galaxy/scripts/mvc/tool/tools.js
    M client/galaxy/scripts/mvc/toolshed/categories-view.js
    M client/galaxy/scripts/mvc/toolshed/repo-queue-view.js
    M client/galaxy/scripts/mvc/toolshed/repo-status-view.js
    M client/galaxy/scripts/mvc/toolshed/repositories-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/toolshed-model.js
    M client/galaxy/scripts/mvc/toolshed/util.js
    M client/galaxy/scripts/mvc/toolshed/workflows-view.js
    M client/galaxy/scripts/mvc/tours.js
    M client/galaxy/scripts/mvc/ui/error-modal.js
    M client/galaxy/scripts/mvc/ui/icon-button.js
    M client/galaxy/scripts/mvc/ui/popup-menu.js
    M client/galaxy/scripts/mvc/ui/ui-buttons.js
    M client/galaxy/scripts/mvc/ui/ui-color-picker.js
    M client/galaxy/scripts/mvc/ui/ui-drilldown.js
    M client/galaxy/scripts/mvc/ui/ui-frames.js
    M client/galaxy/scripts/mvc/ui/ui-list.js
    M client/galaxy/scripts/mvc/ui/ui-misc.js
    M client/galaxy/scripts/mvc/ui/ui-modal.js
    M client/galaxy/scripts/mvc/ui/ui-options.js
    M client/galaxy/scripts/mvc/ui/ui-popover.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-select-default.js
    M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
    M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js
    M client/galaxy/scripts/mvc/ui/ui-select-library.js
    M client/galaxy/scripts/mvc/ui/ui-select.js
    M client/galaxy/scripts/mvc/ui/ui-slider.js
    M client/galaxy/scripts/mvc/ui/ui-table.js
    M client/galaxy/scripts/mvc/ui/ui-tabs.js
    M client/galaxy/scripts/mvc/ui/ui-thumbnails.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-extension.js
    M client/galaxy/scripts/mvc/upload/upload-ftp.js
    M client/galaxy/scripts/mvc/upload/upload-model.js
    M client/galaxy/scripts/mvc/upload/upload-settings.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-model.js
    M client/galaxy/scripts/mvc/user/user-preferences.js
    M client/galaxy/scripts/mvc/user/user-quotameter.js
    M client/galaxy/scripts/mvc/visualization/visualization-model.js
    M client/galaxy/scripts/mvc/webhooks.js
    M client/galaxy/scripts/mvc/workflow/workflow-canvas.js
    M client/galaxy/scripts/mvc/workflow/workflow-connector.js
    M client/galaxy/scripts/mvc/workflow/workflow-forms.js
    M client/galaxy/scripts/mvc/workflow/workflow-icons.js
    M client/galaxy/scripts/mvc/workflow/workflow-manager.js
    M client/galaxy/scripts/mvc/workflow/workflow-model.js
    M client/galaxy/scripts/mvc/workflow/workflow-node.js
    M client/galaxy/scripts/mvc/workflow/workflow-terminals.js
    M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
    M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
    M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js
    M client/galaxy/scripts/mvc/workflow/workflow-view.js
    M client/galaxy/scripts/mvc/workflow/workflow.js
    M client/galaxy/scripts/nls/de/locale.js
    M client/galaxy/scripts/nls/es/locale.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/nls/zh/locale.js
    M client/galaxy/scripts/onload.js
    M client/galaxy/scripts/polyfills.js
    M client/galaxy/scripts/reports_webapp/run_stats.js
    M client/galaxy/scripts/ui/autocom_tagging.js
    M client/galaxy/scripts/ui/editable-text.js
    M client/galaxy/scripts/ui/fa-icon-button.js
    M client/galaxy/scripts/ui/filter-control.js
    M client/galaxy/scripts/ui/hoverhighlight.js
    M client/galaxy/scripts/ui/loading-indicator.js
    M client/galaxy/scripts/ui/mode-button.js
    M client/galaxy/scripts/ui/pagination.js
    M client/galaxy/scripts/ui/peek-column-selector.js
    M client/galaxy/scripts/ui/popupmenu.js
    M client/galaxy/scripts/ui/scroll-panel.js
    M client/galaxy/scripts/ui/search-input.js
    M client/galaxy/scripts/utils/add-logging.js
    M client/galaxy/scripts/utils/ajax-queue.js
    M client/galaxy/scripts/utils/async-save-text.js
    M client/galaxy/scripts/utils/config.js
    M client/galaxy/scripts/utils/deferred.js
    M client/galaxy/scripts/utils/graph.js
    M client/galaxy/scripts/utils/levenshtein.js
    M client/galaxy/scripts/utils/localization.js
    M client/galaxy/scripts/utils/metrics-logger.js
    M client/galaxy/scripts/utils/natural-sort.js
    M client/galaxy/scripts/utils/query-string-parsing.js
    M client/galaxy/scripts/utils/uploadbox.js
    M client/galaxy/scripts/utils/utils.js
    M client/galaxy/scripts/viz/bbi-data-manager.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/painters.js
    M client/galaxy/scripts/viz/trackster/slotting.js
    M client/galaxy/scripts/viz/trackster/tracks.js
    M client/galaxy/scripts/viz/trackster/util.js
    M client/galaxy/scripts/viz/visualization.js
    M client/galaxy/scripts/viz/viz_views.js
    M client/package.json
    M client/yarn.lock
    M static/maps/admin.toolshed.js.map
    M static/maps/galaxy.interactive_environments.js.map
    M static/maps/galaxy.js.map
    M static/maps/galaxy.library.js.map
    M static/maps/galaxy.pages.js.map
    M static/maps/i18n.js.map
    M static/maps/layout/generic-nav-view.js.map
    M static/maps/layout/masthead.js.map
    M static/maps/layout/menu.js.map
    M static/maps/layout/modal.js.map
    M static/maps/layout/page.js.map
    M static/maps/layout/panel.js.map
    M static/maps/layout/router.js.map
    M static/maps/layout/scratchbook.js.map
    M static/maps/mvc/annotation.js.map
    M static/maps/mvc/base-mvc.js.map
    M static/maps/mvc/base/controlled-fetch-collection.js.map
    M static/maps/mvc/citation/citation-model.js.map
    M static/maps/mvc/citation/citation-view.js.map
    M static/maps/mvc/collection/base-creator.js.map
    M static/maps/mvc/collection/collection-li-edit.js.map
    M static/maps/mvc/collection/collection-li.js.map
    M static/maps/mvc/collection/collection-model.js.map
    M static/maps/mvc/collection/collection-view-edit.js.map
    M static/maps/mvc/collection/collection-view.js.map
    M static/maps/mvc/collection/list-collection-creator.js.map
    M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
    M static/maps/mvc/collection/pair-collection-creator.js.map
    M static/maps/mvc/dataset/data.js.map
    M static/maps/mvc/dataset/dataset-choice.js.map
    M static/maps/mvc/dataset/dataset-edit-attributes.js.map
    M static/maps/mvc/dataset/dataset-error.js.map
    M static/maps/mvc/dataset/dataset-li-edit.js.map
    M static/maps/mvc/dataset/dataset-li.js.map
    M static/maps/mvc/dataset/dataset-list.js.map
    M static/maps/mvc/dataset/dataset-model.js.map
    M static/maps/mvc/dataset/states.js.map
    M static/maps/mvc/form/form-data.js.map
    M static/maps/mvc/form/form-input.js.map
    M static/maps/mvc/form/form-parameters.js.map
    M static/maps/mvc/form/form-repeat.js.map
    M static/maps/mvc/form/form-section.js.map
    M static/maps/mvc/form/form-view.js.map
    M static/maps/mvc/form/form-wrapper.js.map
    M static/maps/mvc/grid/grid-model.js.map
    M static/maps/mvc/grid/grid-shared.js.map
    M static/maps/mvc/grid/grid-template.js.map
    M static/maps/mvc/grid/grid-view.js.map
    M static/maps/mvc/history/copy-dialog.js.map
    M static/maps/mvc/history/hda-li-edit.js.map
    M static/maps/mvc/history/hda-li.js.map
    M static/maps/mvc/history/hda-model.js.map
    M static/maps/mvc/history/hdca-li-edit.js.map
    M static/maps/mvc/history/hdca-li.js.map
    M static/maps/mvc/history/hdca-model.js.map
    M static/maps/mvc/history/history-content-model.js.map
    M static/maps/mvc/history/history-contents.js.map
    M static/maps/mvc/history/history-list.js.map
    M static/maps/mvc/history/history-model.js.map
    M static/maps/mvc/history/history-preferences.js.map
    M static/maps/mvc/history/history-structure-view.js.map
    M static/maps/mvc/history/history-view-annotated.js.map
    M static/maps/mvc/history/history-view-edit-current.js.map
    M static/maps/mvc/history/history-view-edit.js.map
    M static/maps/mvc/history/history-view.js.map
    M static/maps/mvc/history/job-dag.js.map
    M static/maps/mvc/history/multi-panel.js.map
    M static/maps/mvc/history/options-menu.js.map
    M static/maps/mvc/job/job-li.js.map
    M static/maps/mvc/job/job-model.js.map
    M static/maps/mvc/job/job-params.js.map
    M static/maps/mvc/lazy/lazy-limited.js.map
    M static/maps/mvc/library/library-dataset-view.js.map
    M static/maps/mvc/library/library-folder-view.js.map
    M static/maps/mvc/library/library-folderlist-view.js.map
    M static/maps/mvc/library/library-folderrow-view.js.map
    M static/maps/mvc/library/library-foldertoolbar-view.js.map
    M static/maps/mvc/library/library-library-view.js.map
    M static/maps/mvc/library/library-librarylist-view.js.map
    M static/maps/mvc/library/library-libraryrow-view.js.map
    M static/maps/mvc/library/library-librarytoolbar-view.js.map
    M static/maps/mvc/library/library-model.js.map
    M static/maps/mvc/list/list-item.js.map
    M static/maps/mvc/list/list-view.js.map
    M static/maps/mvc/tag.js.map
    M static/maps/mvc/tool/tool-form-base.js.map
    M static/maps/mvc/tool/tool-form-composite.js.map
    M static/maps/mvc/tool/tool-form.js.map
    M static/maps/mvc/tool/tool-genomespace.js.map
    M static/maps/mvc/tool/tools.js.map
    M static/maps/mvc/toolshed/categories-view.js.map
    M static/maps/mvc/toolshed/repo-queue-view.js.map
    M static/maps/mvc/toolshed/repo-status-view.js.map
    M static/maps/mvc/toolshed/repositories-view.js.map
    M static/maps/mvc/toolshed/repository-queue-view.js.map
    M static/maps/mvc/toolshed/repository-view.js.map
    M static/maps/mvc/toolshed/shed-list-view.js.map
    M static/maps/mvc/toolshed/toolshed-model.js.map
    M static/maps/mvc/toolshed/util.js.map
    M static/maps/mvc/toolshed/workflows-view.js.map
    M static/maps/mvc/tours.js.map
    M static/maps/mvc/ui/error-modal.js.map
    M static/maps/mvc/ui/icon-button.js.map
    M static/maps/mvc/ui/popup-menu.js.map
    M static/maps/mvc/ui/ui-buttons.js.map
    M static/maps/mvc/ui/ui-color-picker.js.map
    M static/maps/mvc/ui/ui-drilldown.js.map
    M static/maps/mvc/ui/ui-frames.js.map
    M static/maps/mvc/ui/ui-list.js.map
    M static/maps/mvc/ui/ui-misc.js.map
    M static/maps/mvc/ui/ui-modal.js.map
    M static/maps/mvc/ui/ui-options.js.map
    M static/maps/mvc/ui/ui-popover.js.map
    M static/maps/mvc/ui/ui-portlet.js.map
    M static/maps/mvc/ui/ui-select-content.js.map
    M static/maps/mvc/ui/ui-select-default.js.map
    M static/maps/mvc/ui/ui-select-ftp.js.map
    M static/maps/mvc/ui/ui-select-genomespace.js.map
    M static/maps/mvc/ui/ui-select-library.js.map
    M static/maps/mvc/ui/ui-select.js.map
    M static/maps/mvc/ui/ui-slider.js.map
    M static/maps/mvc/ui/ui-table.js.map
    M static/maps/mvc/ui/ui-tabs.js.map
    M static/maps/mvc/ui/ui-thumbnails.js.map
    M static/maps/mvc/upload/collection/collection-row.js.map
    M static/maps/mvc/upload/collection/collection-view.js.map
    M static/maps/mvc/upload/composite/composite-row.js.map
    M static/maps/mvc/upload/composite/composite-view.js.map
    M static/maps/mvc/upload/default/default-row.js.map
    M static/maps/mvc/upload/default/default-view.js.map
    M static/maps/mvc/upload/upload-button.js.map
    M static/maps/mvc/upload/upload-extension.js.map
    M static/maps/mvc/upload/upload-ftp.js.map
    M static/maps/mvc/upload/upload-model.js.map
    M static/maps/mvc/upload/upload-settings.js.map
    M static/maps/mvc/upload/upload-view.js.map
    M static/maps/mvc/user/user-custom-builds.js.map
    M static/maps/mvc/user/user-model.js.map
    M static/maps/mvc/user/user-preferences.js.map
    M static/maps/mvc/user/user-quotameter.js.map
    M static/maps/mvc/visualization/visualization-model.js.map
    M static/maps/mvc/webhooks.js.map
    M static/maps/mvc/workflow/workflow-canvas.js.map
    M static/maps/mvc/workflow/workflow-connector.js.map
    M static/maps/mvc/workflow/workflow-forms.js.map
    M static/maps/mvc/workflow/workflow-icons.js.map
    M static/maps/mvc/workflow/workflow-manager.js.map
    M static/maps/mvc/workflow/workflow-model.js.map
    M static/maps/mvc/workflow/workflow-node.js.map
    M static/maps/mvc/workflow/workflow-terminals.js.map
    M static/maps/mvc/workflow/workflow-view-data.js.map
    M static/maps/mvc/workflow/workflow-view-node.js.map
    M static/maps/mvc/workflow/workflow-view-terminals.js.map
    M static/maps/mvc/workflow/workflow-view.js.map
    M static/maps/mvc/workflow/workflow.js.map
    M static/maps/nls/de/locale.js.map
    M static/maps/nls/es/locale.js.map
    M static/maps/nls/fr/locale.js.map
    M static/maps/nls/ja/locale.js.map
    M static/maps/nls/locale.js.map
    M static/maps/nls/zh/locale.js.map
    M static/maps/onload.js.map
    M static/maps/polyfills.js.map
    M static/maps/reports_webapp/run_stats.js.map
    M static/maps/ui/autocom_tagging.js.map
    M static/maps/ui/editable-text.js.map
    M static/maps/ui/fa-icon-button.js.map
    M static/maps/ui/filter-control.js.map
    M static/maps/ui/hoverhighlight.js.map
    M static/maps/ui/loading-indicator.js.map
    M static/maps/ui/mode-button.js.map
    M static/maps/ui/pagination.js.map
    M static/maps/ui/peek-column-selector.js.map
    M static/maps/ui/popupmenu.js.map
    M static/maps/ui/scroll-panel.js.map
    M static/maps/ui/search-input.js.map
    M static/maps/utils/add-logging.js.map
    M static/maps/utils/ajax-queue.js.map
    M static/maps/utils/async-save-text.js.map
    M static/maps/utils/config.js.map
    M static/maps/utils/deferred.js.map
    M static/maps/utils/graph.js.map
    M static/maps/utils/levenshtein.js.map
    M static/maps/utils/localization.js.map
    M static/maps/utils/metrics-logger.js.map
    M static/maps/utils/natural-sort.js.map
    M static/maps/utils/query-string-parsing.js.map
    M static/maps/utils/uploadbox.js.map
    M static/maps/utils/utils.js.map
    M static/maps/viz/bbi-data-manager.js.map
    M static/maps/viz/circster.js.map
    M static/maps/viz/phyloviz.js.map
    M static/maps/viz/sweepster.js.map
    M static/maps/viz/trackster.js.map
    M static/maps/viz/trackster/filters.js.map
    M static/maps/viz/trackster/painters.js.map
    M static/maps/viz/trackster/slotting.js.map
    M static/maps/viz/trackster/tracks.js.map
    M static/maps/viz/trackster/util.js.map
    M static/maps/viz/visualization.js.map
    M static/maps/viz/viz_views.js.map
    M static/scripts/bundled/admin.bundled.js.map
    M static/scripts/bundled/analysis.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/bundled/login.bundled.js.map
    M test/functional/tools/collection_split_on_column.xml

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: 7f5048bc98dd3080db22f80e75b1dd688f981a0b
      https://github.com/galaxyproject/galaxy/commit/7f5048bc98dd3080db22f80e75b1d...
  Author: guerler <aysam.guerler@gmail.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
    M client/galaxy/scripts/mvc/form/form-parameters.js
    M config/datatypes_conf.xml.sample
    M config/plugins/webhooks/demo/tour_generator/static/script.js
    M doc/source/slideshow/architecture/galaxy_architecture.md
    A lib/galaxy/datatypes/annotation.py
    M lib/galaxy/datatypes/converters/sam_to_bam.py
    M lib/galaxy/jobs/handler.py
    M lib/galaxy_ext/metadata/set_metadata.py
    M static/maps/mvc/dataset/dataset-li-edit.js.map
    M static/maps/mvc/form/form-parameters.js.map
    M static/scripts/bundled/admin.bundled.js.map
    M static/scripts/bundled/analysis.bundled.js
    M static/scripts/bundled/analysis.bundled.js.map
    M static/scripts/bundled/libs.bundled.js.map
    M static/scripts/mvc/dataset/dataset-li-edit.js

  Log Message:
  -----------
  Merge branch 'dev' into remove_toolshed_grids


  Commit: 2f2acb98e08934c5dae508c27490b42cf9b28313
      https://github.com/galaxyproject/galaxy/commit/2f2acb98e08934c5dae508c27490b...
  Author: Dannon Baker <dannon.baker@gmail.com>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    M client/galaxy/scripts/apps/admin.js
    M client/galaxy/scripts/apps/panels/admin-panel.js
    M client/galaxy/scripts/layout/page.js
    M client/galaxy/scripts/mvc/grid/grid-view.js
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/webapps/galaxy/buildapp.py
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/galaxy/webapps/galaxy/controllers/dataset.py
    M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
    M static/maps/layout/page.js.map
    M static/maps/mvc/grid/grid-view.js.map
    M static/scripts/bundled/admin.bundled.js
    M static/scripts/bundled/admin.bundled.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/layout/page.js
    M static/scripts/mvc/grid/grid-view.js
    R templates/admin/tool_shed_repository/repair_repository.mako
    M templates/admin/tool_shed_repository/repository_actions_menu.mako
    M test/shed_functional/base/twilltestcase.py
    M test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py
    M test/shed_functional/functional/test_1430_repair_installed_repository.py

  Log Message:
  -----------
  Merge remote-tracking branch 'guerler/remove_toolshed_grids' into dev


Compare: https://github.com/galaxyproject/galaxy/compare/b8dfceb72aa4...2f2acb98e089

[galaxy-commits] [galaxyproject/galaxy] 504e2a: Add client route for toolshed browsing grid

GitHub