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/09/22 00:57:20 UTC
[1/2] guacamole-client git commit: GUACAMOLE-622: Add parameter
definitions for telnet login success/failure regex.
Repository: guacamole-client
Updated Branches:
refs/heads/master 355f76b15 -> 8a5645e90
GUACAMOLE-622: Add parameter definitions for telnet login success/failure regex.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/af8f5b3a
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/af8f5b3a
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/af8f5b3a
Branch: refs/heads/master
Commit: af8f5b3a802488f16ec4866dcba071c0c50d11ca
Parents: 355f76b
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Sep 21 17:32:21 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Sep 21 17:33:44 2018 -0700
----------------------------------------------------------------------
.../org/apache/guacamole/protocols/telnet.json | 12 ++++++++++++
guacamole/src/main/webapp/translations/en.json | 3 +++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/af8f5b3a/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 60064a7..42d5be0 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
@@ -28,8 +28,20 @@
"type" : "PASSWORD"
},
{
+ "name" : "username-regex",
+ "type" : "TEXT"
+ },
+ {
"name" : "password-regex",
"type" : "TEXT"
+ },
+ {
+ "name" : "login-success-regex",
+ "type" : "TEXT"
+ },
+ {
+ "name" : "login-failure-regex",
+ "type" : "TEXT"
}
]
},
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/af8f5b3a/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 8ce4d16..e80ac90 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -563,7 +563,10 @@
"FIELD_HEADER_FONT_NAME" : "Font name:",
"FIELD_HEADER_FONT_SIZE" : "Font size:",
"FIELD_HEADER_HOSTNAME" : "Hostname:",
+ "FIELD_HEADER_LOGIN_FAILURE_REGEX" : "Login failure regular expression:",
+ "FIELD_HEADER_LOGIN_SUCCESS_REGEX" : "Login success regular expression:",
"FIELD_HEADER_USERNAME" : "Username:",
+ "FIELD_HEADER_USERNAME_REGEX" : "Username regular expression:",
"FIELD_HEADER_PASSWORD" : "Password:",
"FIELD_HEADER_PASSWORD_REGEX" : "Password regular expression:",
"FIELD_HEADER_PORT" : "Port:",
[2/2] guacamole-client git commit: GUACAMOLE-622: Merge add parameter
definitions for telnet login success, failure, and username regex.
Posted by vn...@apache.org.
GUACAMOLE-622: Merge add parameter definitions for telnet login success, failure, and username regex.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/8a5645e9
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/8a5645e9
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/8a5645e9
Branch: refs/heads/master
Commit: 8a5645e90b05ae7ff032204901fd1ce7dbce375f
Parents: 355f76b af8f5b3
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Sep 21 20:56:15 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Sep 21 20:56:15 2018 -0400
----------------------------------------------------------------------
.../org/apache/guacamole/protocols/telnet.json | 12 ++++++++++++
guacamole/src/main/webapp/translations/en.json | 3 +++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------