commit d3206062959cff83223957c1bf98154535baf6a5
author Nick Couchman <vnick@apache.org> Sat Sep 08 18:42:08 2018 -0400
committer Nick Couchman <vnick@apache.org> Sat Sep 08 18:42:08 2018 -0400
tree f5910791502f70b5ed3828c6c3bfa270e99646bc
parent af0f8ea27ff8c33c7f25ffc1f56b9af09f6be56f
parent 248e64531da5232aeb7ea47f0933d51967cc467d

Merge 1.0.0 changes to master.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java

diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
index b54ba90..054caf0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
@@ -38,6 +38,11 @@
         CREATE_USER,
 
         /**
+         * Create user groups.
+         */
+        CREATE_USER_GROUP,
+
+        /**
          * Create connections.
          */
         CREATE_CONNECTION,

guacamole/src/main/webapp/app/rest/types/PermissionSet.js

diff --git a/guacamole/src/main/webapp/app/rest/types/PermissionSet.js b/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
index 2bc2e9e..9dd1ac8 100644
--- a/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
+++ b/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
@@ -143,6 +143,11 @@
         CREATE_USER : "CREATE_USER",
 
         /**
+         * Permission to create new user groups.
+         */
+        CREATE_USER_GROUP : "CREATE_USER_GROUP",
+
+        /**
          * Permission to create new connections.
          */
         CREATE_CONNECTION : "CREATE_CONNECTION",