This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from 5e4079bd6 Merge main branch changes to next.
add 17f16428f GUACAMOLE-1479: Correct AbstractUserGroup to actually be an
abstract class.
add beacffbfc GUACAMOLE-1479: Implement the disabled methods in
guacamole-ext User and UserGroup classes.
add 75250148b GUACAMOLE-1479: Implement the disabled methods for User and
UserGroup in REST API.
add 015117f07 GUACAMOLE-1479: Switch JDBC module to use disabled methods
instead of attributes.
add 61457686e GUACAMOLE-1479: Update front-end styles and translations for
disabled users and user groups.
add 732a4c576 GUACAMOLE-1479: Move disabled methods up to new Disableable
interface.
add 9a8a5f331 GUACAMOLE-1479: Merge change to styling of disabled
users/groups.
new 3143f010d Merge changes from main branch to next.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../guacamole/auth/jdbc/user/ModeledUser.java | 38 +++++------------
.../auth/jdbc/usergroup/ModeledUserGroup.java | 41 ++++++-------------
.../src/main/resources/translations/ca.json | 3 --
.../src/main/resources/translations/de.json | 5 +--
.../src/main/resources/translations/en.json | 3 --
.../src/main/resources/translations/es.json | 3 --
.../src/main/resources/translations/fr.json | 3 --
.../src/main/resources/translations/ja.json | 4 +-
.../src/main/resources/translations/ko.json | 3 --
.../src/main/resources/translations/pl.json | 3 --
.../src/main/resources/translations/pt.json | 3 --
.../src/main/resources/translations/ru.json | 3 --
.../src/main/resources/translations/zh.json | 3 --
.../guacamole/net/auth/AbstractUserGroup.java | 2 +-
.../apache/guacamole/net/auth/DelegatingUser.java | 10 +++++
.../guacamole/net/auth/DelegatingUserGroup.java | 10 +++++
.../auth/{Identifiable.java => Disableable.java} | 39 +++++++++---------
.../java/org/apache/guacamole/net/auth/User.java | 2 +-
.../org/apache/guacamole/net/auth/UserGroup.java | 2 +-
.../src/app/manage/templates/manageUser.html | 4 ++
.../src/app/manage/templates/manageUserGroup.html | 4 ++
.../src/app/manage/types/ManageableUser.js | 11 +++++
.../src/main/frontend/src/app/rest/types/User.js | 7 ++++
.../main/frontend/src/app/rest/types/UserGroup.js | 7 ++++
.../src/app/settings/styles/user-group-list.css | 12 ++++--
.../frontend/src/app/settings/styles/user-list.css | 8 +++-
.../app/settings/templates/settingsUserGroups.html | 2 +-
.../src/app/settings/templates/settingsUsers.html | 2 +-
.../src/main/frontend/src/translations/ca.json | 2 +
.../src/main/frontend/src/translations/de.json | 2 +
.../src/main/frontend/src/translations/en.json | 2 +
.../src/main/frontend/src/translations/es.json | 2 +
.../src/main/frontend/src/translations/fr.json | 2 +
.../src/main/frontend/src/translations/ja.json | 2 +
.../src/main/frontend/src/translations/ko.json | 2 +
.../src/main/frontend/src/translations/pl.json | 2 +
.../src/main/frontend/src/translations/pt.json | 2 +
.../src/main/frontend/src/translations/ru.json | 2 +
.../src/main/frontend/src/translations/zh.json | 6 ++-
.../org/apache/guacamole/rest/user/APIUser.java | 47 +++++++++++++++++++---
.../apache/guacamole/rest/user/APIUserWrapper.java | 10 +++++
.../guacamole/rest/user/UserObjectTranslator.java | 3 ++
.../guacamole/rest/usergroup/APIUserGroup.java | 27 +++++++++++++
.../rest/usergroup/APIUserGroupWrapper.java | 10 +++++
.../rest/usergroup/UserGroupObjectTranslator.java | 3 ++
45 files changed, 238 insertions(+), 125 deletions(-)
copy
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/{Identifiable.java =>
Disableable.java} (56%)
