safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing-common-ssh'

Browse Source
This commit is contained in:
Michael Jumper
2015-08-13 16:30:42 -07:00
parent a0199f4bf4 aee787f568
commit 2a88856787
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
View File

@@ -228,6 +228,10 @@
{
"name" : "sftp-passphrase",
"type" : "PASSWORD"
},
{
"name" : "sftp-directory",
"type" : "TEXT"
}
]
}

4
guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
View File

@@ -108,6 +108,10 @@
{
"name" : "sftp-passphrase",
"type" : "PASSWORD"
},
{
"name" : "sftp-directory",
"type" : "TEXT"
}
]
},

6
guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
View File

@@ -250,7 +250,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
// Refresh file browser when any upload completes
$scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
// Refresh filesystem, if it exists
if ($scope.filesystem)
ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
});
}]

2
guacamole/src/main/webapp/translations/en.json
View File

@@ -281,6 +281,7 @@
"FIELD_HEADER_REMOTE_APP" : "Program:",
"FIELD_HEADER_SECURITY" : "Security mode:",
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",
"FIELD_HEADER_SFTP_PASSWORD" : "Password:",
@@ -423,6 +424,7 @@
"FIELD_HEADER_PASSWORD" : "Password:",
"FIELD_HEADER_PORT" : "Port:",
"FIELD_HEADER_READ_ONLY" : "Read-only:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",
"FIELD_HEADER_SFTP_PASSWORD" : "Password:",