Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7b9cd447004daedca6e18b4e97a67fce8c0667e0 https://github.com/galaxyproject/galaxy/commit/7b9cd447004daedca6e18b4e97a67... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-18 (Wed, 18 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml A config/plugins/tours/test.yaml M lib/galaxy/tours/__init__.py Log Message: ----------- Added tour groups for more clarity if there are a lot of tours. Commit: d9045deea69e74590d079b05a1bec02e29a6aa18 https://github.com/galaxyproject/galaxy/commit/d9045deea69e74590d079b05a1bec... Author: selten <selten@users.noreply.github.com> Date: 2017-10-18 (Wed, 18 Oct 2017) Changed paths: R config/plugins/tours/test.yaml Log Message: ----------- Delete test.yaml Accidentally added file to GIT for design checking. Commit: dea036f66a790444a3aae473617bf48d4a1b4827 https://github.com/galaxyproject/galaxy/commit/dea036f66a790444a3aae473617bf... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml M lib/galaxy/tours/__init__.py Log Message: ----------- Use tags instead of groups Commit: 49b9543b77a1419e1bfd13d502239d9c35fe2a1e https://github.com/galaxyproject/galaxy/commit/49b9543b77a1419e1bfd13d502239... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: R config/plugins/tours/test.yaml Log Message: ----------- Merge remote-tracking branch 'origin/dev' into dev Commit: 19445547298d9b9405965cf83a928cc8afaeccf4 https://github.com/galaxyproject/galaxy/commit/19445547298d9b9405965cf83a928... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js Log Message: ----------- Added hiding of tags. Commit: 75117e407e0b03ee2537cd029b8fbbc345c1e7a6 https://github.com/galaxyproject/galaxy/commit/75117e407e0b03ee2537cd029b8fb... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js Log Message: ----------- Make sure description is still shown Commit: a3c00c122c02d3b183c90da83818005fadafda86 https://github.com/galaxyproject/galaxy/commit/a3c00c122c02d3b183c90da838180... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-parameters.js M config/datatypes_conf.xml.sample M config/plugins/webhooks/demo/tour_generator/static/script.js A lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/jobs/handler.py M lib/galaxy/util/__init__.py M lib/galaxy_ext/metadata/set_metadata.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M static/maps/mvc/form/form-parameters.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev Commit: 4dc97ceb5950ee1bda5c2de2a9e569a7fab2735b https://github.com/galaxyproject/galaxy/commit/4dc97ceb5950ee1bda5c2de2a9e56... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- Build client/formatting. Commit: b777762524ea856962ec3c1c13baa140e9fab766 https://github.com/galaxyproject/galaxy/commit/b777762524ea856962ec3c1c13baa... Author: selten <selten@users.noreply.github.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- Merge pull request #1 from dannon/selten_dev Build client/formatting. Commit: 4fcf2a329f66e29c16898d0c4897f49f20e0fd9a https://github.com/galaxyproject/galaxy/commit/4fcf2a329f66e29c16898d0c4897f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- Untagged tour support/rendering. Commit: df1b7fbf548ad5ffd85b127eb12a3fbead82b7d2 https://github.com/galaxyproject/galaxy/commit/df1b7fbf548ad5ffd85b127eb12a3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- Capitalize tag rendering Commit: 7d1a8d8553765ef72da7c8e500a6ca31647d2ab9 https://github.com/galaxyproject/galaxy/commit/7d1a8d8553765ef72da7c8e500a6c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M config/plugins/tours/core.scratchbook.yaml Log Message: ----------- Minor typo, consistent use of form for 'visualization/visualisation' Commit: 3138e025366dd088a184d952e76cf5e748077711 https://github.com/galaxyproject/galaxy/commit/3138e025366dd088a184d952e76cf... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M client/galaxy/style/less/base.less M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js M static/style/blue/base.css Log Message: ----------- Add a little bit of padding between labels. Commit: f5ae8d26fee5c74fff827cba10fda2b516577353 https://github.com/galaxyproject/galaxy/commit/f5ae8d26fee5c74fff827cba10fda... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml Log Message: ----------- Swap from default to 'core' to be consistent with the namespace of the file. Commit: 32ffcaf990037db4ca58c0071f6aed48bd3abb13 https://github.com/galaxyproject/galaxy/commit/32ffcaf990037db4ca58c0071f6ae... Author: selten <selten@users.noreply.github.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M client/galaxy/style/less/base.less M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js M static/style/blue/base.css Log Message: ----------- Merge pull request #2 from dannon/selten_dev A few more tweaks to tours Commit: b3866bae1623cd8c67cee8fd787fc823e1da31c9 https://github.com/galaxyproject/galaxy/commit/b3866bae1623cd8c67cee8fd787fc... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-25 (Wed, 25 Oct 2017) Changed paths: M .ci/flake8_lint_include_list.txt M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-libraryrow-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/library.less M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/webhooks/demo/tour_generator/helper/__init__.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 lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/containers/docker_model.py M lib/galaxy/datatypes/annotation.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/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/interval_to_fli.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/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/display_applications/application.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/msa.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/qualityscore.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/datatypes/tracks.py M lib/galaxy/datatypes/util/generic_util.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/godocker.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/jobs/runners/pbs.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/runners/state_handler_factory.py M lib/galaxy/jobs/runners/tasks.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/managers/folders.py M lib/galaxy/managers/libraries.py M lib/galaxy/managers/library_datasets.py M lib/galaxy/managers/users.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.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/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0042_workflow_invocation_fix.py M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py M lib/galaxy/model/migrate/versions/0061_tasks.py M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/sample_tracking/external_service_types.py M lib/galaxy/sample_tracking/request_types.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/dictifiable.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/image_util.py M lib/galaxy/util/object_wrapper.py A lib/galaxy/util/path/__init__.py A lib/galaxy/util/path/ntpath.py A lib/galaxy/util/path/posixpath.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/error.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/forms.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/groups.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/api/request_types.py M lib/galaxy/webapps/galaxy/api/requests.py M lib/galaxy/webapps/galaxy/api/roles.py M lib/galaxy/webapps/galaxy/api/samples.py M lib/galaxy/webapps/galaxy/api/tool_data.py M lib/galaxy/webapps/galaxy/api/users.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/dataset.py R lib/galaxy/webapps/galaxy/controllers/external_service.py R lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webapps/galaxy/controllers/library_common.py R lib/galaxy/webapps/galaxy/controllers/request_type.py R lib/galaxy/webapps/galaxy/controllers/requests.py R lib/galaxy/webapps/galaxy/controllers/requests_admin.py R lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/system.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/migrate/check.py M lib/galaxy_ext/metadata/set_metadata.py M lib/psyco_full.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.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/grids/util.py M lib/tool_shed/managers/groups.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/admin_util.py M lib/tool_shed/util/basic_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M scripts/bootstrap_history.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/drmaa_external_runner.py M scripts/helper.py M scripts/loc_files/create_all_fasta_loc.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/create_nib_seq_loc_file.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.py M scripts/microbes/ncbi_to_ucsc.py M scripts/microbes/util.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/paster.py M scripts/rst2html.py M scripts/runtime_stats.py M scripts/tool_shed/migrate_tools_to_repositories.py M setup.cfg M static/maps/galaxy.interactive_environments.js.map M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/libs/backbone.js.map M static/maps/libs/bibtex.js.map M static/maps/libs/d3.js.map A static/maps/libs/jquery/jquery.complexify.js.map M static/maps/libs/jquery/jquery.cookie.js.map M static/maps/libs/jquery/jquery.js.map M static/maps/libs/jquery/jquery.migrate.js.map M static/maps/libs/jquery/jquery.mousewheel.js.map M static/maps/libs/raven.js.map M static/maps/libs/require.js.map M static/maps/libs/underscore.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-folderrow-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-libraryrow-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/utils/utils.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/galaxy.interactive_environments.js M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-libraryrow-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/utils/utils.js M static/style/blue/base.css M static/style/blue/library.css R templates/admin/external_service/common.mako R templates/admin/external_service/create_external_service.mako R templates/admin/external_service/edit_external_service.mako R templates/admin/external_service/grid.mako R templates/admin/external_service/reload_external_service_types.mako R templates/admin/external_service/view_external_service.mako R templates/admin/request_type/common.mako R templates/admin/request_type/create_request_type.mako R templates/admin/request_type/edit_request_type.mako R templates/admin/request_type/grid.mako R templates/admin/request_type/request_type_permissions.mako R templates/admin/request_type/view_request_type.mako R templates/admin/requests/grid.mako R templates/admin/requests/reject.mako R templates/admin/requests/rename_datasets.mako R templates/admin/requests/sample_datasets_grid.mako R templates/admin/requests/view_sample_dataset.mako R templates/admin/tool_shed_repository/repair_repository.mako M templates/admin/tool_shed_repository/repository_actions_menu.mako M templates/webapps/galaxy/admin/center.mako R templates/webapps/galaxy/requests/common/add_samples.mako R templates/webapps/galaxy/requests/common/common.mako R templates/webapps/galaxy/requests/common/create_request.mako R templates/webapps/galaxy/requests/common/edit_basic_request_info.mako R templates/webapps/galaxy/requests/common/edit_samples.mako R templates/webapps/galaxy/requests/common/find_samples.mako R templates/webapps/galaxy/requests/common/index.mako R templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako R templates/webapps/galaxy/requests/common/sample_datasets.mako R templates/webapps/galaxy/requests/common/sample_state.mako R templates/webapps/galaxy/requests/common/view_request.mako R templates/webapps/galaxy/requests/common/view_request_history.mako R templates/webapps/galaxy/requests/common/view_sample.mako R templates/webapps/galaxy/requests/common/view_sample_datasets.mako R templates/webapps/galaxy/requests/common/view_sample_history.mako R templates/webapps/galaxy/requests/find_samples_index.mako R templates/webapps/galaxy/requests/grid.mako R templates/webapps/galaxy/requests/index.mako M test/base/testcase.py M test/functional/twilltestcase.py M test/shed_functional/base/twilltestcase.py M test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py M test/shed_functional/functional/test_1430_repair_installed_repository.py M test/unit/managers/test_UserManager.py M test/unit/tools/test_tool_deps.py M tools/data_source/data_source.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/codingSnps_filter.py M tools/extract/extract_genomic_dna.py M tools/extract/liftOver_wrapper.py M tools/filters/axt_to_lav.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_to_bed_converter.py M tools/filters/gtf_to_bedgraph_converter.py M tools/filters/join.py M tools/filters/lav_to_bed_code.py M tools/filters/mergeCols.py M tools/filters/sff_extract.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/genomespace/genomespace_importer.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_stats.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_bed.py M tools/maf/vcf_to_maf_customtrack.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/solid2fastq.py M tools/plotting/bar_chart.py M tools/solid_tools/maq_cs_wrapper.py M tools/solid_tools/solid_qual_stats.py M tools/sr_mapping/bfast_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: ----------- Ensure Galaxy doesn't crash when a tour is malformed. Commit: 89e843730e23ee46a6152a4683f37d99d1251cc0 https://github.com/galaxyproject/galaxy/commit/89e843730e23ee46a6152a4683f37... Author: Peter Selten <peter.selten98@gmail.com> Date: 2017-10-25 (Wed, 25 Oct 2017) Changed paths: M lib/galaxy/tours/__init__.py Log Message: ----------- Ensure galaxy can boot even with a malformed tour. Commit: 7b3235a71cc229988a3641c27a8d05712aa8171f https://github.com/galaxyproject/galaxy/commit/7b3235a71cc229988a3641c27a8d0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Rebuild client. Commit: de9f8a6094f0bc4eac9b038c0ba9efdfbd0c61bc https://github.com/galaxyproject/galaxy/commit/de9f8a6094f0bc4eac9b038c0ba9e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/style/less/base.less M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml M lib/galaxy/tours/__init__.py M static/maps/mvc/tours.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js M static/style/blue/base.css Log Message: ----------- Merge branch 'selten/dev' into dev Compare: https://github.com/galaxyproject/galaxy/compare/862212ad40f4...de9f8a6094f0