You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/08/14 23:39:51 UTC
[13/13] guacamole-client git commit: Merge 1.0.0 changes back to
master.
Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/7d822df5
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/7d822df5
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/7d822df5
Branch: refs/heads/master
Commit: 7d822df5a3b040bf61d1055fe7bffaf1996c0983
Parents: a34bbcf 402ddb5
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Aug 14 19:38:16 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Aug 14 19:38:16 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/app/manage/directives/systemPermissionEditor.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/app/navigation/services/userPageService.js
----------------------------------------------------------------------
diff --cc guacamole/src/main/webapp/app/navigation/services/userPageService.js
index a9f849b,f5bc308..2af426e
--- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js
+++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
@@@ -194,8 -192,10 +194,9 @@@ angular.module('navigation').factory('u
var pages = [];
var canManageUsers = [];
+ var canManageUserGroups = [];
var canManageConnections = [];
var canViewConnectionRecords = [];
- var canManageSessions = [];
// Inspect the contents of each provided permission set
angular.forEach(authenticationService.getAvailableDataSources(), function inspectPermissions(dataSource) {
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/index.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7d822df5/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------