Merge 1.6.0 changes back to patch.

guacamole-common-js/src/main/webapp/modules/Keyboard.js

@@ -471,7 +471,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "CapsLock": [0xFFE5],
         "Cancel": [0xFF69],
         "Clear": [0xFF0B],
-        "Convert": [0xFF21],
+        "Convert": [0xFF23],
         "Copy": [0xFD15],
         "Crsel": [0xFD1C],
         "CrSel": [0xFD1C],
@@ -538,6 +538,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "Left": [0xFF51],
         "Meta": [0xFFE7, 0xFFE7, 0xFFE8],
         "ModeChange": [0xFF7E],
+        "NonConvert": [0xFF22],
         "NumLock": [0xFF7F],
         "PageDown": [0xFF56],
         "PageUp": [0xFF55],
@@ -547,6 +548,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "PrintScreen": [0xFF61],
         "Redo": [0xFF66],
         "Right": [0xFF53],
+        "Romaji": [0xFF24],
         "RomanCharacters": null,
         "Scroll": [0xFF14],
         "Select": [0xFF60],

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json

@@ -12,6 +12,10 @@
                 {
                     "name"  : "port",
                     "type"  : "NUMERIC"
+                },
+                {
+                    "name"  : "timeout",
+                    "type"  : "NUMERIC"
                 }
             ]
         },
@@ -420,6 +424,10 @@
                     "name"  : "sftp-port",
                     "type"  : "NUMERIC"
                 },
+                {
+                    "name"  : "sftp-timeout",
+                    "type"  : "NUMERIC"
+                },
                 {
                     "name"  : "sftp-host-key",
                     "type"  : "TEXT"
@@ -440,6 +448,10 @@
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
                 },
+                {
+                    "name"  : "sftp-public-key",
+                    "type"  : "MULTILINE"
+                },
                 {
                     "name"  : "sftp-root-directory",
                     "type"  : "TEXT"

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json

@@ -16,6 +16,10 @@
                 {
                     "name"  : "host-key",
                     "type"  : "TEXT"
+                },
+                {
+                    "name"  : "timeout",
+                    "type"  : "NUMERIC"
                 }
             ]
         },
@@ -38,6 +42,10 @@
                 {
                     "name"  : "passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "public-key",
+                    "type"  : "MULTILINE"
                 }
             ]
         },

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json

@@ -12,6 +12,10 @@
                 {
                     "name"  : "port",
                     "type"  : "NUMERIC"
+                },
+                {
+                    "name"  : "timeout",
+                    "type"  : "NUMERIC"
                 }
             ]
         },

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json

@@ -175,6 +175,10 @@
                     "name"  : "sftp-port",
                     "type"  : "NUMERIC"
                 },
+                {
+                    "name"  : "sftp-timeout",
+                    "type"  : "NUMERIC"
+                },
                 {
                     "name"  : "sftp-host-key",
                     "type"  : "TEXT"
@@ -195,6 +199,10 @@
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
                 },
