Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e505a4f6123f119577955459cda1846b5f67f0b8 https://github.com/galaxyproject/galaxy/commit/e505a4f6123f119577955459cda18... Author: Greg Von Kuster <ghv2@psu.edu> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: A config/plugins/visualizations/csg/config/csg.xml A config/plugins/visualizations/csg/static/Detector.js A config/plugins/visualizations/csg/static/OrbitControls.js A config/plugins/visualizations/csg/static/PLYLoader.js A config/plugins/visualizations/csg/static/VTKLoader.js A config/plugins/visualizations/csg/static/dat.gui.min.js A config/plugins/visualizations/csg/static/three.min.js A config/plugins/visualizations/csg/templates/csg.mako Log Message: ----------- Add the CSG Viewer visualization plugin based on conversations here: https://github.com/galaxyproject/galaxy/issues/1191#issuecomment-162553926 Commit: 80bd59dd90722afb837c01a26b78eebe04dd277b https://github.com/galaxyproject/galaxy/commit/80bd59dd90722afb837c01a26b78e... Author: Greg Von Kuster <ghv2@psu.edu> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/base-mvc.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/polyfills.js M lib/galaxy/managers/base.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py M lib/tool_shed/util/workflow_util.py M run_tests.sh M static/maps/mvc/base-mvc.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view-node.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/polyfills.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/base-mvc.js M static/scripts/mvc/citation/citation-model.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view-node.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/polyfills.js R templates/webapps/galaxy/history/options.mako M templates/webapps/galaxy/workflow/editor_generic_form.mako M test/api/workflows_format_2/converter.py M test/docker/base/run_test_wrapper.sh M test/qunit/tests/workflow_editor_tests.js M test/unit/managers/test_UserManager.py M test/unit/workflows/test_modules.py Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev Commit: 946438ceba25151706ba2ca62e5c488e358c4f55 https://github.com/galaxyproject/galaxy/commit/946438ceba25151706ba2ca62e5c4... Author: Greg Von Kuster <ghv2@psu.edu> Date: 2015-12-15 (Tue, 15 Dec 2015) Changed paths: A .ci/check_controller.sh A .ci/check_mako.sh A Makefile A client/.docker-build.sh A client/Dockerfile M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.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-repeat.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-select-content.js M client/galaxy/scripts/mvc/form/form-view.js A client/galaxy/scripts/mvc/tool/tool-form-base.js A client/galaxy/scripts/mvc/tool/tool-form-composite.js A client/galaxy/scripts/mvc/tool/tool-form-workflow.js A client/galaxy/scripts/mvc/tool/tool-form.js A client/galaxy/scripts/mvc/tool/tool-template.js R client/galaxy/scripts/mvc/tool/tools-form-base.js R client/galaxy/scripts/mvc/tool/tools-form-workflow.js R client/galaxy/scripts/mvc/tool/tools-form.js R client/galaxy/scripts/mvc/tool/tools-jobs.js R client/galaxy/scripts/mvc/tool/tools-template.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/ui/ui-drilldown.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-default.js M client/galaxy/scripts/mvc/ui/ui-slider.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/ui.less M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample M config/plugins/visualizations/charts/static/build-app.js M config/plugins/visualizations/charts/static/library/ui-table-form.js M config/plugins/visualizations/charts/static/views/editor.js M config/reports.ini.sample M config/tool_shed.ini.sample A doc/source/admin/dependency_resolvers.rst M doc/source/admin/index.rst M doc/source/dev/faq.rst M lib/galaxy/datatypes/metadata.py M lib/galaxy/datatypes/text.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/execute.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/util/pastescript/serve.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/reports/config.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/repair_repository_manager.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/util/tool_dependency_util.py A static/maps/galaxy-app-base.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/dataset/dataset-li-edit.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-repeat.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/form/form-select-content.js.map M static/maps/mvc/form/form-view.js.map A static/maps/mvc/tool/tool-form-base.js.map A static/maps/mvc/tool/tool-form-composite.js.map A static/maps/mvc/tool/tool-form-workflow.js.map A static/maps/mvc/tool/tool-form.js.map A static/maps/mvc/tool/tool-template.js.map R static/maps/mvc/tool/tools-form-base.js.map R static/maps/mvc/tool/tools-form-workflow.js.map R static/maps/mvc/tool/tools-form.js.map R static/maps/mvc/tool/tools-jobs.js.map R static/maps/mvc/tool/tools-template.js.map M static/maps/mvc/tool/tools.js.map R static/maps/mvc/tools.js.map R static/maps/mvc/tools/tools-form-base.js.map M static/maps/mvc/ui/ui-drilldown.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-default.js.map M static/maps/mvc/ui/ui-slider.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/utils/utils.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/mvc/citation/citation-model.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js R static/scripts/mvc/collection/paired-collection-creator.js M static/scripts/mvc/dataset/dataset-li-edit.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-repeat.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/form/form-select-content.js M static/scripts/mvc/form/form-view.js R static/scripts/mvc/history/history-panel.js A static/scripts/mvc/tool/tool-form-base.js A static/scripts/mvc/tool/tool-form-composite.js A static/scripts/mvc/tool/tool-form-workflow.js A static/scripts/mvc/tool/tool-form.js A static/scripts/mvc/tool/tool-template.js R static/scripts/mvc/tool/tools-form-base.js R static/scripts/mvc/tool/tools-form-workflow.js R static/scripts/mvc/tool/tools-form.js R static/scripts/mvc/tool/tools-jobs.js R static/scripts/mvc/tool/tools-template.js M static/scripts/mvc/tool/tools.js R static/scripts/mvc/tools.js R static/scripts/mvc/tools/tools-form-base.js M static/scripts/mvc/ui/ui-drilldown.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-portlet.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/ui/ui-slider.js R static/scripts/mvc/upload/upload-row.js M static/scripts/mvc/workflow/workflow-view.js R static/scripts/mvc/workflow/workflow.js M static/scripts/utils/utils.js M static/style/blue/base.css M templates/webapps/galaxy/workflow/editor.mako M templates/webapps/galaxy/workflow/editor_tool_form.mako M templates/webapps/galaxy/workflow/run.mako M test/api/test_tools.py M test/api/test_workflows.py M test/base/interactor.py M test/docker/base/Dockerfile M test/tool_shed/functional/test_1460_data_managers.py M test/unit/tools/test_tool_deps.py M tox.ini Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev Commit: d1fd23a2f4e5c5408f469ee5560f526833f5f682 https://github.com/galaxyproject/galaxy/commit/d1fd23a2f4e5c5408f469ee5560f5... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-15 (Tue, 15 Dec 2015) Changed paths: A config/plugins/visualizations/csg/config/csg.xml A config/plugins/visualizations/csg/static/Detector.js A config/plugins/visualizations/csg/static/OrbitControls.js A config/plugins/visualizations/csg/static/PLYLoader.js A config/plugins/visualizations/csg/static/VTKLoader.js A config/plugins/visualizations/csg/static/dat.gui.min.js A config/plugins/visualizations/csg/static/three.min.js A config/plugins/visualizations/csg/templates/csg.mako Log Message: ----------- Merge pull request #1254 from gregvonkuster/dev Add the CSG Viewer visualization plugin Compare: https://github.com/galaxyproject/galaxy/compare/7b11ebc52e30...d1fd23a2f4e5