Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: efc877ab29b86e897552e4822d0a05c6fa796902 https://github.com/galaxyproject/galaxy/commit/efc877ab29b86e897552e4822d0a0... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.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/visualizations/biojs/phylocanvas/config.js M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js M static/scripts/bundled/admin.bundled.js.map 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 Log Message: ----------- Adding showBootstrap feature for Phylocanvas viz Commit: 065ab584c7bd6fa15c3cadc2cc9ef2ef57921f3b https://github.com/galaxyproject/galaxy/commit/065ab584c7bd6fa15c3cadc2cc9ef... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M .gitignore M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/style/less/ui.less M config/datatypes_conf.xml.sample M lib/galaxy/config.py M lib/galaxy/dataset_collections/matching.py M lib/galaxy/dataset_collections/registry.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/dataset_collections/types/list.py M lib/galaxy/dataset_collections/types/paired.py M lib/galaxy/datatypes/blast.py M lib/galaxy/datatypes/chrominfo.py M lib/galaxy/datatypes/converters/bedgraph_to_array_tree_converter.py M lib/galaxy/datatypes/converters/fasta_to_tabular_converter.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/pbed_ldreduced_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/vcf_to_interval_index_converter.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/coverage.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/dataproviders/chunk.py M lib/galaxy/datatypes/dataproviders/column.py M lib/galaxy/datatypes/dataproviders/dataset.py M lib/galaxy/datatypes/dataproviders/decorators.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/datatypes/dataproviders/hierarchy.py M lib/galaxy/datatypes/dataproviders/line.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/display_applications/parameters.py M lib/galaxy/datatypes/graph.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/neo4j.py M lib/galaxy/datatypes/plant_tribes.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 A lib/galaxy/datatypes/test/1.ptkscmp 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/conda-environment.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/model/__init__.py M lib/galaxy/model/base.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/search.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/model/tool_shed_install/mapping.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/queue_worker.py M lib/galaxy/security/__init__.py M lib/galaxy/security/passwords.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/lineages/__init__.py M lib/galaxy/tools/toolbox/lineages/factory.py M lib/galaxy/tools/toolbox/lineages/interface.py R lib/galaxy/tools/toolbox/lineages/stock.py R lib/galaxy/tools/toolbox/lineages/tool_shed.py A lib/galaxy/util/tool_version.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/users.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/history.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/work/context.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/render.py M lib/galaxy/workflow/run_request.py M lib/galaxy/workflow/scheduling_manager.py M lib/log_tempfile.py M lib/tool_shed/galaxy_install/installed_repository_manager.py M lib/tool_shed/tools/tool_version_manager.py M static/maps/layout/menu.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js M static/style/blue/base.css M templates/base.mako M templates/base/base_panels.mako M templates/display_base.mako M templates/js-app.mako M templates/user/logout.mako M templates/webapps/galaxy/admin/center.mako M templates/webapps/galaxy/base_panels.mako M templates/webapps/galaxy/dataset/display.mako M templates/webapps/galaxy/dataset/errors.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/history/list_published.mako R templates/webapps/galaxy/history/shared_grid.mako M templates/webapps/galaxy/mobile/form.mako M templates/webapps/galaxy/mobile/index.mako M templates/webapps/galaxy/root/tool_runner.mako M templates/webapps/reports/base_panels.mako M templates/webapps/tool_shed/admin/center.mako M templates/webapps/tool_shed/base_panels.mako M templates/webapps/tool_shed/repository/tool_form.mako M test/api/test_dataset_collections.py M test/functional/tools/sample_datatypes_conf.xml A test/integration/test_config_options_users.py A test/unit/shed_unit/test_installed_repository_manager.py M test/unit/shed_unit/test_tool_panel_manager.py M test/unit/tools/test_toolbox.py M test/unit/tools_support.py Log Message: ----------- Merging with dev Commit: 1ecaa06987325100fa9bb0334a9be2d212ee0d9e https://github.com/galaxyproject/galaxy/commit/1ecaa06987325100fa9bb0334a9be... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.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/visualizations/biojs/phylocanvas/config.js M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge pull request #4284 from bgruening/enhancement_phylocanvas Enhancement for Phylocanvas plugin Compare: https://github.com/galaxyproject/galaxy/compare/9a65d9b2ab3f...1ecaa0698732