Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ba8d03624cad0b0d78d11f07ee9b05446977e6a0 https://github.com/galaxyproject/galaxy/commit/ba8d03624cad0b0d78d11f07ee9b0... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M client/galaxy/scripts/onload.js A config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/static/script.js A config/plugins/webhooks/demo/search/static/styles.css M static/maps/onload.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/onload.js Log Message: ----------- Adding overlay search feature to webhooks Commit: d66e2f912964fdc05c239b52f2dab440313513b5 https://github.com/galaxyproject/galaxy/commit/d66e2f912964fdc05c239b52f2dab... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/config/searchover.yaml Log Message: ----------- Updating the logic to pull search plugin static code Commit: f6e0d65efcb517634540d5392d7d0c44e4f25bc2 https://github.com/galaxyproject/galaxy/commit/f6e0d65efcb517634540d5392d7d0... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- Adding items to the favorites when pinned and filter is home Commit: 07d9b63d09f2e3918a96b6be6f4778ac97a747d2 https://github.com/galaxyproject/galaxy/commit/07d9b63d09f2e3918a96b6be6f477... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/config/searchover.yaml M config/plugins/webhooks/demo/search/static/script.js Log Message: ----------- Synchronising pin/ unpin actions in the favorites section Commit: 839c9091dd39056243f6d75ea4a0797749882ee3 https://github.com/galaxyproject/galaxy/commit/839c9091dd39056243f6d75ea4a07... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- Updating styles for tiles Commit: 5ad2e5ce66a36644eead2c50f51f971363b210e1 https://github.com/galaxyproject/galaxy/commit/5ad2e5ce66a36644eead2c50f51f9... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-11 (Wed, 11 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- Synchronising the deletion of item in favourites with pinned item in search results if any Commit: 3b6ddb992f1c0824e688ed7c9ab913d68826eda3 https://github.com/galaxyproject/galaxy/commit/3b6ddb992f1c0824e688ed7c9ab91... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-13 (Fri, 13 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js Log Message: ----------- Fixing bug with aligning items in tools section Commit: 9dc814e81171f873fce15a63210138bc239f8063 https://github.com/galaxyproject/galaxy/commit/9dc814e81171f873fce15a6321013... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-13 (Fri, 13 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- Adding hover styles for tiles Commit: 78f29eab856220bd0fe44566cba7f850a91f6e41 https://github.com/galaxyproject/galaxy/commit/78f29eab856220bd0fe44566cba7f... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-14 (Sat, 14 Jan 2017) Changed paths: M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- Moving the pin icon to the left of tiles Commit: 34be05339915df8554a619a086214974f98e5bcb https://github.com/galaxyproject/galaxy/commit/34be05339915df8554a619a086214... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-01-21 (Sat, 21 Jan 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/jenkins/selenium/run_galaxy.bash M .ci/py3_sources.txt M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/ui/ui-misc.js M config/datatypes_conf.xml.sample M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/visualizations/csg/templates/csg.mako M config/plugins/visualizations/graphviz/templates/graphviz.mako M config/plugins/visualizations/scatterplot/templates/scatterplot.mako M config/plugins/webhooks/demo/phdcomics/helper/__init__.py M config/plugins/webhooks/demo/phdcomics/static/script.js M doc/schema_template.md M doc/source/admin/webhooks.rst M doc/source/api/guidelines.rst M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/converters/fastqbz2_to_fastq.xml A lib/galaxy/datatypes/converters/fastqcssangerbz2_to_fastqcssanger.xml A lib/galaxy/datatypes/converters/fastqcssangergz_to_fastqcssanger.xml A lib/galaxy/datatypes/converters/fastqgz_to_fastq.xml A lib/galaxy/datatypes/converters/fastqilluminabz2_to_fastqillumina.xml A lib/galaxy/datatypes/converters/fastqilluminagz_to_fastqillumina.xml A lib/galaxy/datatypes/converters/fastqsangerbz2_to_fastqsanger.xml A lib/galaxy/datatypes/converters/fastqsangergz_to_fastqsanger.xml A lib/galaxy/datatypes/converters/fastqsolexabz2_to_fastqsolexa.xml A lib/galaxy/datatypes/converters/fastqsolexagz_to_fastqsolexa.xml M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/diamond_db.dmnd M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/errors.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/util/galaxyops/__init__.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/verify/asserts/__init__.py M lib/galaxy/tools/verify/test_data.py M lib/galaxy/tools/wrappers.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/object_wrapper.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/util/shed_util_common.py M run_tests.sh A static/maps/libs/showdown.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/ui/ui-misc.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map A static/scripts/libs/showdown.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/ui/ui-misc.js M templates/ind_share_base.mako M templates/webapps/galaxy/history/share.mako A test-data/1.fastqsanger.bz2 A test-data/1.fastqsanger.gz M test/api/test_workflows.py M test/docker/README.md M test/functional/tools/column_param.xml A test/functional/tools/compressed_bz2_fastq_conversion.xml A test/functional/tools/compressed_bz2_fastq_no_conversion.xml A test/functional/tools/compressed_gz_fastq_conversion.xml A test/functional/tools/compressed_gz_fastq_no_conversion.xml A test/functional/tools/explicit_conversion.xml A test/functional/tools/implicit_conversion.xml A test/functional/tools/mulled_example_conflict.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_history_sharing.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_workflow_editor.py M test/selenium_tests/test_workflow_management.py Log Message: ----------- Merging with dev Commit: 823ac3cc6172db54c35fdae43553af304a6a162b https://github.com/galaxyproject/galaxy/commit/823ac3cc6172db54c35fdae43553a... Author: Evgeny Anatskiy <evgeny.anatskiy@gmail.com> Date: 2017-02-11 (Sat, 11 Feb 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- add new Search plugin styles Commit: 4120781713cc65d3c05064bee981cf826d5c4be8 https://github.com/galaxyproject/galaxy/commit/4120781713cc65d3c05064bee981c... Author: Evgeny Anatskiy <evgeny.anatskiy@gmail.com> Date: 2017-03-05 (Sun, 05 Mar 2017) Changed paths: M config/galaxy.ini.sample M config/plugins/webhooks/demo/search/static/styles.css Log Message: ----------- increase contrast and improve readability Commit: 0bfe9fa7ca1489d744351eecc4312838a20008eb https://github.com/galaxyproject/galaxy/commit/0bfe9fa7ca1489d744351eecc4312... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-03-07 (Tue, 07 Mar 2017) Changed paths: M .ci/flake8_blacklist.txt M .ci/flake8_lint_include_list.txt M .ci/jenkins/selenium/run_tests.sh M .ci/py3_sources.txt M CONTRIBUTING.md M README.rst M client/galaxy/scripts/libs/jquery/jquery.autocomplete.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-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js R client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/user/user-quotameter.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.js A client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/ui/autocom_tagging.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/style/less/base.less M client/galaxy/style/less/history.less M client/galaxy/style/less/ui.less A config/build_sites.yml.sample M config/datatypes_conf.xml.sample M config/galaxy.ini.sample A config/local_conda_mapping.yml.sample M config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample M config/plugins/interactive_environments/jupyter/config/allowed_images.yml.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.xml M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/phinch/config/phinch.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml A config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js A config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js.map 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/static/repository/build/registry.tmp.js A config/plugins/visualizations/charts/static/repository/plugins/ngl/viewer.js M config/plugins/visualizations/charts/static/repository/registry.json A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/config.js A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/logo.png A config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/wrapper.js R config/plugins/webhooks/demo/history_test1/config/history_test1.yml R config/plugins/webhooks/demo/history_test2/config/history_test2.yml R config/plugins/webhooks/demo/masthead_test/config/masthead_test.yml R config/plugins/webhooks/demo/phdcomics/config/phdcomics.yaml R config/plugins/webhooks/demo/phdcomics/helper/__init__.py R config/plugins/webhooks/demo/phdcomics/static/script.js R config/plugins/webhooks/demo/phdcomics/static/styles.css R config/plugins/webhooks/demo/trans_object/config/trans_object.yaml R config/plugins/webhooks/demo/trans_object/helper/__init__.py R config/plugins/webhooks/demo/xkcd/config/xkcd.yml R config/plugins/webhooks/demo/xkcd/static/script.js R config/plugins/webhooks/demo/xkcd/static/styles.css M contrib/nagios/check_galaxy M contrib/nagios/check_galaxy.py A cron/clean_docker_swarm_mode_services.sh M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst M doc/source/admin/interactive_environments.rst R doc/source/lib/galaxy_utils.rst R doc/source/lib/galaxy_utils.sequence.rst M doc/source/lib/modules.rst M doc/source/project/organization.rst A doc/source/releases/17.01.rst M doc/source/releases/17.01_announce.rst A doc/source/releases/17.05_announce.rst M doc/source/releases/_thanks.rst M doc/source/releases/index.rst M doc/source/slideshow/architecture/galaxy_architecture.md M doc/source/slideshow/architecture/images/hda_dataset.plantuml.svg M doc/source/slideshow/architecture/images/hda_hdca.plantuml.svg M doc/source/slideshow/architecture/images/objectstore.plantuml.svg M doc/source/slideshow/architecture/images/plantuml_options.txt M doc/source/slideshow/architecture/images/server_client.plantuml.svg M doc/source/slideshow/architecture/images/server_client_old.plantuml.svg M doc/source/slideshow/architecture/images/webapp.plantuml.svg M doc/source/slideshow/architecture/style.css M lib/galaxy/auth/providers/__init__.py M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/dataset_collections/types/__init__.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/registry.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/exceptions/__init__.py M lib/galaxy/exceptions/error_codes.json M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/datasets.py M lib/galaxy/jobs/dynamic_tool_destination.py M lib/galaxy/jobs/metrics/instrumenters/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/job/__init__.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/shell/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/local.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/jobs/runners/util/condor/__init__.py M lib/galaxy/jobs/runners/util/kill.py M lib/galaxy/jobs/runners/util/retry.py M lib/galaxy/jobs/runners/util/sudo.py M lib/galaxy/managers/deletable.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0003_security_and_libraries.py M lib/galaxy/model/migrate/versions/0004_indexes_and_defaults.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0006_change_qual_datatype.py M lib/galaxy/model/migrate/versions/0007_sharing_histories.py M lib/galaxy/model/migrate/versions/0008_galaxy_forms.py M lib/galaxy/model/migrate/versions/0009_request_table.py M lib/galaxy/model/migrate/versions/0010_hda_display_at_authz_table.py M lib/galaxy/model/migrate/versions/0011_v0010_mysql_index_fix.py M lib/galaxy/model/migrate/versions/0012_user_address.py M lib/galaxy/model/migrate/versions/0013_change_lib_item_templates_to_forms.py M lib/galaxy/model/migrate/versions/0014_pages.py M lib/galaxy/model/migrate/versions/0015_tagging.py M lib/galaxy/model/migrate/versions/0016_v0015_mysql_index_fix.py M lib/galaxy/model/migrate/versions/0017_library_item_indexes.py M lib/galaxy/model/migrate/versions/0018_ordered_tags_and_page_tags.py M lib/galaxy/model/migrate/versions/0019_request_library_folder.py M lib/galaxy/model/migrate/versions/0020_library_upload_job.py M lib/galaxy/model/migrate/versions/0021_user_prefs.py M lib/galaxy/model/migrate/versions/0022_visualization_tables.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py M lib/galaxy/model/migrate/versions/0025_user_info.py M lib/galaxy/model/migrate/versions/0026_cloud_tables.py M lib/galaxy/model/migrate/versions/0027_request_events.py M lib/galaxy/model/migrate/versions/0028_external_metadata_file_override.py M lib/galaxy/model/migrate/versions/0029_user_actions.py M lib/galaxy/model/migrate/versions/0031_community_and_workflow_tags.py M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py M lib/galaxy/model/migrate/versions/0034_page_user_share_association.py M lib/galaxy/model/migrate/versions/0035_item_annotations_and_workflow_step_tags.py M lib/galaxy/model/migrate/versions/0036_add_deleted_column_to_library_template_assoc_tables.py M lib/galaxy/model/migrate/versions/0037_samples_library.py M lib/galaxy/model/migrate/versions/0038_add_inheritable_column_to_library_template_assoc_tables.py M lib/galaxy/model/migrate/versions/0039_add_synopsis_column_to_library_table.py M lib/galaxy/model/migrate/versions/0040_page_annotations.py M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0043_visualization_sharing_tagging_annotating.py M lib/galaxy/model/migrate/versions/0044_add_notify_column_to_request_table.py M lib/galaxy/model/migrate/versions/0045_request_type_permissions_table.py M lib/galaxy/model/migrate/versions/0046_post_job_actions.py M lib/galaxy/model/migrate/versions/0047_job_table_user_id_column.py M lib/galaxy/model/migrate/versions/0048_dataset_instance_state_column.py M lib/galaxy/model/migrate/versions/0049_api_keys_table.py M lib/galaxy/model/migrate/versions/0050_drop_cloud_tables.py M lib/galaxy/model/migrate/versions/0051_imported_col_for_jobs_table.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0053_item_ratings.py M lib/galaxy/model/migrate/versions/0055_add_pja_assoc_for_jobs.py M lib/galaxy/model/migrate/versions/0057_request_notify.py M lib/galaxy/model/migrate/versions/0058_history_import_export.py M lib/galaxy/model/migrate/versions/0059_sample_dataset_file_path.py M lib/galaxy/model/migrate/versions/0060_history_archive_import.py M lib/galaxy/model/migrate/versions/0062_user_openid_table.py M lib/galaxy/model/migrate/versions/0063_sequencer_table.py M lib/galaxy/model/migrate/versions/0064_add_run_and_sample_run_association_tables.py M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py M lib/galaxy/model/migrate/versions/0066_deferred_job_and_transfer_job_tables.py M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py M lib/galaxy/model/migrate/versions/0068_rename_sequencer_to_external_services.py M lib/galaxy/model/migrate/versions/0069_rename_sequencer_form_type.py M lib/galaxy/model/migrate/versions/0070_add_info_column_to_deferred_job_table.py M lib/galaxy/model/migrate/versions/0071_add_history_and_workflow_to_sample.py M lib/galaxy/model/migrate/versions/0072_add_pid_and_socket_columns_to_transfer_job_table.py M lib/galaxy/model/migrate/versions/0073_add_ldda_to_implicit_conversion_table.py M lib/galaxy/model/migrate/versions/0074_add_purged_column_to_library_dataset_table.py M lib/galaxy/model/migrate/versions/0075_add_subindex_column_to_run_table.py M lib/galaxy/model/migrate/versions/0077_create_tool_tag_association_table.py M lib/galaxy/model/migrate/versions/0078_add_columns_for_disk_usage_accounting.py M lib/galaxy/model/migrate/versions/0079_input_library_to_job_table.py M lib/galaxy/model/migrate/versions/0080_quota_tables.py M lib/galaxy/model/migrate/versions/0081_add_tool_version_to_hda_ldda.py M lib/galaxy/model/migrate/versions/0082_add_tool_shed_repository_table.py M lib/galaxy/model/migrate/versions/0083_add_prepare_files_to_task.py M lib/galaxy/model/migrate/versions/0084_add_ldda_id_to_implicit_conversion_table.py M lib/galaxy/model/migrate/versions/0085_add_task_info.py M lib/galaxy/model/migrate/versions/0086_add_tool_shed_repository_table_columns.py M lib/galaxy/model/migrate/versions/0087_tool_id_guid_map_table.py M lib/galaxy/model/migrate/versions/0088_add_installed_changeset_revison_column.py M lib/galaxy/model/migrate/versions/0089_add_object_store_id_columns.py M lib/galaxy/model/migrate/versions/0090_add_tool_shed_repository_table_columns.py M lib/galaxy/model/migrate/versions/0091_add_tool_version_tables.py M lib/galaxy/model/migrate/versions/0092_add_migrate_tools_table.py M lib/galaxy/model/migrate/versions/0093_add_job_params_col.py M lib/galaxy/model/migrate/versions/0094_add_job_handler_col.py M lib/galaxy/model/migrate/versions/0095_hda_subsets.py M lib/galaxy/model/migrate/versions/0096_openid_provider.py M lib/galaxy/model/migrate/versions/0097_add_ctx_rev_column.py M lib/galaxy/model/migrate/versions/0098_genome_index_tool_data_table.py M lib/galaxy/model/migrate/versions/0099_add_tool_dependency_table.py M lib/galaxy/model/migrate/versions/0100_alter_tool_dependency_table_version_column.py M lib/galaxy/model/migrate/versions/0101_drop_installed_changeset_revision_column.py M lib/galaxy/model/migrate/versions/0102_add_tool_dependency_status_columns.py M lib/galaxy/model/migrate/versions/0103_add_tool_shed_repository_status_columns.py M lib/galaxy/model/migrate/versions/0104_update_genome_downloader_job_parameters.py M lib/galaxy/model/migrate/versions/0105_add_cleanup_event_table.py M lib/galaxy/model/migrate/versions/0106_add_missing_indexes.py M lib/galaxy/model/migrate/versions/0107_add_exit_code_to_job_and_task.py M lib/galaxy/model/migrate/versions/0108_add_extended_metadata.py M lib/galaxy/model/migrate/versions/0109_add_repository_dependency_tables.py M lib/galaxy/model/migrate/versions/0110_add_dataset_uuid.py M lib/galaxy/model/migrate/versions/0111_add_job_destinations.py M lib/galaxy/model/migrate/versions/0112_add_data_manager_history_association_and_data_manager_job_association_tables.py M lib/galaxy/model/migrate/versions/0113_update_migrate_tools_table.py M lib/galaxy/model/migrate/versions/0114_update_migrate_tools_table_again.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/migrate/versions/0116_drop_update_available_col_add_tool_shed_status_col.py M lib/galaxy/model/migrate/versions/0117_add_user_activation.py M lib/galaxy/model/migrate/versions/0118_add_hda_extended_metadata.py M lib/galaxy/model/migrate/versions/0119_job_metrics.py M lib/galaxy/model/migrate/versions/0120_dataset_collections.py M lib/galaxy/model/migrate/versions/0121_workflow_uuids.py M lib/galaxy/model/migrate/versions/0122_grow_mysql_blobs.py M lib/galaxy/model/migrate/versions/0123_add_workflow_request_tables.py M lib/galaxy/model/migrate/versions/0124_job_state_history.py M lib/galaxy/model/migrate/versions/0125_workflow_step_tracking.py M lib/galaxy/model/migrate/versions/0126_password_reset.py M lib/galaxy/model/migrate/versions/0127_output_collection_adjustments.py M lib/galaxy/model/migrate/versions/0128_session_timeout.py M lib/galaxy/model/migrate/versions/0129_job_external_output_metadata_validity.py M lib/galaxy/model/migrate/versions/0130_change_pref_datatype.py M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py M lib/galaxy/model/migrate/versions/0132_add_lastpasswordchange_to_user.py M lib/galaxy/model/migrate/versions/0133_add_dependency_column_to_job.py A lib/galaxy/model/migrate/versions/0134_hda_set_deleted_if_purged.py M lib/galaxy/model/orm/engine_factory.py M lib/galaxy/model/orm/scripts.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/dependencies.py M lib/galaxy/tools/deps/installable.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py A lib/galaxy/tools/deps/resolvers/default_conda_mapping.yml M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/linters/general.py M lib/galaxy/tools/linters/inputs.py M lib/galaxy/tools/linters/outputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/linters/tests.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/filters/examples.py.sample M lib/galaxy/tools/toolbox/lineages/interface.py M lib/galaxy/tools/toolbox/tags.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/tools/verify/__init__.py M lib/galaxy/tools/verify/asserts/xml.py M lib/galaxy/tools/xsd/galaxy.xsd A lib/galaxy/util/compression_utils.py M lib/galaxy/util/json.py M lib/galaxy/util/object_wrapper.py A lib/galaxy/util/oset.py M lib/galaxy/util/properties.py M lib/galaxy/version.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/galaxy/workflow/run_request.py M lib/galaxy/workflow/schedulers/__init__.py M lib/galaxy/workflow/scheduling_manager.py M lib/galaxy/workflow/steps.py R lib/galaxy_utils/__init__.py R lib/galaxy_utils/sequence/__init__.py R lib/galaxy_utils/sequence/fasta.py R lib/galaxy_utils/sequence/fastq.py R lib/galaxy_utils/sequence/sequence.py R lib/galaxy_utils/sequence/transform.py R lib/galaxy_utils/sequence/vcf.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/workflow_util.py M run.sh M run_tests.sh M scripts/bootstrap_history.py M scripts/common_startup.sh A scripts/manage_tool_dependencies.py A scripts/secret_decoder_ring.py M scripts/slideshow/slideshow_template.html A static/maps/analysis.js.map A static/maps/app.js.map A static/maps/app/analysis.js.map M static/maps/libs/jquery/jquery.autocomplete.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-section.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map R static/maps/mvc/tool/tool-form-workflow.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/ui/ui-misc.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/upload/upload-ftp.js.map M static/maps/mvc/user/user-quotameter.js.map M static/maps/mvc/workflow/workflow-canvas.js.map A static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view-node.js.map M static/maps/mvc/workflow/workflow-view.js.map R static/maps/mvc/workflow/workflow.js.map M static/maps/ui/autocom_tagging.js.map M static/maps/viz/trackster/tracks.js.map A static/scripts/analysis.js A static/scripts/app.js A static/scripts/app/analysis.js 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/libs/jquery/jquery.autocomplete.js M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/history-model.js M static/scripts/mvc/history/history-view.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js R static/scripts/mvc/tool/tool-form-workflow.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/ui/ui-misc.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/upload/upload-ftp.js M static/scripts/mvc/user/user-quotameter.js M static/scripts/mvc/workflow/workflow-canvas.js A static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view-node.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/ui/autocom_tagging.js M static/scripts/viz/trackster/tracks.js M static/style/blue/base.css M templates/admin/reload_tool.mako M templates/grid_base.mako A templates/webapps/galaxy/user/manage_info.mako M templates/webapps/galaxy/workflow/editor.mako R templates/webapps/galaxy/workflow/editor_generic_form.mako R templates/webapps/galaxy/workflow/editor_tool_form.mako M templates/webapps/tool_shed/repository/tool_form.mako A test-data/simple.xml M test/TESTING.md M test/api/test_datatypes.py M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_tools.py A test/api/test_webhooks.py M test/api/test_workflow_extraction.py M test/api/test_workflows.py M test/base/driver_util.py M test/base/populators.py M test/docker/base/run_test_wrapper.sh M test/functional/tools/checksum.xml A test/functional/tools/is_valid_xml.xml A test/functional/tools/legacy_r.xml M test/functional/tools/md5sum.xml A test/functional/tools/mulled_example_multi_incomplete.xml A test/functional/tools/output_format_deprecated_when.xml A test/functional/tools/param_text_option.xml M test/functional/tools/samples_tool_conf.xml A test/functional/webhooks/history_test1/config/history_test1.yml A test/functional/webhooks/history_test2/config/history_test2.yml A test/functional/webhooks/masthead_test/config/masthead_test.yml A test/functional/webhooks/phdcomics/config/phdcomics.yaml A test/functional/webhooks/phdcomics/helper/__init__.py A test/functional/webhooks/phdcomics/static/script.js A test/functional/webhooks/phdcomics/static/styles.css A test/functional/webhooks/trans_object/config/trans_object.yaml A test/functional/webhooks/trans_object/helper/__init__.py A test/functional/webhooks/xkcd/config/xkcd.yml A test/functional/webhooks/xkcd/static/script.js A test/functional/webhooks/xkcd/static/styles.css M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml M test/galaxy_selenium/sizzle.py M test/integration/test_resolvers.py M test/qunit/tests/form_tests.js M test/qunit/tests/workflow_editor_tests.js M test/selenium_tests/framework.py A test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_stock_tours.py M test/selenium_tests/test_uploads.py M test/selenium_tests/test_workflow_editor.py M test/unit/managers/test_HDAManager.py M test/unit/managers/test_HistoryManager.py M test/unit/tools/test_conda_resolution.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_execution.py M test/unit/tools/test_tool_deps.py M test/unit/workflows/test_modules.py M test/unit/workflows/test_workflow_progress.py M tools/data_source/upload.py M tools/evolution/add_scores.xml M tools/extract/extract_genomic_dna.xml M tools/filters/pasteWrapper.xml M tools/maf/genebed_maf_to_fasta.xml M tools/maf/interval2maf.xml M tools/maf/interval2maf_pairwise.xml M tools/maf/interval_maf_to_merged_fasta.xml M tools/maf/macros.xml M tools/maf/maf_by_block_number.xml M tools/maf/maf_filter.xml M tools/maf/maf_limit_size.xml M tools/maf/maf_limit_to_species.xml M tools/maf/maf_reverse_complement.xml M tools/maf/maf_split_by_species.xml M tools/maf/maf_stats.xml M tools/maf/maf_thread_for_species.xml M tools/maf/maf_to_bed.xml M tools/maf/maf_to_fasta.xml M tools/maf/maf_to_interval.xml M tools/maf/vcf_to_maf_customtrack.xml M tools/metag_tools/shrimp_color_wrapper.xml M tools/metag_tools/shrimp_wrapper.xml M tools/next_gen_conversion/fastq_gen_conv.xml M tools/plotting/bar_chart.xml M tools/stats/aggregate_binned_scores_in_intervals.xml M tox.ini Log Message: ----------- Merging with dev Commit: 07490e428dc0a3596d7623a7a787443494626c63 https://github.com/galaxyproject/galaxy/commit/07490e428dc0a3596d7623a7a7874... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-08 (Wed, 08 Mar 2017) Changed paths: M client/galaxy/scripts/onload.js M config/galaxy.ini.sample A config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/static/script.js A config/plugins/webhooks/demo/search/static/styles.css M static/maps/onload.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/onload.js Log Message: ----------- Merge pull request #3460 from bgruening/search_overlay Overlay search for tools, wf, libraries and histories Compare: https://github.com/galaxyproject/galaxy/compare/b9c1abd43a69...07490e428dc0