Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: db63b131c1728493a87901764c102dbc47f74f3f https://github.com/galaxyproject/galaxy/commit/db63b131c1728493a87901764c102... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-15 (Tue, 15 Nov 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- Fix styling, we don't need to force rounded edges here.

Commit: ca24098883fda1c35241d4c380f8b0765de7bb95 https://github.com/galaxyproject/galaxy/commit/ca24098883fda1c35241d4c380f8b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-15 (Tue, 15 Nov 2016)

Changed paths: M client/galaxy/style/less/dataset.less M static/style/blue/base.css

Log Message: ----------- Remove unused style, we can rely on the :last pseudoclasses for this.

Commit: f8974acba2884dc2fc1728aaa81021708ad05493 https://github.com/galaxyproject/galaxy/commit/f8974acba2884dc2fc1728aaa8102... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-15 (Tue, 15 Nov 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- Fix styling when only one visualization type exists

Commit: ce320b66ea1de3c15f4f080f19a729b1ff2087cb https://github.com/galaxyproject/galaxy/commit/ce320b66ea1de3c15f4f080f19a72... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-28 (Mon, 28 Nov 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- A bit of refactoring, handling of unavailable tools or tools with no help. Slight style changes.

Commit: 29cf7187233bbd031f07df4584f1bef55de612e4 https://github.com/galaxyproject/galaxy/commit/29cf7187233bbd031f07df4584f1b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-28 (Mon, 28 Nov 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- Minor styling tweaks -- todo: swap from inline to class-based.

Commit: 83e1392cf8d875109d121eb9cf13c274659c02b7 https://github.com/galaxyproject/galaxy/commit/83e1392cf8d875109d121eb9cf13c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/style/less/dataset.less M static/maps/mvc/dataset/dataset-li-edit.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 M static/style/blue/base.css

Log Message: ----------- Standard styles inclusion in .less, more styling to match rounded edges and spacing.

Commit: be6a2f8132f3002e0570488a4ad5f80e07b6c2a8 https://github.com/galaxyproject/galaxy/commit/be6a2f8132f3002e0570488a4ad5f... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)

