Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 20f18793cd53c6c0c5c43838b7368eb14809188e https://github.com/galaxyproject/galaxy/commit/20f18793cd53c6c0c5c43838b7368... Author: Zipho Mashologu <zipho@trustpay.biz> Date: 2016-02-01 (Mon, 01 Feb 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/manage_repository.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- added resolver dependency display to the tool view page Commit: 95cb53a2fb28c214a9191ba2f8758914efe1d151 https://github.com/galaxyproject/galaxy/commit/95cb53a2fb28c214a9191ba2f8758... Author: Zipho Mashologu <zipho@trustpay.biz> Date: 2016-02-02 (Tue, 02 Feb 2016) Changed paths: M .travis.yml M client/galaxy/scripts/mvc/form/form-select-content.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/list/list-view.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/visualization/visualization-model.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/onload.js M client/galaxy/style/less/library.less M client/galaxy/style/less/tour.less M config/galaxy.ini.sample M config/plugins/visualizations/charts/Gruntfile.js M config/plugins/visualizations/charts/templates/charts.mako M config/plugins/visualizations/scatterplot/templates/scatterplot.mako A doc/source/admin/framework_dependencies.rst M doc/source/admin/index.rst M doc/source/project/issues.rst A doc/source/releases/16.01.rst M doc/source/releases/16.01_announce.rst A doc/source/releases/16.04_announce.rst M doc/source/releases/index.rst M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/datatypes/interval.py A lib/galaxy/dependencies/conda-environment.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/managers/base.py M lib/galaxy/managers/containers.py M lib/galaxy/managers/histories.py A lib/galaxy/managers/history_contents.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/linters/inputs.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/special_tools.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/heartbeat.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/work/context.py M lib/galaxy/workflow/extract.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/scheduling_manager.py M lib/tool_shed/galaxy_install/install_manager.py M scripts/bootstrap_history.py M scripts/common_startup.sh R static/maps/libs/backbone/backbone.js.map M static/maps/mvc/form/form-select-content.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/list/list-view.js.map M static/maps/mvc/tours.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/visualization/visualization-model.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/onload.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 R static/scripts/libs/backbone/backbone.js M static/scripts/mvc/form/form-select-content.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/list/list-view.js M static/scripts/mvc/tours.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/visualization/visualization-model.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/onload.js M static/style/blue/base.css M static/style/blue/library.css M templates/show_params.mako M templates/webapps/galaxy/workflow/editor_tool_form.mako M templates/webapps/galaxy/workflow/run.mako M test/api/test_workflows.py M test/api/workflows_format_2/converter.py M test/docker/base/run_test_wrapper.sh A test/functional/tools/for_workflows/1.bam A test/functional/tools/for_workflows/mapper.xml A test/functional/tools/for_workflows/pileup.xml M test/functional/tools/samples_tool_conf.xml A test/unit/managers/test_HistoryContentsManager.py M test/unit/managers/test_HistoryManager.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_evaluation.py M test/unit/tools/test_execution.py M test/unit/tools/test_select_parameters.py M test/unit/tools_support.py M tools/data_source/upload.xml Log Message: ----------- Merge branch 'dev' into resolver_dependencies Commit: 0a440f60ae3f9443599eb234f32fa3c149f05c61 https://github.com/galaxyproject/galaxy/commit/0a440f60ae3f9443599eb234f32fa... Author: Zipho Mashologu <zipho@trustpay.biz> Date: 2016-02-02 (Tue, 02 Feb 2016) Changed paths: M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- fixed variable names and making user feedback friendlier Commit: 7a60f669fa5fd9603ddbf30153cb8e17dbe8a1a8 https://github.com/galaxyproject/galaxy/commit/7a60f669fa5fd9603ddbf30153cb8... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/manage_repository.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge pull request #1632 from zipho/resolver_dependencies added resolver dependency display to the tool view page Compare: https://github.com/galaxyproject/galaxy/compare/6a3452afff49...7a60f669fa5f