Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 497afd86a6e4110d74b0caefe5e40f86baf257cd https://github.com/galaxyproject/galaxy/commit/497afd86a6e4110d74b0caefe5... Author: thoba <lose.thoba(a)gmail.com&gt; Date: 2016-07-13 (Wed, 13 Jul 2016) Changed paths: M .gitignore A config/plugins/interactive_environments/neo/config/allowed_images.yml.sample A config/plugins/interactive_environments/neo/config/neo.ini.sample A config/plugins/interactive_environments/neo/config/neo.xml A config/plugins/interactive_environments/neo/static/js/neo.js A config/plugins/interactive_environments/neo/templates/neo.mako M lib/galaxy/web/proxy/__init__.py Log Message: ----------- Fix config.dynamic_proxy. Commit: a188c1019749200da93b77401e098e978bdf7572 https://github.com/galaxyproject/galaxy/commit/a188c1019749200da93b77401e... Author: thoba <lose.thoba(a)gmail.com&gt; Date: 2016-07-13 (Wed, 13 Jul 2016) Changed paths: M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/neo/config/neo.xml M config/plugins/interactive_environments/neo/templates/neo.mako Log Message: ----------- Minor IE updates. Commit: 6732bea22dbd67b8f3ad02c81310bcb69549ec2d https://github.com/galaxyproject/galaxy/commit/6732bea22dbd67b8f3ad02c813... Author: thoba <lose.thoba(a)gmail.com&gt; Date: 2016-07-13 (Wed, 13 Jul 2016) Changed paths: M .ci/py3_sources.txt M Makefile M README.rst M client/bower.json M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/libs/backbone.js M client/galaxy/scripts/libs/bootstrap-tour.js M client/galaxy/scripts/libs/d3.js M client/galaxy/scripts/libs/jquery/jquery.js M client/galaxy/scripts/libs/jquery/jquery.migrate.js M client/galaxy/scripts/libs/raven.js M client/galaxy/scripts/libs/require.js R client/galaxy/scripts/libs/tracekit.js M client/galaxy/scripts/libs/underscore.js M client/galaxy/scripts/mvc/collection/collection-li.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/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-model.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-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-model.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.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js R client/galaxy/scripts/mvc/tool/tool-template.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/ui/popup-menu.js M client/galaxy/scripts/mvc/ui/ui-frames.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.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/utils/metrics-logger.js M client/galaxy/scripts/utils/utils.js M client/galaxy/scripts/viz/trackster/painters.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/style/less/base.less M client/galaxy/style/less/frame.less M client/galaxy/style/less/library.less M client/galaxy/style/less/ui.less M client/grunt-tasks/install-libs.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/job_conf.xml.sample_advanced M config/plugins/interactive_environments/jupyter/config/jupyter.xml M config/tool_conf.xml.sample M contrib/galaxy_config_merger.py M contrib/nagios/check_galaxy.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py A display_applications/igv/bigwig.xml M doc/source/dev/faq.rst M doc/source/releases/16.01.rst A doc/source/releases/16.04.rst M doc/source/releases/16.04_announce.rst A doc/source/releases/16.07_announce.rst M doc/source/releases/index.rst M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/checkers.py M lib/galaxy/datatypes/converters/bed_to_gff_converter.py M lib/galaxy/datatypes/converters/fastq_to_fqtoc.py M lib/galaxy/datatypes/converters/fastqsolexa_to_fasta_converter.py M lib/galaxy/datatypes/converters/fastqsolexa_to_qual_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/interval_to_coverage.py M lib/galaxy/datatypes/converters/lped_to_fped_converter.py M lib/galaxy/datatypes/converters/lped_to_pbed_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/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/converters/picard_interval_list_to_bed6_converter.py M lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/dataproviders/column.py M lib/galaxy/datatypes/dataproviders/line.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/registry.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/NuBBE_1_obabel_3D.pdbqt M lib/galaxy/datatypes/text.py M lib/galaxy/datatypes/tracks.py M lib/galaxy/datatypes/triples.py M lib/galaxy/datatypes/util/gff_util.py M lib/galaxy/datatypes/xml.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/external_services/actions.py M lib/galaxy/external_services/parameters.py M lib/galaxy/external_services/service.py M lib/galaxy/forms/forms.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/deferred/__init__.py M lib/galaxy/jobs/deferred/data_transfer.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/mapper.py M lib/galaxy/jobs/metrics/collectl/processes.py M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py A lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/splitters/multi.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/base.py M lib/galaxy/managers/citations.py M lib/galaxy/managers/context.py M lib/galaxy/managers/folders.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/hdcas.py M lib/galaxy/managers/histories.py M lib/galaxy/managers/libraries.py M lib/galaxy/managers/roles.py M lib/galaxy/managers/sharable.py M lib/galaxy/managers/tags.py M lib/galaxy/managers/users.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/migrate/versions/0001_initial_tables.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/0023_page_published_and_deleted_columns.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/0030_history_slug_column.py M lib/galaxy/model/migrate/versions/0031_community_and_workflow_tags.py M lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.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/0042_workflow_invocation_fix.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/0054_visualization_dbkey.py M lib/galaxy/model/migrate/versions/0055_add_pja_assoc_for_jobs.py M lib/galaxy/model/migrate/versions/0056_workflow_outputs.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/0061_tasks.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/0076_fix_form_values_data_corruption.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/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/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 A lib/galaxy/model/migrate/versions/0132_add_lastpasswordchange_to_user.py M lib/galaxy/model/tool_shed_install/mapping.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/openid/providers.py M lib/galaxy/security/__init__.py M lib/galaxy/security/passwords.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py A lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/cwl/cwltool_deps.py M lib/galaxy/tools/cwl/parser.py M lib/galaxy/tools/cwl/schema.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/commands.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/errors.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py A lib/galaxy/tools/filter_failed_collection.xml A lib/galaxy/tools/flatten_collection.xml 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/lint.py M lib/galaxy/tools/linters/general.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dataset_matcher.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/sanitize.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/parser/cwl.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/test.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/tools/toolbox/watcher.py A lib/galaxy/tools/unzip_collection.xml M lib/galaxy/tools/util/maf_utilities.py A lib/galaxy/tools/verify/__init__.py A lib/galaxy/tools/verify/asserts/__init__.py A lib/galaxy/tools/verify/asserts/tabular.py A lib/galaxy/tools/verify/asserts/text.py A lib/galaxy/tools/verify/asserts/xml.py A lib/galaxy/tools/verify/test_data.py M lib/galaxy/tools/wrappers.py A lib/galaxy/tools/zip_collection.xml M lib/galaxy/util/__init__.py R lib/galaxy/util/backports/importlib/__init__.py M lib/galaxy/util/checkers.py R lib/galaxy/util/directory_hash.py M lib/galaxy/util/inflection.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/data_providers/phyloviz/newickparser.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/config_parser.py M lib/galaxy/visualization/plugins/registry.py M lib/galaxy/visualization/plugins/resource_parser.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/base/pluginframework.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/proxy/js/lib/proxy.js M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/api/datatypes.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/group_roles.py M lib/galaxy/webapps/galaxy/api/group_users.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/quotas.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/api/search.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/visualizations.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/async.py M lib/galaxy/webapps/galaxy/controllers/biostar.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/tag.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/api/categories.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/api/repository_revisions.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/hg.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/controllers/repository_review.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/webapps/tool_shed/model/__init__.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/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/security/__init__.py M lib/galaxy/webapps/tool_shed/util/hgweb_config.py M lib/galaxy/workflow/extract.py M lib/galaxy/workflow/modules.py M lib/galaxy_ext/metadata/set_metadata.py M lib/galaxy_utils/sequence/fastq.py M lib/galaxy_utils/sequence/vcf.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/repository/relation_builder.py M lib/tool_shed/galaxy_install/dependency_display.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/installed_repository_manager.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/migrate/common.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/env_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/env_file_builder.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/galaxy_install/tool_migration_manager.py M lib/tool_shed/galaxy_install/tools/data_manager.py M lib/tool_shed/galaxy_install/tools/tool_panel_manager.py M lib/tool_shed/galaxy_install/update_repository_manager.py M lib/tool_shed/galaxy_install/utility_containers/__init__.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/grids/util.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/repository_registry.py M lib/tool_shed/repository_types/metadata.py M lib/tool_shed/tool_shed_registry.py M lib/tool_shed/tools/data_table_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/tools/tool_version_manager.py M lib/tool_shed/util/basic_util.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/common_util.py M lib/tool_shed/util/container_util.py M lib/tool_shed/util/hg_util.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/readme_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_dependency_util.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M lib/tool_shed/util/xml_util.py M lib/tool_shed/utility_containers/__init__.py M lib/tool_shed/utility_containers/utility_container_manager.py M run_tests.sh M scripts/api/data_manager_example_execute.py M scripts/api/example_watch_folder.py A scripts/api/filter_failed_datasets_from_collection.py M scripts/api/form_create_from_xml.py M scripts/api/history_create_history.py M scripts/api/history_delete_history.py M scripts/api/import_library_dataset_to_history.py M scripts/api/import_workflows_from_installed_tool_shed_repository.py M scripts/api/library_create_folder.py M scripts/api/library_create_library.py M scripts/api/library_upload_from_import_dir.py M scripts/api/load_data_with_metadata.py M scripts/api/repair_tool_shed_repository.py M scripts/api/request_type_create_from_xml.py M scripts/api/requests_update_state.py M scripts/api/sample_dataset_update_status.py M scripts/api/sample_update_state.py M scripts/api/search.py M scripts/api/sequencer_configuration_create.py M scripts/api/upload_to_history.py M scripts/api/workflow_delete.py M scripts/api/workflow_execute.py M scripts/api/workflow_import.py M scripts/api/workflow_import_from_file_rpark.py M scripts/bootstrap_history.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/check_python.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/cleanup_datasets/populate_uuid.py 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/common_startup.sh M scripts/data_libraries/build_lucene_index.py M scripts/data_libraries/build_whoosh_index.py M scripts/db_shell.py M scripts/drmaa_external_killer.py M scripts/drmaa_external_runner.py M scripts/extract_dataset_part.py M scripts/fetch_eggs.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/harvest_bacteria.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/runtime_stats.py M scripts/set_dataset_sizes.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/import_capsule.py M scripts/tool_shed/api/reset_metadata_on_repositories.py M scripts/tool_shed/build_ts_whoosh_index.py M scripts/tool_shed/check_download_urls.py M scripts/tool_shed/check_s3_for_empty_tool_dependency_installation_paths.py M scripts/tool_shed/deprecate_repositories_without_metadata.py M scripts/tools/maf/check_loc_file.py M scripts/transfer.py M setup.cfg M static/maps/layout/scratchbook.js.map M static/maps/libs/backbone.js.map M static/maps/libs/bootstrap-tour.js.map M static/maps/libs/d3.js.map M static/maps/libs/jquery/jquery.js.map M static/maps/libs/jquery/jquery.migrate.js.map M static/maps/libs/raven.js.map M static/maps/libs/require.js.map R static/maps/libs/tracekit.js.map M static/maps/libs/underscore.js.map M static/maps/mvc/collection/collection-li.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/dataset/data.js.map M static/maps/mvc/dataset/dataset-model.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-section.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-model.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.js.map M static/maps/mvc/library/library-foldertoolbar-view.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-template.js.map M static/maps/mvc/tool/tools.js.map M static/maps/mvc/ui/popup-menu.js.map M static/maps/mvc/ui/ui-frames.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.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/utils/metrics-logger.js.map M static/maps/utils/utils.js.map M static/maps/viz/trackster/painters.js.map M static/maps/viz/trackster/tracks.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/layout/scratchbook.js M static/scripts/libs/backbone.js M static/scripts/libs/bootstrap-tour.js M static/scripts/libs/d3.js M static/scripts/libs/jquery/jquery.js M static/scripts/libs/jquery/jquery.migrate.js M static/scripts/libs/raven.js M static/scripts/libs/require.js R static/scripts/libs/tracekit.js M static/scripts/libs/underscore.js M static/scripts/mvc/collection/collection-li.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/dataset/data.js M static/scripts/mvc/dataset/dataset-model.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-section.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.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.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/tool/tool-template.js M static/scripts/mvc/tool/tools.js M static/scripts/mvc/ui/popup-menu.js M static/scripts/mvc/ui/ui-frames.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.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/utils/metrics-logger.js M static/scripts/utils/utils.js M static/scripts/viz/trackster/painters.js M static/scripts/viz/trackster/tracks.js M static/style/blue/base.css M static/style/blue/library.css M templates/admin/tool_shed_repository/repair_repository.mako M templates/base.mako M templates/base/base_panels.mako M templates/js-app.mako M templates/show_params.mako M templates/user/change_password.mako M templates/webapps/galaxy/dataset/copy_view.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/library/common/import_datasets_to_histories.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/editor_tool_form.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako M templates/webapps/tool_shed/repository/common.mako A test-data/biom1_metadata_test.txt A test-data/composite_output_expected_log A test-data/input_taxonomy.biom1 M test/api/helpers.py M test/api/test_datasets.py M test/api/test_tool_data.py M test/api/test_tools.py M test/api/test_workflow_extraction.py M test/api/test_workflows.py M test/api/test_workflows_from_yaml.py R test/base/asserts/__init__.py R test/base/asserts/tabular.py R test/base/asserts/text.py R test/base/asserts/xml.py M test/base/driver_util.py M test/base/interactor.py R test/base/test_data.py M test/base/twilltestcase.py M test/casperjs/casperjs_runner.py M test/casperjs/server_env.py M test/functional/test_data_managers.py M test/functional/test_toolbox.py A test/functional/tools/checksum.xml M test/functional/tools/composite_output.xml A test/functional/tools/composite_output_tests.xml A test/functional/tools/exit_code_from_file.xml A test/functional/tools/identifier_collection.xml A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/functional/tools/simple_constructs.yml M test/qunit/test-app.js M test/qunit/test-common.js M test/qunit/test-data/fakeserver.js R test/qunit/test-libs/qunit-1.14.0.css R test/qunit/test-libs/qunit-1.14.0.js A test/qunit/test-libs/qunit-1.23.1.css A test/qunit/test-libs/qunit-1.23.1.js A test/qunit/test-libs/sinon-1.17.3.js R test/qunit/test-libs/sinon-1.9.1.js M test/qunit/tests/form_tests.js M test/qunit/tests/list-of-pairs-collection-creator.js M test/qunit/tests/metrics-logger.js M test/qunit/tests/modal_tests.js M test/qunit/tests/page_tests.js M test/qunit/tests/ui_tests.html M test/qunit/tests/ui_tests.js M test/qunit/tests/workflow_editor_tests.js M test/shed_functional/base/twilltestcase.py M test/shed_functional/functional/test_0000_basic_repository_features.py M test/shed_functional/functional/test_0060_workflows.py M test/shed_functional/functional/test_0100_complex_repository_dependencies.py M test/shed_functional/functional/test_0170_complex_prior_installation_required.py M test/shed_functional/functional/test_0300_reset_all_metadata.py M test/shed_functional/functional/test_0310_hg_api_features.py M test/shed_functional/functional/test_1000_install_basic_repository.py M test/shed_functional/functional/test_1060_install_repository_with_workflow.py M test/shed_functional/functional/test_1120_install_repository_with_complex_dependencies.py M test/shed_functional/functional/test_1190_complex_prior_installation_required.py M test/shed_functional/functional/test_1300_reset_all_metadata.py M test/shed_functional/functional/test_1420_tool_dependency_environment_inheritance.py M test/shed_functional/functional_tests.py M test/unit/datatypes/dataproviders/test_base_dataproviders.py M test/unit/datatypes/dataproviders/test_line_dataproviders.py M test/unit/managers/base.py M test/unit/managers/test_CollectionManager.py M test/unit/managers/test_DatasetManager.py M test/unit/managers/test_HDAManager.py M test/unit/managers/test_HDCAManager.py M test/unit/managers/test_HistoryContentsManager.py M test/unit/managers/test_HistoryManager.py M test/unit/managers/test_UserManager.py M test/unit/test_galaxy_mapping.py M test/unit/tools/test_actions.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_execution.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_select_parameters.py M test/unit/tools/test_toolbox.py M test/unit/unittest_utils/galaxy_mock.py M test/unit/visualizations/plugins/test_VisualizationPlugin.py M test/unit/visualizations/plugins/test_VisualizationsRegistry.py M test/unit/web/base/test_HookPluginManager.py M test/unit/web/base/test_PageServingPluginManager.py M test/unit/web/base/test_PluginManager.py M test/unit/web/framework/test_webapp.py M test/unit/workflows/test_run_parameters.py M tool_list.py M tools/data_source/data_source.py M tools/data_source/fetch.py M tools/data_source/genbank.py M tools/data_source/hbvar_filter.py M tools/data_source/import.py M tools/data_source/microbial_import.py M tools/data_source/microbial_import_code.py M tools/data_source/upload.py M tools/evolution/add_scores.py M tools/extract/extract_genomic_dna.py M tools/extract/liftOver_wrapper.py M tools/filters/axt_to_concat_fasta.xml M tools/filters/axt_to_fasta.xml M tools/filters/axt_to_lav.py M tools/filters/axt_to_lav.xml M tools/filters/bed2gff.xml M tools/filters/bed_to_bigbed.xml M tools/filters/bed_to_gff_converter.py M tools/filters/gff/extract_GFF_Features.py M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff2bed.xml M tools/filters/gff_to_bed_converter.py M tools/filters/gtf2bedgraph.xml M tools/filters/gtf_to_bedgraph_converter.py M tools/filters/join.py M tools/filters/joinWrapper.py M tools/filters/lav_to_bed.py M tools/filters/mergeCols.py M tools/filters/sff_extract.py M tools/filters/sorter.py M tools/filters/wiggle_to_simple.py M tools/genomespace/genomespace_exporter.py M tools/genomespace/genomespace_file_browser.py M tools/maf/interval_maf_to_merged_fasta.py M tools/maf/maf_split_by_species.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_fasta_concat.py M tools/maf/maf_to_fasta_multiple_sets.py M tools/metag_tools/blat_wrapper.py M tools/metag_tools/shrimp_color_wrapper.py M tools/metag_tools/shrimp_wrapper.py M tools/next_gen_conversion/fastq_conversions.py M tools/next_gen_conversion/fastq_gen_conv.py M tools/next_gen_conversion/solid_to_fastq.py M tools/ngs_simulation/ngs_simulation.py M tools/phenotype_association/pagetag.py M tools/phenotype_association/senatag.py M tools/solid_tools/maq_cs_wrapper.py M tools/solid_tools/solid_qual_stats.py M tools/sr_assembly/velveth_wrapper.py M tools/sr_mapping/bfast_wrapper.py M tools/stats/aggregate_scores_in_intervals.py M tools/stats/filtering.py M tools/stats/filtering.xml M tools/stats/grouping.py M tools/stats/gsummary.py M tools/stats/gsummary.xml M tox.ini Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into dev Commit: 4ae93fc0f2f3963a138947511db48febf71d37fc https://github.com/galaxyproject/galaxy/commit/4ae93fc0f2f3963a138947511d... Author: thoba <lose.thoba(a)gmail.com&gt; Date: 2016-07-13 (Wed, 13 Jul 2016) Changed paths: M .gitignore M config/plugins/interactive_environments/neo/config/allowed_images.yml.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/neo/templates/neo.mako M lib/galaxy/web/proxy/__init__.py Log Message: ----------- Removed extra proxy_command arg Added Newline Commit: 23f8aab6c6f462b4a343101bd95ed46a63005d16 https://github.com/galaxyproject/galaxy/commit/23f8aab6c6f462b4a343101bd9... Author: thoba <lose.thoba(a)gmail.com&gt; Date: 2016-07-14 (Thu, 14 Jul 2016) Changed paths: M config/plugins/interactive_environments/neo/config/neo.ini.sample Log Message: ----------- Default to internals. Commit: 79b325403094942dfde7d62afeab5a426d6259aa https://github.com/galaxyproject/galaxy/commit/79b325403094942dfde7d62afe... Author: Thoba Lose <thobalose(a)users.noreply.github.com&gt; Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M config/plugins/interactive_environments/neo/config/allowed_images.yml.sample Log Message: ----------- Added Docker image tag Commit: d7a1776a91051b70d2be08b04681083053419cb4 https://github.com/galaxyproject/galaxy/commit/d7a1776a91051b70d2be08b046... Author: Eric Rasche <rasche.eric(a)gmail.com&gt; Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: A config/plugins/interactive_environments/neo/config/allowed_images.yml.sample A config/plugins/interactive_environments/neo/config/neo.ini.sample A config/plugins/interactive_environments/neo/config/neo.xml A config/plugins/interactive_environments/neo/static/js/neo.js A config/plugins/interactive_environments/neo/templates/neo.mako Log Message: ----------- Merge pull request #2610 from thobalose/dev Added Neo4j IE Compare: https://github.com/galaxyproject/galaxy/compare/a731ce2e2225...d7a1776a9105