You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/08/20 22:08:15 UTC
[5/5] incubator-guacamole-client git commit: GUACAMOLE-77: Merge
username fix for current vs existing users.
GUACAMOLE-77: Merge username fix for current vs existing users.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/39a25db5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/39a25db5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/39a25db5
Branch: refs/heads/master
Commit: 39a25db594612899f6191474d26dd11a69500589
Parents: 54f38b1 20459ec
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sat Aug 20 15:07:07 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sat Aug 20 15:07:07 2016 -0700
----------------------------------------------------------------------
.../jdbc/sharing/user/SharedUserContext.java | 7 ++--
.../src/main/resources/translations/en.json | 8 ++++
.../rest/session/UserContextResource.java | 28 +++++++++++++
.../rest/user/UserDirectoryResource.java | 33 ---------------
.../app/rest/services/permissionService.js | 43 +++++++++++++++++++-
5 files changed, 81 insertions(+), 38 deletions(-)
----------------------------------------------------------------------