Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d10f740cff8e3520383c004a16830700b2789c9f https://github.com/galaxyproject/galaxy/commit/d10f740cff8e3520383c004a16830... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py A templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- The user controller functions for changing information were ripped out before providing a way for admin functionality to use the new javascript stuff. Seems nontrivial, so this puts the endpoint back temporarily until the adminjs rewrite which can include the new functionality. Commit: 6f3c8c7447e9a71c580ef9307395cd5dcd314915 https://github.com/galaxyproject/galaxy/commit/6f3c8c7447e9a71c580ef9307395c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- This template inherited field never worked apparently, but nobody noticed. This correctly sets the is_admin flag here. Commit: 4be00d3058396ed30da4f6f0958ad6fa989249cb https://github.com/galaxyproject/galaxy/commit/4be00d3058396ed30da4f6f0958ad... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- Strip out unnecessary user address editing. Commit: 456acf0b84004c85c94d3129f0a89af9be2d5452 https://github.com/galaxyproject/galaxy/commit/456acf0b84004c85c94d3129f0a89... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Update docstring to explicitly mention this as a temporary endpoint. Commit: b46ac475a93fbf0da71272861677a00a3877b91b https://github.com/galaxyproject/galaxy/commit/b46ac475a93fbf0da71272861677a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Fix verbiage in temporary method. Commit: 64036a441284151e1b1a3e9305537d526005ff3a https://github.com/galaxyproject/galaxy/commit/64036a441284151e1b1a3e9305537... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py A templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- Merge pull request #3656 from dannon/admin-userinfo-edit-fix [17.01] Admin user information editing Commit: 0636053901545a26662ed8f42a15bb67407f2231 https://github.com/galaxyproject/galaxy/commit/0636053901545a26662ed8f42a15b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Use pgcalc when possible Commit: 895351cdf8e8867452d28dffb89a2067eabfadb3 https://github.com/galaxyproject/galaxy/commit/895351cdf8e8867452d28dffb89a2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M lib/galaxy/queue_worker.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- initial working async recalc Commit: 45d75e3da55e43a4444c1a7982e1ea31e1aa5cb7 https://github.com/galaxyproject/galaxy/commit/45d75e3da55e43a4444c1a7982e1e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M lib/galaxy/queue_worker.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Encode userid in messages. Commit: c373bf27e79e48bc2e8ba983e9f08abde16db4df https://github.com/galaxyproject/galaxy/commit/c373bf27e79e48bc2e8ba983e9f08... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M lib/galaxy/queue_worker.py Log Message: ----------- Change handling of declare in queue_async_task Commit: 00b1591f05af4743d8b16b7d1bbbbc99a3974adb https://github.com/galaxyproject/galaxy/commit/00b1591f05af4743d8b16b7d1bbbb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Fix inline doc Commit: 5a5dbb97f1e04dfe15fbf71c441eb50ae4b70b11 https://github.com/galaxyproject/galaxy/commit/5a5dbb97f1e04dfe15fbf71c441eb... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-25 (Sat, 25 Feb 2017) Changed paths: M doc/source/releases/17.01_announce.rst Log Message: ----------- improve 17.01 get galaxy release notes Commit: 53c00df805e7ae7e509c08374bc941d31d20000d https://github.com/galaxyproject/galaxy/commit/53c00df805e7ae7e509c08374bc94... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-25 (Sat, 25 Feb 2017) Changed paths: M lib/galaxy/queue_worker.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Rename send_local_controL_task, add at least a tiny bit of documentation. Commit: d4b677bc38b221678bc991e0fddc43622accb928 https://github.com/galaxyproject/galaxy/commit/d4b677bc38b221678bc991e0fddc4... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-02-27 (Mon, 27 Feb 2017) Changed paths: M lib/galaxy/queue_worker.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Merge pull request #3669 from dannon/logout-recalc-improvements [17.01] Logout recalc improvements Commit: 28875de584ac1967a8f2c0cdc8f5fa7b37e70f21 https://github.com/galaxyproject/galaxy/commit/28875de584ac1967a8f2c0cdc8f5f... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M doc/source/releases/17.01_announce.rst Log Message: ----------- Merge pull request #3670 from martenson/fix-RN1701 [17.01] improve 17.01 get galaxy release notes Commit: 0997348a1c0a450986d376a96af024c73d4c7f37 https://github.com/galaxyproject/galaxy/commit/0997348a1c0a450986d376a96af02... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M lib/galaxy/tools/search/__init__.py Log Message: ----------- fix tool search idnex building for tools with / in id and not from TS Commit: c11cb3dd4572e7a4f1f814a31a45477f9ecd5ae9 https://github.com/galaxyproject/galaxy/commit/c11cb3dd4572e7a4f1f814a31a454... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M lib/galaxy/tools/search/__init__.py Log Message: ----------- fix typo spotted by :beer: :eyes: Commit: 169b45b138685164010043be95cefe8148c6f713 https://github.com/galaxyproject/galaxy/commit/169b45b138685164010043be95cef... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Fix step name display for 17.01 Commit: e23facb966c9962bb5bd1fdd07bf6ee28d7d5930 https://github.com/galaxyproject/galaxy/commit/e23facb966c9962bb5bd1fdd07bf6... Author: John Chilton <jmchilton@gmail.com> Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M lib/galaxy/tools/search/__init__.py Log Message: ----------- Merge pull request #3680 from martenson/fix-id-indexing [17.01] fix tool search index building for tools with slash in id and not from TS Commit: 7824cd31fd7b9351efa1cf8274b89b2b9a0d811d https://github.com/galaxyproject/galaxy/commit/7824cd31fd7b9351efa1cf8274b89... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Merge pull request #3681 from guerler/fix_name_display [17.01] Fix step name display for 17.01 Commit: 0b4e52c8e93aa5693f97ff1fc5d0a4c272f58b18 https://github.com/galaxyproject/galaxy/commit/0b4e52c8e93aa5693f97ff1fc5d0a... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M doc/source/releases/17.01_announce.rst M lib/galaxy/queue_worker.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/webapps/galaxy/controllers/user.py A templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- Merge branch 'release_17.01' into dev Conflicts: lib/galaxy/managers/workflows.py Discarded all changes made to lib/galaxy/managers/workflows.py in https://github.com/galaxyproject/galaxy/pull/3681 Compare: https://github.com/galaxyproject/galaxy/compare/f0a26f309dd3...0b4e52c8e93a