You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/07/03 22:01:14 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-303: Add
definitions and translations for new "sftp-root-directory" parameter.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 5d1399413 -> 33e76c4d7
GUACAMOLE-303: Add definitions and translations for new "sftp-root-directory" parameter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5fcd4845
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5fcd4845
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5fcd4845
Branch: refs/heads/master
Commit: 5fcd48451c6509c8341ac9b078633d16b9093cc1
Parents: 303be24
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Jun 29 15:49:36 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Jun 29 15:49:43 2017 -0700
----------------------------------------------------------------------
.../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++
.../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++
.../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++
guacamole/src/main/webapp/translations/en.json | 3 +++
4 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5fcd4845/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index ada63d5..700bc39 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -316,6 +316,10 @@
"type" : "PASSWORD"
},
{
+ "name" : "sftp-root-directory",
+ "type" : "TEXT"
+ },
+ {
"name" : "sftp-directory",
"type" : "TEXT"
},
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5fcd4845/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
index b3e81b7..5bc3070 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -122,6 +122,10 @@
"name" : "enable-sftp",
"type" : "BOOLEAN",
"options" : [ "true" ]
+ },
+ {
+ "name" : "sftp-root-directory",
+ "type" : "TEXT"
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5fcd4845/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
index 270d603..379c8ce 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
@@ -129,6 +129,10 @@
"type" : "PASSWORD"
},
{
+ "name" : "sftp-root-directory",
+ "type" : "TEXT"
+ },
+ {
"name" : "sftp-directory",
"type" : "TEXT"
},
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5fcd4845/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 7a72655..0fa7929 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -361,6 +361,7 @@
"FIELD_HEADER_SFTP_PASSWORD" : "Password:",
"FIELD_HEADER_SFTP_PORT" : "Port:",
"FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:",
+ "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
"FIELD_HEADER_USERNAME" : "Username:",
@@ -428,6 +429,7 @@
"FIELD_HEADER_RECORDING_NAME" : "Recording name:",
"FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:",
+ "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
@@ -539,6 +541,7 @@
"FIELD_HEADER_SFTP_PASSWORD" : "Password:",
"FIELD_HEADER_SFTP_PORT" : "Port:",
"FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:",
+ "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:",
[2/2] incubator-guacamole-client git commit: GUACAMOLE-303: Merge Add
definitation and translations for new sftp-root-directory parameter.
Posted by vn...@apache.org.
GUACAMOLE-303: Merge Add definitation and translations for new sftp-root-directory parameter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/33e76c4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/33e76c4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/33e76c4d
Branch: refs/heads/master
Commit: 33e76c4d72ef054960e2a90c3b22742974d53971
Parents: 5d13994 5fcd484
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Jul 3 17:59:11 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jul 3 17:59:11 2017 -0400
----------------------------------------------------------------------
.../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++
.../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++
.../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++
guacamole/src/main/webapp/translations/en.json | 3 +++
4 files changed, 15 insertions(+)
----------------------------------------------------------------------