This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.1.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit f2ae848b1bea0163749c017d3ce6b3fe59cd6eef Merge: 4f340d9 1e13bdd Author: Mike Jumper <mjum...@apache.org> AuthorDate: Fri Jun 7 08:53:49 2019 -0700 GUACAMOLE-422: Merge support for forwarding client timezone at Guacamole protocol level. .../protocol/ConfiguredGuacamoleSocket.java | 30 ++- .../protocol/GuacamoleClientInformation.java | 31 +++ .../protocol/GuacamoleProtocolCapability.java | 77 +++++++ .../protocol/GuacamoleProtocolVersion.java | 250 +++++++++++++++++++++ .../org/apache/guacamole/protocols/rdp.json | 4 + .../org/apache/guacamole/protocols/ssh.json | 6 +- guacamole/pom.xml | 7 + guacamole/src/licenses/LICENSE | 30 +++ guacamole/src/licenses/bundled/jstz-1.0.10/LICENSE | 22 ++ .../org/apache/guacamole/tunnel/TunnelRequest.java | 18 +- .../guacamole/tunnel/TunnelRequestService.java | 5 + .../main/webapp/app/client/types/ManagedClient.js | 2 + .../app/settings/services/preferenceService.js | 22 +- .../webapp/app/settings/styles/preferences.css | 2 +- .../settings/templates/settingsPreferences.html | 15 +- guacamole/src/main/webapp/index.html | 3 + guacamole/src/main/webapp/translations/en.json | 4 +- 17 files changed, 519 insertions(+), 9 deletions(-)