GUACAMOLE-220: Merge add user interface for managing user groups and membership.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/402ddb57 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/402ddb57 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/402ddb57 Branch: refs/heads/staging/1.0.0 Commit: 402ddb577f9c7ab204d04640e12d983ecd3f311d Parents: c36d333 7917f46 Author: Nick Couchman <vn...@apache.org> Authored: Tue Aug 14 19:33:02 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Tue Aug 14 19:33:02 2018 -0400 ---------------------------------------------------------------------- guacamole/pom.xml | 4 +- guacamole/src/licenses/LICENSE | 60 ++- .../bundled/jquery-2.1.3/MIT-LICENSE.txt | 21 - .../licenses/bundled/jquery-3.3.1/LICENSE.txt | 36 ++ .../licenses/bundled/lodash-2.4.1/LICENSE.txt | 22 - .../src/licenses/bundled/lodash-4.17.10/LICENSE | 47 ++ .../webapp/app/index/config/indexRouteConfig.js | 9 + .../src/main/webapp/app/index/styles/lists.css | 4 + .../src/main/webapp/app/index/styles/ui.css | 8 + .../manage/controllers/manageUserController.js | 69 ++- .../controllers/manageUserGroupController.js | 538 +++++++++++++++++++ .../app/manage/directives/dataSourceTabs.js | 5 +- .../manage/directives/identifierSetEditor.js | 300 +++++++++++ .../manage/directives/systemPermissionEditor.js | 4 + .../app/manage/styles/manage-user-group.css | 71 +++ .../app/manage/styles/related-objects.css | 82 +++ .../manage/templates/identifierSetEditor.html | 47 ++ .../webapp/app/manage/templates/manageUser.html | 11 + .../app/manage/templates/manageUserGroup.html | 101 ++++ .../app/manage/types/ManageableUserGroup.js | 53 ++ .../app/navigation/services/userPageService.js | 27 + .../webapp/app/rest/services/cacheService.js | 3 +- .../app/rest/services/membershipService.js | 385 +++++++++++++ .../app/rest/services/permissionService.js | 91 ++-- .../webapp/app/rest/services/schemaService.js | 34 ++ .../app/rest/services/userGroupService.js | 223 ++++++++ .../main/webapp/app/rest/types/Connection.js | 2 +- .../webapp/app/rest/types/ConnectionGroup.js | 2 +- .../webapp/app/rest/types/PermissionFlagSet.js | 23 +- .../main/webapp/app/rest/types/PermissionSet.js | 82 ++- .../webapp/app/rest/types/RelatedObjectPatch.js | 85 +++ .../webapp/app/rest/types/SharingProfile.js | 2 +- .../src/main/webapp/app/rest/types/User.js | 2 +- .../src/main/webapp/app/rest/types/UserGroup.js | 59 ++ .../settings/controllers/settingsController.js | 4 +- .../directives/guacSettingsUserGroups.js | 272 ++++++++++ .../settings/directives/guacSettingsUsers.js | 4 +- .../main/webapp/app/settings/styles/buttons.css | 6 + .../app/settings/styles/user-group-list.css | 36 ++ .../webapp/app/settings/templates/settings.html | 1 + .../settings/templates/settingsUserGroups.html | 48 ++ .../images/action-icons/guac-user-group-add.png | Bin 0 -> 1222 bytes .../src/main/webapp/images/arrows/right.png | Bin 0 -> 264 bytes .../images/user-icons/guac-user-group.png | Bin 0 -> 1428 bytes guacamole/src/main/webapp/images/x-red.png | Bin 0 -> 583 bytes guacamole/src/main/webapp/index.html | 4 +- guacamole/src/main/webapp/translations/en.json | 73 ++- 47 files changed, 2854 insertions(+), 106 deletions(-) ----------------------------------------------------------------------