Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 243f7a5be29afba188fbd03c7651c6e3cecf02ab https://github.com/galaxyproject/galaxy/commit/243f7a5be29afba188fbd03c7651c... Author: Mark Iskander <motiontracker@gmail.com> Date: 2015-11-20 (Fri, 20 Nov 2015) Changed paths: A lib/galaxy/datatypes/converters/bcfgz_to_bcf_converter.py A lib/galaxy/datatypes/converters/bcfgz_to_bcf_converter.xml Log Message: ----------- Added bcf_bgzip to bcf converter Commit: f800494eebd3238f7d22b4c0d77795d4e65672a2 https://github.com/galaxyproject/galaxy/commit/f800494eebd3238f7d22b4c0d7779... Author: Mark Iskander <motiontracker@gmail.com> Date: 2015-11-20 (Fri, 20 Nov 2015) Changed paths: 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/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/dataset/dataset-choice.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/history-panel.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/job/job-li.js M client/galaxy/scripts/mvc/list/list-panel.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/toolshed/scripts/mvc/groups/group-detail-view.js M client/toolshed/scripts/mvc/groups/group-listrow-view.js M lib/galaxy/util/xml_macros.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/external_service.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webapps/galaxy/controllers/library_admin.py M lib/galaxy/webapps/galaxy/controllers/request_type.py M lib/galaxy/webapps/galaxy/controllers/requests_admin.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/reports/controllers/sample_tracking.py M lib/galaxy/webapps/reports/controllers/workflows.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/grids/repository_review_grids.py M static/maps/galaxy-app-base.js.map M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/dataset/dataset-choice.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/history-panel.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/job/job-li.js M static/scripts/mvc/list/list-panel.js M static/scripts/mvc/ui/ui-select-default.js M test/unit/tools/test_tool_loader.py Log Message: ----------- Merge branch 'dev' into bcfgz_to_bcf_converter Commit: 6cd550e0c7844cf89289f8ff25b9e3995b2d0bac https://github.com/galaxyproject/galaxy/commit/6cd550e0c7844cf89289f8ff25b9e... Author: Mark Iskander <motiontracker@gmail.com> Date: 2015-11-20 (Fri, 20 Nov 2015) Changed paths: M doc/source/lib/galaxy.datatypes.converters.rst A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf.py A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf.xml R lib/galaxy/datatypes/converters/bcfgz_to_bcf_converter.py R lib/galaxy/datatypes/converters/bcfgz_to_bcf_converter.xml Log Message: ----------- Added the bcf_bgzip_to_bcf converter to datatype.converters.rst, renamed files to follow standard naming scheme Commit: 39070a33c02b27107dd9eac9419f30d3cde4b489 https://github.com/galaxyproject/galaxy/commit/39070a33c02b27107dd9eac9419f3... Author: Mark Iskander <motiontracker@gmail.com> Date: 2015-11-20 (Fri, 20 Nov 2015) Changed paths: M lib/galaxy/managers/workflows.py M lib/galaxy/tools/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/workflow/extract.py M lib/galaxy/workflow/modules.py Log Message: ----------- Merge branch 'dev' into bcfgz_to_bcf_converter Commit: 825a20ef8138d04b25ebb5bea907abe23abc889d https://github.com/galaxyproject/galaxy/commit/825a20ef8138d04b25ebb5bea907a... Author: Mark Iskander <motiontracker@gmail.com> Date: 2015-11-20 (Fri, 20 Nov 2015) Changed paths: M config/datatypes_conf.xml.sample M doc/source/lib/galaxy.datatypes.converters.rst R lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf.py R lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf.xml A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.py A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.xml A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.py A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.xml Log Message: ----------- Modified more names, added bcf_bgzip to datatypes, added converters going both ways Commit: 016fd38e72eeb6466c10f36fe5cba9fe6d820775 https://github.com/galaxyproject/galaxy/commit/016fd38e72eeb6466c10f36fe5cba... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-01-06 (Wed, 06 Jan 2016) Changed paths: M config/datatypes_conf.xml.sample M doc/source/lib/galaxy.datatypes.converters.rst A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.py A lib/galaxy/datatypes/converters/bcf_bgzip_to_bcf_converter.xml A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.py A lib/galaxy/datatypes/converters/bcf_to_bcf_bgzip_converter.xml Log Message: ----------- Merge pull request #1148 from markiskander/bcfgz_to_bcf_converter Bcf.gz to bcf (and reverse) converters + bcf_bgzip data type Compare: https://github.com/galaxyproject/galaxy/compare/b4fe6e2c3d9b...016fd38e72ee