Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 55956fe2ca49fe9a1d1a8fc52b221e6fc05e07a6 https://github.com/galaxyproject/galaxy/commit/55956fe2ca49fe9a1d1a8fc52b221... Author: Tim Thompson <tim.thompson@xdbio.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Expose 4 more rows from the galaxy_user table to help out sys admins doing user management via the API Commit: e320fd4a2009aa4c155d0cbbdd549a9f07295108 https://github.com/galaxyproject/galaxy/commit/e320fd4a2009aa4c155d0cbbdd549... Author: XDtim <tim.thompson@xdbio.com> Date: 2017-07-03 (Mon, 03 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Impliment review comments from @nsoranzo Commit: 57d5b485b505f64fa9035a1c739c4030ae8951d9 https://github.com/galaxyproject/galaxy/commit/57d5b485b505f64fa9035a1c739c4... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-04 (Tue, 04 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge remote-tracking branch 'XDtim/dev' into users_api Commit: d9607684ef7d880e213d4e08d07ed2582875e286 https://github.com/galaxyproject/galaxy/commit/d9607684ef7d880e213d4e08d07ed... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/users.py A test/integration/test_config_options_users.py Log Message: ----------- Tweak exposing user attributes to use an include list instead of exclude list. This allows for the addition of new dictifiable attributes on user like in 55956fe2ca49fe9a1d1a8fc52b221e6fc05e07a6 without exposing these attributes to non-admin users. Commit: dab07a67151e59ae989c6dd07ea272a03acdb36b https://github.com/galaxyproject/galaxy/commit/dab07a67151e59ae989c6dd07ea27... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/api/users.py A test/integration/test_config_options_users.py Log Message: ----------- Merge pull request #4274 from jmchilton/users_api Expose more user properties to admins via the API. Compare: https://github.com/galaxyproject/galaxy/compare/9eb3c0f40a42...dab07a67151e