Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9bb9feb0a8aeec36ded548aa8d28927e2b26d678 https://github.com/galaxyproject/galaxy/commit/9bb9feb0a8aeec36ded548aa8d289... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-12 (Sun, 12 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Recalculate user disk usage on logout. Not as ideal as just having it be accurate all the time, but it 1) avoids adding yet another control people need to dig for when they need to recalculate, and 2) makes things right when following 'turn it off and on again' Commit: fcbb7c3de17841027da5c2ec16cf11f78e709872 https://github.com/galaxyproject/galaxy/commit/fcbb7c3de17841027da5c2ec16cf1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-12 (Sun, 12 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-quotameter.js M static/maps/mvc/user/user-quotameter.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/user/user-quotameter.js Log Message: ----------- Tooltips to suggest relog for quota correction. Commit: 3f07555173f89f39b4823767daaa25bd92ec7d68 https://github.com/galaxyproject/galaxy/commit/3f07555173f89f39b4823767daaa2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M CONTRIBUTING.md M client/galaxy/scripts/mvc/tool/tool-form-base.js M config/plugins/tours/core.galaxy_ui.yaml M doc/source/slideshow/architecture/galaxy_architecture.md M doc/source/slideshow/architecture/images/hda_dataset.plantuml.svg M doc/source/slideshow/architecture/images/hda_hdca.plantuml.svg M doc/source/slideshow/architecture/images/objectstore.plantuml.svg M doc/source/slideshow/architecture/images/plantuml_options.txt M doc/source/slideshow/architecture/images/server_client.plantuml.svg M doc/source/slideshow/architecture/images/server_client_old.plantuml.svg M doc/source/slideshow/architecture/images/webapp.plantuml.svg M doc/source/slideshow/architecture/style.css M lib/galaxy/datatypes/interval.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/workflow/steps.py M scripts/slideshow/slideshow_template.html 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.map M static/scripts/mvc/tool/tool-form-base.js M templates/admin/reload_tool.mako A test/functional/tools/output_format_deprecated_when.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge branch 'dev' into recalc-on-logout Commit: df22e40522d7777cc3c82a4e32b64fe2d95d9273 https://github.com/galaxyproject/galaxy/commit/df22e40522d7777cc3c82a4e32b64... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-quotameter.js M lib/galaxy/webapps/galaxy/controllers/user.py M static/maps/mvc/user/user-quotameter.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/user/user-quotameter.js Log Message: ----------- Merge pull request #3600 from dannon/recalc-on-logout Recalculate user disk usage on logout. Compare: https://github.com/galaxyproject/galaxy/compare/9597b9b62b66...df22e40522d7