This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit fb8ce0951ce047b1278700fd776f096b1798f18f
Merge: 262643b d05e379
Author: Virtually Nick <[email protected]>
AuthorDate: Mon Oct 25 07:35:52 2021 -0400

    Merge 1.4.0 changes back to master.

 .../src/main/webapp/modules/Tunnel.js              |  30 +++-
 .../guacamole/servlet/GuacamoleHTTPTunnelMap.java  |  53 +++---
 .../servlet/GuacamoleHTTPTunnelServlet.java        | 196 ++++++++++++++-------
 .../src/app/auth/service/authenticationService.js  |  47 ++++-
 .../app/rest/services/activeConnectionService.js   |  36 +---
 .../app/rest/services/connectionGroupService.js    |  39 +---
 .../src/app/rest/services/connectionService.js     |  51 ++----
 .../src/app/rest/services/historyService.js        |   7 +-
 .../src/app/rest/services/languageService.js       |  10 +-
 .../src/app/rest/services/membershipService.js     |  54 +-----
 .../frontend/src/app/rest/services/patchService.js |  10 +-
 .../src/app/rest/services/permissionService.js     |  28 +--
 .../src/app/rest/services/schemaService.js         |  60 ++-----
 .../src/app/rest/services/sharingProfileService.js |  41 +----
 .../src/app/rest/services/tunnelService.js         |  30 +---
 .../src/app/rest/services/userGroupService.js      |  44 +----
 .../frontend/src/app/rest/services/userService.js  |  52 +-----
 .../apache/guacamole/rest/RESTExceptionMapper.java |  34 +---
 ...SessionResourceFactory.java => TokenParam.java} |  31 ++--
 .../apache/guacamole/rest/TokenParamProvider.java  |  60 +++++++
 .../guacamole/rest/auth/AuthenticationService.java |  43 +++++
 .../guacamole/rest/session/SessionRESTService.java |   6 +-
 .../guacamole/rest/session/SessionResource.java    |  37 +++-
 .../rest/session/SessionResourceFactory.java       |   5 +-
 24 files changed, 485 insertions(+), 519 deletions(-)

Reply via email to