Changed paths: M .ci/flake8_lint_include_list.txt M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/style/less/base.less M client/galaxy/style/less/ui.less M client/galaxy/style/source_material/circle.py M config/galaxy.ini.sample M config/plugins/interactive_environments/rstudio/config/allowed_images.yml.sample M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M config/plugins/tours/core.galaxy_ui.yaml M contrib/galaxy_config_merger.py M contrib/nagios/check_galaxy.py M cron/add_manual_builds.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py M doc/parse_gx_xsd.py M doc/patch.py M lib/galaxy/auth/__init__.py M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/auth/providers/pam_auth.py M lib/galaxy/config.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/constructive_solid_geometry.py M lib/galaxy/datatypes/converters/bed_to_gff_converter.py M lib/galaxy/datatypes/converters/bedgraph_to_array_tree_converter.py M lib/galaxy/datatypes/converters/bgzip.py M lib/galaxy/datatypes/converters/fasta_to_2bit.xml M lib/galaxy/datatypes/converters/fasta_to_len.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/gff_to_interval_index_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/interval_to_fli.py M lib/galaxy/datatypes/converters/interval_to_interval_index_converter.py M lib/galaxy/datatypes/converters/interval_to_tabix_converter.py M lib/galaxy/datatypes/converters/picard_interval_list_to_bed6_converter.py M lib/galaxy/datatypes/converters/pileup_to_interval_index_converter.py M lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/datatypes/converters/tabular_to_dbnsfp.py M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py M lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py M lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py M lib/galaxy/datatypes/display_applications/parameters.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/neo4j.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/triples.py M lib/galaxy/external_services/actions.py M lib/galaxy/external_services/parameters.py M lib/galaxy/external_services/result_handlers/basic.py M lib/galaxy/external_services/service.py M lib/galaxy/forms/forms.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/dynamic_tool_destination.py M lib/galaxy/managers/collections_util.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.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/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/0016_v0015_mysql_index_fix.py M lib/galaxy/model/migrate/versions/0018_ordered_tags_and_page_tags.py M lib/galaxy/model/migrate/versions/0020_library_upload_job.py M lib/galaxy/model/migrate/versions/0026_cloud_tables.py M lib/galaxy/model/migrate/versions/0050_drop_cloud_tables.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0091_add_tool_version_tables.py M lib/galaxy/queue_worker.py M lib/galaxy/sample_tracking/data_transfer.py M lib/galaxy/sample_tracking/request_types.py M lib/galaxy/sample_tracking/sample.py M lib/galaxy/security/passwords.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dataset_matcher.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/util/galaxyops/__init__.py M lib/galaxy/util/pastescript/loadwsgi.py M lib/galaxy/util/pastescript/serve.py M lib/galaxy/version.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/middleware/error.py M lib/galaxy/web/framework/middleware/translogger.py M lib/galaxy/web/framework/openid_manager.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.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/root.py M lib/galaxy/webapps/tool_shed/model/migrate/versions/0013_add_review_tables.py M lib/galaxy/workflow/extract.py M lib/galaxy/workflow/run.py M lib/galaxy/workflow/schedulers/core.py M lib/galaxy_utils/sequence/fastq.py M lib/galaxy_utils/sequence/vcf.py M lib/mimeparse.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/util/workflow_util.py M scripts/api/data_manager_example_execute.py M scripts/api/example_watch_folder.py M scripts/api/import_workflows_from_installed_tool_shed_repository.py M scripts/api/install_tool_shed_repositories.py M scripts/api/load_data_with_metadata.py M scripts/api/repair_tool_shed_repository.py M scripts/api/reset_metadata_on_installed_repositories.py M scripts/api/search.py M scripts/api/sequencer_configuration_create.py M scripts/api/workflow_execute.py M scripts/api/workflow_execute_parameters.py M scripts/api/workflow_import.py M scripts/auth/pam_auth_helper.py M scripts/build_toolbox.py M scripts/build_universe_config.py M scripts/check_galaxy.py M scripts/check_python.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.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/communication/communication_server.py M scripts/create_db.py M scripts/data_libraries/build_lucene_index.py M scripts/data_libraries/build_whoosh_index.py M scripts/drmaa_external_killer.py M scripts/drmaa_external_runner.py M scripts/external_chown_script.py M scripts/extract_dataset_part.py M scripts/extract_toolbox_sections.py M scripts/functional_tests.py M scripts/grt.py M scripts/loc_files/create_all_fasta_loc.py M scripts/manage_db.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.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/summarize_timings.py M scripts/sync_reports_config.py M scripts/tool_shed/api/add_repository_registry_entry.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/import_capsule.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/tools/re_escape_output.py M scripts/transfer.py M scripts/update_shed_config_path.py M static/maps/mvc/form/form-section.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-workflow.js.map M static/maps/mvc/tool/tools.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/form/form-section.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-workflow.js M static/scripts/mvc/tool/tools.js M static/style/blue/base.css M static/welcome.html.sample M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/galaxy/workflow/editor.mako A test-data/bam_from_sam.bam A test-data/sam_with_header.sam M test/api/test_workflows.py M test/api/workflows_format_2/main.py M test/base/api_asserts.py M test/base/driver_util.py A test/functional/tools/sam_to_bam.xml M test/integration/test_resolvers.py M test/manual/workflows_scaling.py M test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py M test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py M test/unit/dataset_collections/test_matching.py M test/unit/datatypes/dataproviders/test_base_dataproviders.py M test/unit/datatypes/dataproviders/test_line_dataproviders.py M test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py M test/unit/jobs/test_command_factory.py M test/unit/jobs/test_job_configuration.py M test/unit/jobs/test_job_output_checker.py M test/unit/jobs/test_job_wrapper.py M test/unit/jobs/test_mapper.py M test/unit/jobs/test_rule_helper.py M test/unit/jobs/test_runner_local.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/shed_unit/test_fabric_util.py M test/unit/shed_unit/test_td_common_util.py M test/unit/shed_unit/test_tool_panel_manager.py M test/unit/test_galaxy_transactions.py M test/unit/test_routes.py M test/unit/tools/test_actions.py M test/unit/tools/test_citations.py M test/unit/tools/test_collect_primary_datasets.py M test/unit/tools/test_column_parameters.py M test/unit/tools/test_conda_resolution.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_evaluation.py M test/unit/tools/test_execution.py M test/unit/tools/test_history_imp_exp.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_select_parameters.py M test/unit/tools/test_tool_external_files.py M test/unit/tools/test_toolbox.py M test/unit/tools/test_wrappers.py M test/unit/unittest_utils/galaxy_mock.py M test/unit/unittest_utils/tempfilecache.py M test/unit/unittest_utils/utility.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_modules.py M test/unit/workflows/test_run_parameters.py M test/unit/workflows/test_workflow_progress.py M test/unit/workflows/workflow_support.py M tools/data_source/data_source.py M tools/data_source/genbank.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_fasta.py M tools/filters/bed_to_gff_converter.py M tools/filters/catWrapper.py M tools/filters/convert_characters.py M tools/filters/gff/extract_GFF_Features.py M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff/gtf_filter_by_attribute_values_list.py M tools/filters/gff_to_bed_converter.py M tools/filters/grep.py 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/random_lines_two_pass.py M tools/filters/randomlines.py M tools/filters/secure_hash_message_digest.py M tools/filters/sorter.py M tools/filters/trimmer.py M tools/filters/ucsc_gene_bed_to_exon_bed.py M tools/filters/ucsc_gene_bed_to_intron_bed.py M tools/filters/ucsc_gene_table_to_intervals.py M tools/filters/uniq.py M tools/filters/wiggle_to_simple.py M tools/genomespace/genomespace_exporter.py M tools/genomespace/genomespace_file_browser.py M tools/genomespace/genomespace_importer.py M tools/maf/interval2maf.py M tools/maf/interval_maf_to_merged_fasta.py M tools/maf/maf_by_block_number.py M tools/maf/maf_filter.py M tools/maf/maf_limit_size.py M tools/maf/maf_limit_to_species.py M tools/maf/maf_reverse_complement.py M tools/maf/maf_split_by_species.py M tools/maf/maf_stats.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_bed.py M tools/maf/maf_to_fasta_multiple_sets.py M tools/maf/maf_to_interval.py M tools/maf/vcf_to_maf_customtrack.py M tools/meme/fimo_wrapper.py M tools/metag_tools/blat_wrapper.py M tools/next_gen_conversion/fastq_conversions.py M tools/next_gen_conversion/fastq_gen_conv.py M tools/next_gen_conversion/solid2fastq.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/sr_mapping/srma_wrapper.py M tools/stats/aggregate_scores_in_intervals.py M tools/stats/filtering.py M tools/stats/grouping.py M tools/stats/gsummary.py

