Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 055f180d20bfe70c0edd7f550e0332b0a79e228f https://github.com/galaxyproject/galaxy/commit/055f180d20bfe70c0edd7f550e033... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-01-22 (Fri, 22 Jan 2016) Changed paths: M lib/galaxy/managers/annotatable.py M lib/galaxy/managers/base.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/deletable.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/histories.py M lib/galaxy/managers/pages.py M lib/galaxy/managers/ratable.py M lib/galaxy/managers/sharable.py M lib/galaxy/managers/visualizations.py M lib/galaxy/webapps/galaxy/api/histories.py Log Message: ----------- Managers: fix sharable.list_published's incorrect use of query, add manager getter to base serializer, deserializer, and filter parser; Managers, ratable: implement and attach to history Commit: de42737c44d93684f3b6e83b385beab2c0a5ea21 https://github.com/galaxyproject/galaxy/commit/de42737c44d93684f3b6e83b385be... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-01-22 (Fri, 22 Jan 2016) Changed paths: M client/galaxy/scripts/mvc/list/list-view.js 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 static/maps/mvc/list/list-view.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/list/list-view.js M templates/show_params.mako M test/docker/base/run_test_wrapper.sh A test/unit/managers/test_HistoryContentsManager.py M test/unit/managers/test_HistoryManager.py Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into managers.ratable Commit: 4d75d1c6418a363f56700b2f3afd9c32c6d60516 https://github.com/galaxyproject/galaxy/commit/4d75d1c6418a363f56700b2f3afd9... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-01-29 (Fri, 29 Jan 2016) Changed paths: M lib/galaxy/managers/base.py M lib/galaxy/managers/ratable.py M test/unit/managers/test_HistoryManager.py Log Message: ----------- Managers, ratable: clean up, test, and fix Commit: 05a3d04b60bf9512a2fd9ebe07bc978a295e6865 https://github.com/galaxyproject/galaxy/commit/05a3d04b60bf9512a2fd9ebe07bc9... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: M lib/galaxy/managers/annotatable.py M lib/galaxy/managers/base.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/deletable.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/histories.py M lib/galaxy/managers/pages.py M lib/galaxy/managers/ratable.py M lib/galaxy/managers/sharable.py M lib/galaxy/managers/visualizations.py Log Message: ----------- Managers: extract manager() code and move into class with property accessor Commit: d07677bba16d535a67a2e4517f29ab28a8bb6c04 https://github.com/galaxyproject/galaxy/commit/d07677bba16d535a67a2e4517f29a... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: M lib/galaxy/managers/base.py M lib/galaxy/managers/configuration.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/users.py M lib/galaxy/managers/visualizations.py Log Message: ----------- Managers: bit of cleanup for 05a3d04b Commit: 427909929296ccf5c24389aace39057225f4b2da https://github.com/galaxyproject/galaxy/commit/427909929296ccf5c24389aace390... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: A .ci/first_startup.sh M .travis.yml M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/form/form-input.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/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/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/base.less 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/binary.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/dependencies/conda-environment.txt M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.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/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__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/parameters/wrapped.py M lib/galaxy/tools/special_tools.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/heartbeat.py M lib/galaxy/visualization/data_providers/genome.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 M static/maps/layout/menu.js.map M static/maps/layout/page.js.map R static/maps/libs/backbone/backbone.js.map M static/maps/mvc/form/form-input.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/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/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 M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/page.js R static/scripts/libs/backbone/backbone.js M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-section.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/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/user/info.mako M templates/user/username.mako M templates/webapps/galaxy/workflow/editor_tool_form.mako M templates/webapps/galaxy/workflow/run.mako M test-data/3.bam M test/api/test_workflows.py M test/api/workflows_format_2/converter.py A test/functional/tools/for_workflows/1.bam A test/functional/tools/for_workflows/mapper.xml A test/functional/tools/for_workflows/pileup.xml A test/functional/tools/paths_as_file.xml M test/functional/tools/samples_tool_conf.xml 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 M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into managers.ratable Commit: ae372ae33b67fb2b50d45f79dfed1e54452d60d0 https://github.com/galaxyproject/galaxy/commit/ae372ae33b67fb2b50d45f79dfed1... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: M lib/galaxy/managers/base.py M lib/galaxy/managers/configuration.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/histories.py M lib/galaxy/managers/ratable.py M lib/galaxy/managers/sharable.py M lib/galaxy/managers/users.py M lib/galaxy/managers/visualizations.py M lib/galaxy/webapps/galaxy/api/histories.py M test/unit/managers/test_HistoryManager.py Log Message: ----------- Merge pull request #1618 from carlfeberhard/managers.ratable Implement the ratable mixin Compare: https://github.com/galaxyproject/galaxy/compare/eab2f1ff5c53...ae372ae33b67