Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 255aa0470f44ea90d2b4d738e07b8f6d08874c3b https://github.com/galaxyproject/galaxy/commit/255aa0470f44ea90d2b4d738e07b8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-view.js M static/maps/mvc/workflow/workflow-view.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/workflow/workflow-view.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Fix workflow save-as url not using galaxy's prefix. Commit: c86d2ee8bcbdde82ac5e6f450241ef7fed076665 https://github.com/galaxyproject/galaxy/commit/c86d2ee8bcbdde82ac5e6f450241e... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-view.js M static/maps/mvc/workflow/workflow-view.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/workflow/workflow-view.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge pull request #3610 from dannon/fix-editor-save-as-url [17.01] Fix workflow save-as url not using galaxy's prefix. Commit: 4689cf16bf77b0e7b0d22d193b695d7d5df24d6c https://github.com/galaxyproject/galaxy/commit/4689cf16bf77b0e7b0d22d193b695... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 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: 43d80a0b6052b59f8be768ad810fee952a436ce3 https://github.com/galaxyproject/galaxy/commit/43d80a0b6052b59f8be768ad810fe... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 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: 966d578b47f4999ba0f8db874bf927e5f4246d7f https://github.com/galaxyproject/galaxy/commit/966d578b47f4999ba0f8db874bf92... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Slightly more defensive programming -- we don't expose this in the UI unless there *is* a trans.user, but we might as well be careful here. Commit: 944feb2411d1381b1743f3365b6380e883c9cccb https://github.com/galaxyproject/galaxy/commit/944feb2411d1381b1743f3365b638... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 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: ----------- Minor tooltip tweaks. Commit: c82530fd2384f5df2457e8f5dd33368cc13abc48 https://github.com/galaxyproject/galaxy/commit/c82530fd2384f5df2457e8f5dd333... 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 #3614 from dannon/logout-recalc-backport [17.01] Logout recalc backport and additional logic Commit: 8ce1291359c88148023e5bb3f44a9eb38c78a864 https://github.com/galaxyproject/galaxy/commit/8ce1291359c88148023e5bb3f44a9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-quotameter.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M lib/galaxy/webapps/galaxy/controllers/user.py M static/maps/mvc/user/user-quotameter.js.map M static/maps/mvc/workflow/workflow-view.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 M static/scripts/mvc/workflow/workflow-view.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge branch 'release_17.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/df22e40522d7...8ce1291359c8