[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit 4df22ce67bdafc028ed0042cd277b3de6264f7aa Merge: a78186e f2ae848 Author: Michael Jumper AuthorDate: Fri Jun 7 09:01:40 2019 -0700 Merge 1.1.0 changes back to master. .../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(-) diff --cc guacamole/pom.xml index 3834b63,7a68606..5552e4b --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@@ -494,13 -494,13 +494,20 @@@ + + +com.google.guava +guava +27.0.1-jre + + + + + org.webjars.npm + jstz + 1.0.10 + +
[guacamole-client] branch master updated (a78186e -> 4df22ce)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from a78186e Merge 1.1.0 changes back to master.
add 8b443dc GUACAMOLE-422: Add timezone selection for RDP connections.
add ea913c9 GUACAMOLE-422: Implement client-side timezone detection.
add 50c2161 GUACAMOLE-422: Add tunnel parameter for sending the timezone.
add 8ad65d6 GUACAMOLE-422: Add field for timezone for SSH connections.
add 047ed7a GUACAMOLE-422: Add timezone to tunnel connections.
add f1bce51 GUACAMOLE-422: Correct javadoc tag.
add 0968145 GUACAMOLE-422: Revert weird addition of timezone field in
JDBC module.
add 5ac98e4 GUACAMOLE-422: Remove extra space in pom.xml
add d194e07 GUACAMOLE-422: Add timezone instruction to handshake, remove
kludge from JDBC module.
add d3e00ab GUACAMOLE-422: Only send timezone if it's there.
add c5a7ab7 GUACAMOLE-422: Implement protocol version support in the
client.
add 644e69d GUACAMOLE-422: Tweak to checking for protocol version.
add 0f4ff0f GUACAMOLE-422: Clean up style and extra code.
add 377e93c GUACAMOLE-422: Fix assignment of protocol version value in
socket.
add 381bca0 GUACAMOLE-422: Add JSTZ license.
add d534a70 GUACAMOLE-422: Update documentation and style; tweaks to
GuacamoleProtocolVersion implementation.
add ed7a99a GUACAMOLE-422: More documentation updates.
add 74c07c8 GUACAMOLE-422: Implement GuacamoleProtocolCapability enum.
add f4b41e8 GUACAMOLE-422: Use null exclusively for missing timezone.
add 12ea1cb GUACAMOLE-422: Document valid timezone values for setting
timezone.
add 7860416 GUACAMOLE-422: Fix JSTZ license information.
add 06315a8 GUACAMOLE-422: Fix JSTZ license information, round 2.
add dd9062a GUACAMOLE-422: Update comments and internals of protocol
methods.
add b069858 GUACAMOLE-422: Resolve commit conflict due to translation
updates.
add 3c1f64e GUACAMOLE-422: Update timezone format comments in AngularJS
component.
add 1e13bdd GUACAMOLE-422: Implement retrieval of most compatible version.
add f2ae848 GUACAMOLE-422: Merge support for forwarding client timezone
at Guacamole protocol level.
new 4df22ce Merge 1.1.0 changes back to master.
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:
.../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 +++
.../LICENSE| 35 +--
.../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, 515 insertions(+), 26 deletions(-)
create mode 100644
guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolCapability.java
create mode 100644
guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java
copy guacamole/src/licenses/bundled/{datalist-polyfill-1.14.0 =>
jstz-1.0.10}/LICENSE (55%)
[guacamole-client] 01/01: GUACAMOLE-422: Merge support for forwarding client timezone at Guacamole protocol level.
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 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(-)
[guacamole-client] branch staging/1.1.0 updated (4f340d9 -> f2ae848)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 4f340d9 GUACAMOLE-807: Merge correct handling of parameter tokens
within LDAP.
add 8b443dc GUACAMOLE-422: Add timezone selection for RDP connections.
add ea913c9 GUACAMOLE-422: Implement client-side timezone detection.
add 50c2161 GUACAMOLE-422: Add tunnel parameter for sending the timezone.
add 8ad65d6 GUACAMOLE-422: Add field for timezone for SSH connections.
add 047ed7a GUACAMOLE-422: Add timezone to tunnel connections.
add f1bce51 GUACAMOLE-422: Correct javadoc tag.
add 0968145 GUACAMOLE-422: Revert weird addition of timezone field in
JDBC module.
add 5ac98e4 GUACAMOLE-422: Remove extra space in pom.xml
add d194e07 GUACAMOLE-422: Add timezone instruction to handshake, remove
kludge from JDBC module.
add d3e00ab GUACAMOLE-422: Only send timezone if it's there.
add c5a7ab7 GUACAMOLE-422: Implement protocol version support in the
client.
add 644e69d GUACAMOLE-422: Tweak to checking for protocol version.
add 0f4ff0f GUACAMOLE-422: Clean up style and extra code.
add 377e93c GUACAMOLE-422: Fix assignment of protocol version value in
socket.
add 381bca0 GUACAMOLE-422: Add JSTZ license.
add d534a70 GUACAMOLE-422: Update documentation and style; tweaks to
GuacamoleProtocolVersion implementation.
add ed7a99a GUACAMOLE-422: More documentation updates.
add 74c07c8 GUACAMOLE-422: Implement GuacamoleProtocolCapability enum.
add f4b41e8 GUACAMOLE-422: Use null exclusively for missing timezone.
add 12ea1cb GUACAMOLE-422: Document valid timezone values for setting
timezone.
add 7860416 GUACAMOLE-422: Fix JSTZ license information.
add 06315a8 GUACAMOLE-422: Fix JSTZ license information, round 2.
add dd9062a GUACAMOLE-422: Update comments and internals of protocol
methods.
add b069858 GUACAMOLE-422: Resolve commit conflict due to translation
updates.
add 3c1f64e GUACAMOLE-422: Update timezone format comments in AngularJS
component.
add 1e13bdd GUACAMOLE-422: Implement retrieval of most compatible version.
new f2ae848 GUACAMOLE-422: Merge support for forwarding client timezone
at Guacamole protocol level.
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:
.../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 +++
.../LICENSE| 35 +--
.../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, 515 insertions(+), 26 deletions(-)
create mode 100644
guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolCapability.java
create mode 100644
guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java
copy guacamole/src/licenses/bundled/{datalist-polyfill-1.14.0 =>
jstz-1.0.10}/LICENSE (55%)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 a78186ee2e2079f4787039bb0e243ed4c4c878c5 Merge: 0344ef3 4f340d9 Author: Virtually Nick AuthorDate: Fri Jun 7 11:49:13 2019 -0400 Merge 1.1.0 changes back to master. .../org/apache/guacamole/auth/ldap/connection/ConnectionService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[guacamole-client] branch master updated (0344ef3 -> a78186e)
This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from 0344ef3 GUACAMOLE-805: Merge more robust handling of OpenID "id_token" parameter add 1c1fac7 GUACAMOLE-807: Correct handling of parameter tokens within LDAP. add 4f340d9 GUACAMOLE-807: Merge correct handling of parameter tokens within LDAP. new a78186e Merge 1.1.0 changes back to master. 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: .../org/apache/guacamole/auth/ldap/connection/ConnectionService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[guacamole-client] branch staging/1.1.0 updated (65a7802 -> 4f340d9)
This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch staging/1.1.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from 65a7802 GUACAMOLE-422: Merge switch to TIMEZONE field type for RDP/SSH "timezone" parameter. add 1c1fac7 GUACAMOLE-807: Correct handling of parameter tokens within LDAP. new 4f340d9 GUACAMOLE-807: Merge correct handling of parameter tokens within LDAP. 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: .../org/apache/guacamole/auth/ldap/connection/ConnectionService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[guacamole-client] 01/01: GUACAMOLE-807: Merge correct handling of parameter tokens within LDAP.
This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch staging/1.1.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit 4f340d9c6e2d2819b94a12b4ef65d83622269d00 Merge: 65a7802 1c1fac7 Author: Virtually Nick AuthorDate: Fri Jun 7 11:46:09 2019 -0400 GUACAMOLE-807: Merge correct handling of parameter tokens within LDAP. .../org/apache/guacamole/auth/ldap/connection/ConnectionService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
