This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 91bf8438db1a37ce9248942a6c73619b13b77348
Merge: 8b04414 518e320
Author: James Muehlner <james.muehl...@guac-dev.org>
AuthorDate: Thu Aug 8 21:47:10 2019 -0700
GUACAMOLE-630: Merge terminal color scheme field type.
.../main/java/org/apache/guacamole/form/Field.java | 6 +
.../guacamole/form/TerminalColorSchemeField.java | 25 +-
.../org/apache/guacamole/protocols/kubernetes.json | 2 +-
.../org/apache/guacamole/protocols/ssh.json | 2 +-
.../org/apache/guacamole/protocols/telnet.json | 2 +-
guacamole/pom.xml | 7 +
guacamole/src/licenses/LICENSE | 31 +
guacamole/src/licenses/bundled/pickr-1.2.6/LICENSE | 21 +
.../terminalColorSchemeFieldController.js | 142 +++
.../app/form/controllers/textFieldController.js | 2 +-
.../main/webapp/app/form/directives/formField.js | 14 +-
.../webapp/app/form/directives/guacInputColor.js | 202 +++++
.../main/webapp/app/form/services/formService.js | 18 +
.../form/styles/terminal-color-scheme-field.css | 158 ++++
.../webapp/app/form/templates/checkboxField.html | 6 +-
.../main/webapp/app/form/templates/dateField.html | 1 +
.../main/webapp/app/form/templates/emailField.html | 3 +-
.../main/webapp/app/form/templates/formField.html | 8 +-
.../webapp/app/form/templates/guacInputColor.html | 10 +
.../webapp/app/form/templates/languageField.html | 4 +-
.../webapp/app/form/templates/numberField.html | 6 +-
.../webapp/app/form/templates/passwordField.html | 9 +-
.../webapp/app/form/templates/selectField.html | 4 +-
.../form/templates/terminalColorSchemeField.html | 63 ++
.../webapp/app/form/templates/textAreaField.html | 5 +-
.../main/webapp/app/form/templates/textField.html | 11 +-
.../main/webapp/app/form/templates/timeField.html | 1 +
.../webapp/app/form/templates/timeZoneField.html | 1 +
.../src/main/webapp/app/form/types/ColorScheme.js | 949 +++++++++++++++++++++
.../app/manage/styles/connection-parameter.css | 4 +
guacamole/src/main/webapp/app/rest/types/Field.js | 11 +-
guacamole/src/main/webapp/index.html | 6 +-
guacamole/src/main/webapp/translations/en.json | 16 +
33 files changed, 1716 insertions(+), 34 deletions(-)
