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/05 04:01:39 UTC

[9/9] incubator-guacamole-client git commit: GUACAMOLE-5: Merge sharing profile permission editing change.

GUACAMOLE-5: Merge sharing profile permission editing change.


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/989ad395
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/989ad395
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/989ad395

Branch: refs/heads/master
Commit: 989ad395132f319a18bfb2b6cf6ed2ff8c0152b1
Parents: 841bc47 f3a201a
Author: James Muehlner <ja...@guac-dev.org>
Authored: Thu Aug 4 21:00:21 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Thu Aug 4 21:00:21 2016 -0700

----------------------------------------------------------------------
 .../rest/connection/APIConnection.java          |  32 ++++
 .../connectiongroup/ConnectionGroupTree.java    | 172 ++++++++++++++++---
 .../app/groupList/directives/guacGroupList.js   |  30 +++-
 .../app/groupList/templates/guacGroupList.html  |  40 ++++-
 .../webapp/app/groupList/types/GroupListItem.js | 105 +++++++++--
 .../webapp/app/home/templates/connection.html   |  24 ++-
 .../src/main/webapp/app/index/styles/lists.css  |  15 +-
 .../src/main/webapp/app/index/styles/ui.css     |  78 +++++++--
 .../manage/controllers/manageUserController.js  |  81 ++++++++-
 .../templates/connectionGroupPermission.html    |   6 +
 .../manage/templates/connectionPermission.html  |   6 +-
 .../webapp/app/manage/templates/manageUser.html |   1 +
 .../templates/sharingProfilePermission.html     |  13 ++
 .../app/rest/services/permissionService.js      |   4 +
 .../main/webapp/app/rest/types/Connection.js    |   9 +
 .../webapp/app/rest/types/PermissionFlagSet.js  |  22 +++
 .../main/webapp/app/rest/types/PermissionSet.js |  88 +++++++++-
 .../app/settings/templates/connection.html      |  24 ++-
 guacamole/src/main/webapp/translations/en.json  |   1 +
 19 files changed, 632 insertions(+), 119 deletions(-)
----------------------------------------------------------------------