+                {
+                    "name"  : "sftp-public-key",
+                    "type"  : "MULTILINE"
+                },
                 {
                     "name"  : "sftp-root-directory",
                     "type"  : "TEXT"

guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html

@@ -9,10 +9,6 @@
         <!-- Form action buttons -->
         <div class="action-buttons">
 
-            <a class="import-connections button"
-                ng-show="canAdminister()"
-                href="#/import/{{dataSource | escape}}/connection/">{{'SETTINGS_CONNECTIONS.ACTION_IMPORT' | translate}}</a>
-
             <a class="add-connection button"
                ng-show="canCreateConnections()"
                href="#/manage/{{dataSource | escape}}/connections/">{{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION' | translate}}</a>
@@ -21,6 +17,10 @@
                ng-show="canCreateConnectionGroups()"
                href="#/manage/{{dataSource | escape}}/connectionGroups/">{{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION_GROUP' | translate}}</a>
 
+            <a class="import-connections button"
+                ng-show="canAdminister()"
+                href="#/import/{{dataSource | escape}}/connection/">{{'SETTINGS_CONNECTIONS.ACTION_IMPORT' | translate}}</a>
+
         </div>
 
         <!-- Connection filter -->

guacamole/src/main/frontend/src/translations/en.json

@@ -636,6 +636,7 @@
         "FIELD_HEADER_SERVER_LAYOUT"   : "Keyboard layout:",
         "FIELD_HEADER_SFTP_DIRECTORY"             : "Default upload directory:",
         "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD"      : "Disable file download:",
+        "FIELD_HEADER_SFTP_DISABLE_UPLOAD"        : "Disable file upload:",
         "FIELD_HEADER_SFTP_HOST_KEY"              : "Public host key (Base64):",
         "FIELD_HEADER_SFTP_HOSTNAME"              : "Hostname:",
         "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
@@ -643,10 +644,12 @@
         "FIELD_HEADER_SFTP_PASSWORD"              : "Password:",
         "FIELD_HEADER_SFTP_PORT"                  : "Port:",
         "FIELD_HEADER_SFTP_PRIVATE_KEY"           : "Private key:",
+        "FIELD_HEADER_SFTP_PUBLIC_KEY"            : "Public key:",
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
-        "FIELD_HEADER_SFTP_DISABLE_UPLOAD"        : "Disable file upload:",
+        "FIELD_HEADER_SFTP_TIMEOUT"               : "SFTP connection timeout:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",
         "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
+        "FIELD_HEADER_TIMEOUT"         : "Connection timeout",
         "FIELD_HEADER_TIMEZONE"        : "Time zone:",
         "FIELD_HEADER_USERNAME"        : "Username:",
         "FIELD_HEADER_WIDTH"           : "Width:",
@@ -741,6 +744,7 @@
         "FIELD_HEADER_PASSPHRASE"    : "Passphrase:",
         "FIELD_HEADER_PORT"          : "Port:",
         "FIELD_HEADER_PRIVATE_KEY"   : "Private key:",
+        "FIELD_HEADER_PUBLIC_KEY"    : "Public key:",
         "FIELD_HEADER_SCROLLBACK"    : "Maximum scrollback size:",
         "FIELD_HEADER_READ_ONLY"     : "Read-only:",
         "FIELD_HEADER_RECORDING_WRITE_EXISTING" : "@:APP.FIELD_HEADER_RECORDING_WRITE_EXISTING",
@@ -754,6 +758,7 @@
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"   : "File browser root directory:",
         "FIELD_HEADER_SFTP_DISABLE_UPLOAD"   : "Disable file upload:",
         "FIELD_HEADER_TERMINAL_TYPE"   : "Terminal type:",
+        "FIELD_HEADER_TIMEOUT"         : "Connection timeout:",
         "FIELD_HEADER_TIMEZONE"        : "Time zone ($TZ):",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
@@ -840,6 +845,7 @@
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
         "FIELD_HEADER_SCROLLBACK"     : "Maximum scrollback size:",
         "FIELD_HEADER_TERMINAL_TYPE"   : "Terminal type:",
+        "FIELD_HEADER_TIMEOUT"         : "Connection timeout:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
         "FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING" : "@:APP.FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING",
@@ -928,6 +934,7 @@
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
         "FIELD_HEADER_SFTP_DIRECTORY"             : "Default upload directory:",
         "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD"      : "Disable file download:",
+        "FIELD_HEADER_SFTP_DISABLE_UPLOAD"        : "Disable file upload:",
         "FIELD_HEADER_SFTP_HOST_KEY"              : "Public host key (Base64):",
         "FIELD_HEADER_SFTP_HOSTNAME"              : "Hostname:",
         "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
@@ -935,8 +942,9 @@
         "FIELD_HEADER_SFTP_PASSWORD"              : "Password:",
         "FIELD_HEADER_SFTP_PORT"                  : "Port:",
         "FIELD_HEADER_SFTP_PRIVATE_KEY"           : "Private key:",
+        "FIELD_HEADER_SFTP_PUBLIC_KEY"            : "Public key:",
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
-        "FIELD_HEADER_SFTP_DISABLE_UPLOAD"        : "Disable file upload:",
+        "FIELD_HEADER_SFTP_TIMEOUT"               : "SFTP connection timeout:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",
         "FIELD_HEADER_SWAP_RED_BLUE"    : "Swap red/blue components:",
         "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:",