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 ed8677414 Merge main branch changes to next.
add d07957f79 GUACAMOLE-520: Add mapping of Japanese IME keys.
add d5a27f093 GUACAMOLE-520: Merge mapping of Japanese IME keys.
add b92222c3a GUACAMOLE-600: Add RDP timeout client options.
add 821af60a8 GUACAMOLE-600: Add SSH and SFTP timeout client options.
add 2a97e327f GUACAMOLE-600: Add telnet connection timeout client setting.
add c243af2ad GUACAMOLE-600: Merge settings and translations for timeout
parameters.
add 8ecc64b30 GUACAMOLE-926: Reorder "Import" button to end to avoid
fighting muscle memory.
add 53afb13a8 GUACAMOLE-926: Merge reorder "Import" button to end to avoid
fighting muscle memory.
add 24443d695 GUACAMOLE-1290: Add public key parameter for SSH and SFTP
connections.
add 9884bb2c0 GUACAMOLE-1290: Merge parameter definitions and translations
for SSH public key (cert auth).
add 0bfc20e51 Merge 1.6.0 changes back to patch.
add d3b784dfa Merge changes from patch branch back to main.
new 640362765 Merge changes from main branch back 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-common-js/src/main/webapp/modules/Keyboard.js | 4 +++-
.../main/resources/org/apache/guacamole/protocols/rdp.json | 12 ++++++++++++
.../main/resources/org/apache/guacamole/protocols/ssh.json | 8 ++++++++
.../resources/org/apache/guacamole/protocols/telnet.json | 4 ++++
.../main/resources/org/apache/guacamole/protocols/vnc.json | 8 ++++++++
.../src/app/settings/templates/settingsConnections.html | 8 ++++----
guacamole/src/main/frontend/src/translations/en.json | 12 ++++++++++--
7 files changed, 49 insertions(+), 7 deletions(-)
