[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 51b1c08cf408191b4a19f6d6a336496e2f4e84b2
Merge: 6a8ffa0 91bf843
Author: James Muehlner
AuthorDate: Thu Aug 8 22:13:05 2019 -0700
Merge 1.1.0 changes back to master.
.../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 | 8 +-
.../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 | 5 +-
.../webapp/app/form/templates/numberField.html | 8 +-
.../webapp/app/form/templates/passwordField.html | 11 +-
.../webapp/app/form/templates/selectField.html | 5 +-
.../form/templates/terminalColorSchemeField.html | 63 ++
.../webapp/app/form/templates/textAreaField.html | 7 +-
.../main/webapp/app/form/templates/textField.html | 14 +-
.../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, 1728 insertions(+), 35 deletions(-)
diff --cc guacamole/src/main/webapp/app/form/templates/checkboxField.html
index 252441b,110ab14..e906f7d
--- a/guacamole/src/main/webapp/app/form/templates/checkboxField.html
+++ b/guacamole/src/main/webapp/app/form/templates/checkboxField.html
@@@ -1,1 -1,5 +1,7 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/dateField.html
index 6fd38da,2da96a1..7673e36
--- a/guacamole/src/main/webapp/app/form/templates/dateField.html
+++ b/guacamole/src/main/webapp/app/form/templates/dateField.html
@@@ -1,6 -1,6 +1,7 @@@
mailto:{{model}}; ng-show="readOnly">{{model}}
diff --cc guacamole/src/main/webapp/app/form/templates/languageField.html
index 5af4e75,b1f25e8..2a22ff2
--- a/guacamole/src/main/webapp/app/form/templates/languageField.html
+++ b/guacamole/src/main/webapp/app/form/templates/languageField.html
@@@ -1,1 -1,3 +1,4 @@@
-
-
diff --cc guacamole/src/main/webapp/app/form/templates/numberField.html
index 9e4c28b,f802b4a..c86fb8e
--- a/guacamole/src/main/webapp/app/form/templates/numberField.html
+++ b/guacamole/src/main/webapp/app/form/templates/numberField.html
@@@ -1,1 -1,5 +1,7 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/passwordField.html
index 68d36f7,69d67e8..35eba9e
--- a/guacamole/src/main/webapp/app/form/templates/passwordField.html
+++ b/guacamole/src/main/webapp/app/form/templates/passwordField.html
@@@ -1,4 -1,9 +1,11 @@@
-
+
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/selectField.html
index f173d54,e5ce0e9..2c672aa
--- a/guacamole/src/main/webapp/app/form/templates/selectField.html
+++ b/guacamole/src/main/webapp/app/form/templates/selectField.html
@@@ -1,2 -1,3 +1,5 @@@
-
diff --cc guacamole/src/main/webapp/app/form/templates/textAreaField.html
index 6614bfb,2d4144b..9761af7
--- a/guacamole/src/main/webapp/app/form/templates/textAreaField.html
+++ b/guacamole/src/main/webapp/app/form/templates/textAreaField.html
@@@ -1,1 -1,4 +1,6 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/textField.html
index 6abd4f6,938b81c..3aea2bc
--- a/guacamole/src/main/webapp/app/form/templates/textField.html
+++ b/guacamole/src/main/webapp/app/form/templates/textField.html
@@@ -1,7 -1,11 +1,13 @@@
-
-
+
+
{{ getFieldOption(option) | translate
}}
diff --cc guacamole/src/main/webapp/app/form/templates/timeField.html
index 6f7201f,292e44c..2a88230
--- a/guacamole/src/main/webapp/app/form/templates/timeField.html
+++
[guacamole-client] branch master updated (6a8ffa0 -> 51b1c08)
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 6a8ffa0 Merge 1.1.0 changes back to master.
add d618bdc GUACAMOLE-630: Expand the getFieldHeader() utility function
to accept arbitrary field names.
add cbc25aa GUACAMOLE-630: Add field type for terminal color schemes.
add 6936aef GUACAMOLE-630: Allow connection parameters within Guacamole
menu to use full available width.
add 02d3732 GUACAMOLE-630: Switch to Pickr for color picker.
add f9bfac9 GUACAMOLE-630: Include newlines within color scheme strings
for readability.
add a1a8be6 GUACAMOLE-630: Move color scheme headers within color buttons.
add 038f5ba GUACAMOLE-630: Do not contain entire field nor entire header
within .
add 588cdcd GUACAMOLE-630: Preserve the original color scheme string if
no changes have been made.
add 3ce2adb GUACAMOLE-630: Preserve raw contents of color scheme if
manually edited.
add 54ce038 GUACAMOLE-630: Allow raw contents of custom color scheme to
be edited directly.
add 9191a9f GUACAMOLE-630: Always expand connection parameters to
available width, not just within Guacamole menu.
add 62108bf GUACAMOLE-630: Remove padding added to color scheme headers
when within Guacamole menu.
add ad92e86 GUACAMOLE-630: Do not check spelling of color scheme source.
add a4a0318 GUACAMOLE-630: Tolerate insufficient JavaScript features to
run "Pickr" color picker (Internet Explorer).
add 86d18b0 GUACAMOLE-630: Revert expansion of getFieldHeader()
functionality, as it is no longer needed.
add 32fd94d GUACAMOLE-630: Simplify terminal color scheme field structure
and styling.
add 7c26dfa GUACAMOLE-630: Add compatibility prefixes for flexbox layout
properties.
add 518e320 GUACAMOLE-630: Correct header level within terminal color
scheme field.
add 91bf843 GUACAMOLE-630: Merge terminal color scheme field type.
new 51b1c08 Merge 1.1.0 changes back to master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/guacamole/form/Field.java | 6 +
...ailField.java => TerminalColorSchemeField.java} | 12 +-
.../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 +
.../LICENSE| 2 +-
.../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 | 8 +-
.../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 | 5 +-
.../webapp/app/form/templates/numberField.html | 8 +-
.../webapp/app/form/templates/passwordField.html | 11 +-
.../webapp/app/form/templates/selectField.html | 5 +-
.../form/templates/terminalColorSchemeField.html | 63 ++
.../webapp/app/form/templates/textAreaField.html | 7 +-
.../main/webapp/app/form/templates/textField.html | 14 +-
.../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, 1703 insertions(+), 28 deletions(-)
copy guacamole-ext/src/main/java/org/apache/guacamole/form/{EmailField.java =>
TerminalColorSchemeField.java} (68%)
copy guacamole/src/licenses/bundled/{datalist-polyfill-1.14.0 =>
pickr-1.2.6}/LICENSE (96%)
create mode 100644
guacamole/src/main/webapp/app/form/controllers/terminalColorSchemeFieldController.js
create mode 100644
guacamole/src/main/webapp/app/form/directives/guacInputColor.js
create mode 100644
guacamole/src/main/webapp/app/form/styles/terminal-color-scheme-field.css
create mode 100644
[guacamole-client] branch staging/1.1.0 updated (8b04414 -> 91bf843)
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 8b04414 GUACAMOLE-630: Merge editing of "argv" based parameters.
add d618bdc GUACAMOLE-630: Expand the getFieldHeader() utility function
to accept arbitrary field names.
add cbc25aa GUACAMOLE-630: Add field type for terminal color schemes.
add 6936aef GUACAMOLE-630: Allow connection parameters within Guacamole
menu to use full available width.
add 02d3732 GUACAMOLE-630: Switch to Pickr for color picker.
add f9bfac9 GUACAMOLE-630: Include newlines within color scheme strings
for readability.
add a1a8be6 GUACAMOLE-630: Move color scheme headers within color buttons.
add 038f5ba GUACAMOLE-630: Do not contain entire field nor entire header
within .
add 588cdcd GUACAMOLE-630: Preserve the original color scheme string if
no changes have been made.
add 3ce2adb GUACAMOLE-630: Preserve raw contents of color scheme if
manually edited.
add 54ce038 GUACAMOLE-630: Allow raw contents of custom color scheme to
be edited directly.
add 9191a9f GUACAMOLE-630: Always expand connection parameters to
available width, not just within Guacamole menu.
add 62108bf GUACAMOLE-630: Remove padding added to color scheme headers
when within Guacamole menu.
add ad92e86 GUACAMOLE-630: Do not check spelling of color scheme source.
add a4a0318 GUACAMOLE-630: Tolerate insufficient JavaScript features to
run "Pickr" color picker (Internet Explorer).
add 86d18b0 GUACAMOLE-630: Revert expansion of getFieldHeader()
functionality, as it is no longer needed.
add 32fd94d GUACAMOLE-630: Simplify terminal color scheme field structure
and styling.
add 7c26dfa GUACAMOLE-630: Add compatibility prefixes for flexbox layout
properties.
add 518e320 GUACAMOLE-630: Correct header level within terminal color
scheme field.
new 91bf843 GUACAMOLE-630: Merge terminal color scheme field type.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/guacamole/form/Field.java | 6 +
...ailField.java => TerminalColorSchemeField.java} | 12 +-
.../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 +
.../LICENSE| 2 +-
.../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, 1691 insertions(+), 27 deletions(-)
copy guacamole-ext/src/main/java/org/apache/guacamole/form/{EmailField.java =>
TerminalColorSchemeField.java} (68%)
copy guacamole/src/licenses/bundled/{datalist-polyfill-1.14.0 =>
pickr-1.2.6}/LICENSE (96%)
create mode 100644
guacamole/src/main/webapp/app/form/controllers/terminalColorSchemeFieldController.js
create mode 100644
guacamole/src/main/webapp/app/form/directives/guacInputColor.js
create mode 100644
guacamole/src/main/webapp/app/form/styles/terminal-color-scheme-field.css
create mode 100644
[guacamole-client] 01/01: GUACAMOLE-630: Merge terminal color scheme field type.
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 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(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit 6a8ffa0acf3c6ef35787feb365f13653e14d85f5 Merge: 02ef3ae 8b04414 Author: James Muehlner AuthorDate: Thu Aug 8 20:54:09 2019 -0700 Merge 1.1.0 changes back to master. .../app/client/controllers/clientController.js | 40 +- .../main/webapp/app/client/templates/client.html | 8 ++ .../webapp/app/client/types/ManagedArgument.js | 152 + .../main/webapp/app/client/types/ManagedClient.js | 116 +++- 4 files changed, 308 insertions(+), 8 deletions(-)
