You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/04/02 20:42:14 UTC
[1/6] guacamole-client git commit: GUACAMOLE-269: Move options to new
section, fix translations.
Repository: guacamole-client
Updated Branches:
refs/heads/master 3d51a469b -> 18136d514
GUACAMOLE-269: Move options to new section, fix translations.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1f1d64e2
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1f1d64e2
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1f1d64e2
Branch: refs/heads/master
Commit: 1f1d64e2c8a598bb70643399d2651fe21a17c227
Parents: 5729dd2
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Feb 26 15:14:41 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 10:31:53 2018 -0400
----------------------------------------------------------------------
.../main/resources/org/apache/guacamole/protocols/ssh.json | 7 ++++++-
.../main/resources/org/apache/guacamole/protocols/telnet.json | 2 +-
guacamole/src/main/webapp/translations/en.json | 7 ++++---
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1f1d64e2/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 952b77b..442214a 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
@@ -73,7 +73,12 @@
{
"name" : "server-alive-interval",
"type" : "NUMERIC"
- },
+ }
+ ]
+ },
+ {
+ "name" : "behavior",
+ "fields" : [
{
"name" : "backspace",
"type" : "ENUM",
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1f1d64e2/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
index 7acdcd8..5b960f8 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
@@ -60,7 +60,7 @@
},
{
- "name" : "session",
+ "name" : "behavior",
"fields" : [
{
"name" : "backspace",
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1f1d64e2/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 c33b14f..55da7f2 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -476,6 +476,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
+ "SECTION_HEADER_BEHAVIOR" : "Terminal behavior",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_NETWORK" : "Network",
"SECTION_HEADER_RECORDING" : "Screen Recording",
@@ -507,8 +508,8 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
- "FIELD_OPTION_BACKSPACE_0X08" : "Backspace (Ctrl-H)",
- "FIELD_OPTION_BACKSPACE_0X7F" : "Delete (Ctrl-?)",
+ "FIELD_OPTION_BACKSPACE_127" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_8" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
@@ -535,9 +536,9 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
+ "SECTION_HEADER_BEHAVIOR" : "Terminal behavior",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_RECORDING" : "Screen Recording",
- "SECTION_HEADER_SESSION" : "Session / Environment",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)",
"SECTION_HEADER_NETWORK" : "Network"
[2/6] guacamole-client git commit: GUACAMOLE-269: Add fields for
controlling Backspace behavior.
Posted by mj...@apache.org.
GUACAMOLE-269: Add fields for controlling Backspace behavior.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/5729dd2d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/5729dd2d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/5729dd2d
Branch: refs/heads/master
Commit: 5729dd2d3c6cb2bd97e80b88ba6b37f4cb8aa17f
Parents: 3d51a46
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Feb 16 23:48:37 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 10:31:53 2018 -0400
----------------------------------------------------------------------
.../resources/org/apache/guacamole/protocols/ssh.json | 5 +++++
.../resources/org/apache/guacamole/protocols/telnet.json | 11 +++++++++++
guacamole/src/main/webapp/translations/en.json | 11 ++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/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 edc7bbb..952b77b 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
@@ -73,6 +73,11 @@
{
"name" : "server-alive-interval",
"type" : "NUMERIC"
+ },
+ {
+ "name" : "backspace",
+ "type" : "ENUM",
+ "options" : [ "", "127", "8" ]
}
]
},
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
index 15dac41..7acdcd8 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
@@ -60,6 +60,17 @@
},
{
+ "name" : "session",
+ "fields" : [
+ {
+ "name" : "backspace",
+ "type" : "ENUM",
+ "options" : [ "", "127", "8" ]
+ }
+ ]
+ },
+
+ {
"name" : "typescript",
"fields" : [
{
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/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 ce65753..c33b14f 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -423,8 +423,9 @@
"PROTOCOL_SSH" : {
+ "FIELD_HEADER_BACKSPACE" : "Backspace key sends:",
"FIELD_HEADER_COLOR_SCHEME" : "Color scheme:",
- "FIELD_HEADER_COMMAND" : "Execute command:",
+ "FIELD_HEADER_COMMAND" : "Execute command:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
"FIELD_HEADER_FONT_NAME" : "Font name:",
@@ -447,6 +448,9 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
+ "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
+
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black",
@@ -483,6 +487,7 @@
"PROTOCOL_TELNET" : {
+ "FIELD_HEADER_BACKSPACE" : "Backspace key sends:",
"FIELD_HEADER_COLOR_SCHEME" : "Color scheme:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
@@ -502,6 +507,9 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
+ "FIELD_OPTION_BACKSPACE_0X08" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_0X7F" : "Delete (Ctrl-?)",
+
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black",
@@ -529,6 +537,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_RECORDING" : "Screen Recording",
+ "SECTION_HEADER_SESSION" : "Session / Environment",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)",
"SECTION_HEADER_NETWORK" : "Network"
[6/6] guacamole-client git commit: GUACAMOLE-269: Merge parameter
definitions for controlling backspace behavior of SSH/telnet.
Posted by mj...@apache.org.
GUACAMOLE-269: Merge parameter definitions for controlling backspace behavior of SSH/telnet.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/18136d51
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/18136d51
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/18136d51
Branch: refs/heads/master
Commit: 18136d5146ee98374df60a3b8dfbb1c411d5dd6b
Parents: 3d51a46 ae1d6dc
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Apr 2 13:41:13 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Apr 2 13:41:13 2018 -0700
----------------------------------------------------------------------
.../resources/org/apache/guacamole/protocols/ssh.json | 10 ++++++++++
.../org/apache/guacamole/protocols/telnet.json | 11 +++++++++++
guacamole/src/main/webapp/translations/en.json | 14 +++++++++++++-
3 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] guacamole-client git commit: GUACAMOLE-269: Add translations
for empty options.
Posted by mj...@apache.org.
GUACAMOLE-269: Add translations for empty options.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ae1d6dc2
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ae1d6dc2
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ae1d6dc2
Branch: refs/heads/master
Commit: ae1d6dc279d98bccb1c1d642de8f812486ee1824
Parents: f03cd2b
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Apr 2 16:38:39 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 16:38:39 2018 -0400
----------------------------------------------------------------------
guacamole/src/main/webapp/translations/en.json | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae1d6dc2/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 251a02f..a97406e 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -448,8 +448,9 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
- "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
- "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
+ "FIELD_OPTION_BACKSPACE_EMPTY" : "",
+ "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
@@ -508,8 +509,9 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
- "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
- "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
+ "FIELD_OPTION_BACKSPACE_EMPTY" : "",
+ "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
[4/6] guacamole-client git commit: GUACAMOLE-269: Style tweak for
translation spacing.
Posted by mj...@apache.org.
GUACAMOLE-269: Style tweak for translation spacing.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/f03cd2bd
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/f03cd2bd
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/f03cd2bd
Branch: refs/heads/master
Commit: f03cd2bd8cf63d323b66e094e1cd66d30b93cc6d
Parents: c9e8d2f
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Apr 2 16:27:57 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 16:27:57 2018 -0400
----------------------------------------------------------------------
guacamole/src/main/webapp/translations/en.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/f03cd2bd/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 584e506..251a02f 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -508,7 +508,7 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
- "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
"FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
[3/6] guacamole-client git commit: GUACAMOLE-269: Fix option
assocation for telnet.
Posted by mj...@apache.org.
GUACAMOLE-269: Fix option assocation for telnet.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/c9e8d2fc
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/c9e8d2fc
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/c9e8d2fc
Branch: refs/heads/master
Commit: c9e8d2fc21b758bb05eee0e171de423b33990e23
Parents: 1f1d64e
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Apr 2 16:25:37 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 16:25:37 2018 -0400
----------------------------------------------------------------------
guacamole/src/main/webapp/translations/en.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/c9e8d2fc/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 55da7f2..584e506 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -508,8 +508,8 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
- "FIELD_OPTION_BACKSPACE_127" : "Backspace (Ctrl-H)",
- "FIELD_OPTION_BACKSPACE_8" : "Delete (Ctrl-?)",
+ "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
+ "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",