Log Message: ----------- Merge remote-tracking branch 'upstream/release_16.10' into fix_help_history

Commit: 9c435685cded86c36b605bf81eb9bec7f112cce3 https://github.com/galaxyproject/galaxy/commit/9c435685cded86c36b605bf81eb9b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-12-07 (Wed, 07 Dec 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- Don't rely on complex, absolute selector, use local element.find()

Commit: 3ab4e1d742fe08701c1b997bf87f8406d1ccdecb https://github.com/galaxyproject/galaxy/commit/3ab4e1d742fe08701c1b997bf87f8... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-12-14 (Wed, 14 Dec 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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: ----------- The jobs API, which this functionality is based on, requires a logged in user, so prevent anonymous access here. Also shifts to using Galaxy.root correctly, instead of assuming /

Commit: d2ab7e701c87f4292b655893103c7842900a47b5 https://github.com/galaxyproject/galaxy/commit/d2ab7e701c87f4292b655893103c7... Author: Bjoern Gruening bjoern.gruening@gmail.com Date: 2016-12-14 (Wed, 14 Dec 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/style/less/dataset.less M static/maps/mvc/dataset/dataset-li-edit.js.map A static/maps/mvc/user/change-password.js.map A static/maps/mvc/user/extra-information.js.map A static/maps/mvc/user/manage-user-information.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.map M static/scripts/mvc/dataset/dataset-li-edit.js A static/scripts/mvc/user/change-password.js A static/scripts/mvc/user/extra-information.js A static/scripts/mvc/user/manage-user-information.js M static/style/blue/base.css

Log Message: ----------- build the client

Commit: ed4e87ecad31f48ecefa11b7c9a7aae4c71939aa https://github.com/galaxyproject/galaxy/commit/ed4e87ecad31f48ecefa11b7c9a7a... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2016-12-15 (Thu, 15 Dec 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/style/less/dataset.less M static/maps/mvc/dataset/dataset-li-edit.js.map A static/maps/mvc/user/change-password.js.map A static/maps/mvc/user/extra-information.js.map A static/maps/mvc/user/manage-user-information.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/mvc/dataset/dataset-li-edit.js A static/scripts/mvc/user/change-password.js A static/scripts/mvc/user/extra-information.js A static/scripts/mvc/user/manage-user-information.js M static/style/blue/base.css

Log Message: ----------- Merge branch 'release_16.10' into dev

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/bundled/login.bundled.js.map static/style/blue/base.css

Compare: https://github.com/galaxyproject/galaxy/compare/da784093b368...ed4e87ecad31