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 2018/05/27 21:16:52 UTC

[1/2] guacamole-client git commit: GUACAMOLE-470: Update "color-scheme" parameter for SSH and Telnet.

Repository: guacamole-client
Updated Branches:
  refs/heads/master ff9f3ae7e -> f5266fdde


GUACAMOLE-470: Update "color-scheme" parameter for SSH and Telnet.

GUACAMOLE-470 changes the "color-scheme" parameter to be a configuration
string instead of a simple enum, so update the protocol JSON
accordingly.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/4e610f2d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/4e610f2d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/4e610f2d

Branch: refs/heads/master
Commit: 4e610f2d1bda0ef073b8b9190fa2135d427f30cb
Parents: fed5133
Author: Jim Chen <nc...@mozilla.com>
Authored: Wed May 16 11:52:08 2018 -0400
Committer: Jim Chen <nc...@mozilla.com>
Committed: Wed May 16 11:52:08 2018 -0400

----------------------------------------------------------------------
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json    | 3 +--
 .../src/main/resources/org/apache/guacamole/protocols/telnet.json | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/4e610f2d/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 442214a..ed728cf 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
@@ -43,8 +43,7 @@
             "fields" : [
                 {
                     "name"  : "color-scheme",
-                    "type"  : "ENUM",
-                    "options" : [ "", "black-white", "gray-black", "green-black", "white-black" ]
+                    "type"  : "TEXT"
                 },
                 {
                     "name"  : "font-name",

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/4e610f2d/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 5b960f8..67a3a1f 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
@@ -39,8 +39,7 @@
             "fields" : [
                 {
                     "name"  : "color-scheme",
-                    "type"  : "ENUM",
-                    "options" : [ "", "black-white", "gray-black", "green-black", "white-black" ]
+                    "type"  : "TEXT"
                 },
                 {
                     "name"  : "font-name",


[2/2] guacamole-client git commit: GUACAMOLE-470: Merge updated color-scheme parameter for SSH and telnet.

Posted by vn...@apache.org.
GUACAMOLE-470: Merge updated color-scheme parameter for SSH and 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/f5266fdd
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/f5266fdd
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/f5266fdd

Branch: refs/heads/master
Commit: f5266fdde1d1ee120372314dcf504705807d1bde
Parents: ff9f3ae 4e610f2
Author: Nick Couchman <vn...@apache.org>
Authored: Sun May 27 17:16:08 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Sun May 27 17:16:08 2018 -0400

----------------------------------------------------------------------
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json    | 3 +--
 .../src/main/resources/org/apache/guacamole/protocols/telnet.json | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/f5266fdd/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/f5266fdd/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
----------------------------------------------------------------------