GUACAMOLE-292: Merge user profile base support.
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/3beedd10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3beedd10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3beedd10 Branch: refs/heads/master Commit: 3beedd10af8548a83c8f2e5374438e16d0fafe90 Parents: be3bc6c 203afd1 Author: James Muehlner <[email protected]> Authored: Sun May 28 11:01:47 2017 -0700 Committer: James Muehlner <[email protected]> Committed: Sun May 28 11:01:47 2017 -0700 ---------------------------------------------------------------------- .../guacamole/auth/jdbc/user/ModeledUser.java | 68 ++++++++++++ .../guacamole/auth/jdbc/user/UserModel.java | 111 +++++++++++++++++++ .../src/main/resources/translations/en.json | 3 +- .../schema/001-create-schema.sql | 6 + .../schema/upgrade/upgrade-pre-0.9.13.sql | 10 ++ .../guacamole/auth/jdbc/user/UserMapper.xml | 62 ++++++++--- .../schema/001-create-schema.sql | 6 + .../schema/upgrade/upgrade-pre-0.9.13.sql | 10 ++ .../guacamole/auth/jdbc/user/UserMapper.xml | 64 ++++++++--- .../org/apache/guacamole/form/EmailField.java | 37 +++++++ .../java/org/apache/guacamole/form/Field.java | 6 + .../org/apache/guacamole/net/auth/User.java | 32 ++++++ .../webapp/app/form/services/formService.js | 10 ++ .../webapp/app/form/templates/emailField.html | 8 ++ .../src/main/webapp/app/index/styles/input.css | 4 +- .../webapp/app/manage/styles/attributes.css | 1 + .../app/manage/styles/connection-parameter.css | 1 + .../app/navigation/directives/guacUserMenu.js | 58 +++++++++- .../webapp/app/navigation/navigationModule.js | 1 + .../webapp/app/navigation/styles/user-menu.css | 15 +++ .../app/navigation/templates/guacUserMenu.html | 7 ++ .../src/main/webapp/app/rest/types/Field.js | 8 ++ .../src/main/webapp/app/rest/types/User.js | 40 +++++++ guacamole/src/main/webapp/translations/en.json | 9 ++ 24 files changed, 538 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
