[7/8] guacamole-client git commit: GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServl
GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServlet to refuse to serve the file). Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/e5a8442a Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/e5a8442a Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/e5a8442a Branch: refs/heads/staging/1.0.0 Commit: e5a8442a2ac14590d342d528079d7e159c9d19ee Parents: 74230f0 Author: Michael Jumper Authored: Tue Jun 12 16:29:55 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 16:30:11 2018 -0700 -- guacamole/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/e5a8442a/guacamole/pom.xml -- diff --git a/guacamole/pom.xml b/guacamole/pom.xml index ff662b1..dc4f082 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -388,7 +388,7 @@ -org.webjars.bowergithub.mfranzke +org.webjars.npm datalist-polyfill 1.14.0 runtime
[8/8] guacamole-client git commit: GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter.
GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/bc1dc41a Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/bc1dc41a Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/bc1dc41a Branch: refs/heads/staging/1.0.0 Commit: bc1dc41a7cbb53a53e717ebe8994428e91551705 Parents: 0163cfc e5a8442 Author: Nick Couchman Authored: Wed Jun 13 06:13:28 2018 -0400 Committer: Nick Couchman Committed: Wed Jun 13 06:13:28 2018 -0400 -- .../org/apache/guacamole/form/TextField.java| 17 + .../org/apache/guacamole/protocols/ssh.json | 3 +- .../org/apache/guacamole/protocols/telnet.json | 3 +- guacamole/pom.xml | 8 guacamole/src/licenses/LICENSE | 9 + .../bundled/datalist-polyfill-1.14.0/LICENSE| 21 ++ .../form/controllers/selectFieldController.js | 34 - .../app/form/controllers/textFieldController.js | 40 .../webapp/app/form/directives/formField.js | 31 +++ .../webapp/app/form/services/formService.js | 2 + .../webapp/app/form/templates/textField.html| 8 +++- guacamole/src/main/webapp/index.html| 3 +- guacamole/src/main/webapp/translations/de.json | 12 ++ guacamole/src/main/webapp/translations/en.json | 12 ++ guacamole/src/main/webapp/translations/es.json | 12 ++ guacamole/src/main/webapp/translations/fr.json | 12 ++ guacamole/src/main/webapp/translations/nl.json | 12 ++ guacamole/src/main/webapp/translations/no.json | 12 ++ 18 files changed, 213 insertions(+), 38 deletions(-) --
[4/8] guacamole-client git commit: GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some pre-defined options.
GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some
pre-defined 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/74230f00
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/74230f00
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/74230f00
Branch: refs/heads/staging/1.0.0
Commit: 74230f005f2193e9e2fc2c93a52faa5c0e2ae870
Parents: 73c3107
Author: Michael Jumper
Authored: Tue Jun 12 11:52:41 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 14:07:51 2018 -0700
--
.../src/main/resources/org/apache/guacamole/protocols/ssh.json | 2 +-
.../src/main/resources/org/apache/guacamole/protocols/telnet.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/74230f00/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 b3efda3..c7f3dc4 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,7 +43,7 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "ENUM",
+"type" : "TEXT",
"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/74230f00/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 e3094d8..60064a7 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,7 +39,7 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "ENUM",
+"type" : "TEXT",
"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
[6/8] guacamole-client git commit: GUACAMOLE-470: Restore translations for "color-scheme" enum values.
GUACAMOLE-470: Restore translations for "color-scheme" enum values. This reverts commit 06f98afcf5446c7d83cef0aaca109b57c523f960. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/73c3107e Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/73c3107e Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/73c3107e Branch: refs/heads/staging/1.0.0 Commit: 73c3107e915fdeff5c406200639bb9ebb1378ff0 Parents: 2bc7186 Author: Michael Jumper Authored: Tue Jun 12 13:49:18 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 14:07:51 2018 -0700 -- guacamole/src/main/webapp/translations/de.json | 12 guacamole/src/main/webapp/translations/en.json | 12 guacamole/src/main/webapp/translations/es.json | 12 guacamole/src/main/webapp/translations/fr.json | 12 guacamole/src/main/webapp/translations/nl.json | 12 guacamole/src/main/webapp/translations/no.json | 12 6 files changed, 72 insertions(+) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/guacamole/src/main/webapp/translations/de.json -- diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index a5f8517..90953e5 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -378,6 +378,12 @@ "FIELD_HEADER_PRIVATE_KEY" : "Privater Schlüssel:", "FIELD_HEADER_READ_ONLY" : "Nur-Lesen:", +"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf WeiÃ", +"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", +"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weià auf Schwarz", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", @@ -416,6 +422,12 @@ "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Nur-Lesen:", +"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf WeiÃ", +"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", +"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weià auf Schwarz", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/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 1b0377b..56bf614 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -455,6 +455,12 @@ "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", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", @@ -519,6 +525,12 @@ "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", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/guacamole/src/main/webapp/translations/es.json -- diff --git a/guacamole/src/main/webapp/translations/es.json b/guacamole/src/main/webapp/translations/es.json index 7bf1f9c..283779a 100644 --- a/guacamole/src/main/webapp/translations/es.json +++
[8/9] guacamole-client git commit: GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter.
GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/bc1dc41a Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/bc1dc41a Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/bc1dc41a Branch: refs/heads/master Commit: bc1dc41a7cbb53a53e717ebe8994428e91551705 Parents: 0163cfc e5a8442 Author: Nick Couchman Authored: Wed Jun 13 06:13:28 2018 -0400 Committer: Nick Couchman Committed: Wed Jun 13 06:13:28 2018 -0400 -- .../org/apache/guacamole/form/TextField.java| 17 + .../org/apache/guacamole/protocols/ssh.json | 3 +- .../org/apache/guacamole/protocols/telnet.json | 3 +- guacamole/pom.xml | 8 guacamole/src/licenses/LICENSE | 9 + .../bundled/datalist-polyfill-1.14.0/LICENSE| 21 ++ .../form/controllers/selectFieldController.js | 34 - .../app/form/controllers/textFieldController.js | 40 .../webapp/app/form/directives/formField.js | 31 +++ .../webapp/app/form/services/formService.js | 2 + .../webapp/app/form/templates/textField.html| 8 +++- guacamole/src/main/webapp/index.html| 3 +- guacamole/src/main/webapp/translations/de.json | 12 ++ guacamole/src/main/webapp/translations/en.json | 12 ++ guacamole/src/main/webapp/translations/es.json | 12 ++ guacamole/src/main/webapp/translations/fr.json | 12 ++ guacamole/src/main/webapp/translations/nl.json | 12 ++ guacamole/src/main/webapp/translations/no.json | 12 ++ 18 files changed, 213 insertions(+), 38 deletions(-) --
[4/9] guacamole-client git commit: GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some pre-defined options.
GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some
pre-defined 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/74230f00
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/74230f00
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/74230f00
Branch: refs/heads/master
Commit: 74230f005f2193e9e2fc2c93a52faa5c0e2ae870
Parents: 73c3107
Author: Michael Jumper
Authored: Tue Jun 12 11:52:41 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 14:07:51 2018 -0700
--
.../src/main/resources/org/apache/guacamole/protocols/ssh.json | 2 +-
.../src/main/resources/org/apache/guacamole/protocols/telnet.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/74230f00/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 b3efda3..c7f3dc4 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,7 +43,7 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "ENUM",
+"type" : "TEXT",
"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/74230f00/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 e3094d8..60064a7 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,7 +39,7 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "ENUM",
+"type" : "TEXT",
"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
[3/8] guacamole-client git commit: GUACAMOLE-470: Add polyfill for element (not supported by Safari).
GUACAMOLE-470: Add polyfill for element (not supported by Safari). Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3ae152fa Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3ae152fa Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3ae152fa Branch: refs/heads/staging/1.0.0 Commit: 3ae152fa35b07800ca5edbe42d14e869298fc252 Parents: 426a791 Author: Michael Jumper Authored: Tue Jun 12 13:06:01 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 14:07:47 2018 -0700 -- guacamole/pom.xml | 8 guacamole/src/licenses/LICENSE | 9 + .../bundled/datalist-polyfill-1.14.0/LICENSE| 21 guacamole/src/main/webapp/index.html| 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/pom.xml -- diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 0573c4c..ff662b1 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -386,6 +386,14 @@ runtime + + +org.webjars.bowergithub.mfranzke +datalist-polyfill +1.14.0 +runtime + + org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/LICENSE -- diff --git a/guacamole/src/licenses/LICENSE b/guacamole/src/licenses/LICENSE index c2e6bf5..4474707 100644 --- a/guacamole/src/licenses/LICENSE +++ b/guacamole/src/licenses/LICENSE @@ -390,6 +390,15 @@ Carlito (http://code.google.com/p/chromium/issues/detail?id=280557) SIL Open Font (bundled/carlito/LICENSE) +datalist-polyfill (https://github.com/mfranzke/datalist-polyfill) +- + +Version: 1.14.0 +From: 'Maximilian Franzke' (https://github.com/mfranzke) +License(s): +MIT (bundled/datalist-polyfill-1.14.0/LICENSE) + + FileSaver.js (https://github.com/eligrey/FileSaver.js) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE -- diff --git a/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE new file mode 100644 index 000..8864d4a --- /dev/null +++ b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/main/webapp/index.html -- diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html index fd5dba4..5a53d8a 100644 --- a/guacamole/src/main/webapp/index.html +++ b/guacamole/src/main/webapp/index.html @@ -71,8 +71,9 @@ - + +
[2/8] guacamole-client git commit: GUACAMOLE-470: Make getFieldOption() available to all field types.
GUACAMOLE-470: Make getFieldOption() available to all field types.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a8bb6fe9
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a8bb6fe9
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a8bb6fe9
Branch: refs/heads/staging/1.0.0
Commit: a8bb6fe96640ee7c06d02112cd48aea9e5b7c5e2
Parents: 0163cfc
Author: Michael Jumper
Authored: Tue Jun 12 12:09:40 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 13:58:04 2018 -0700
--
.../form/controllers/selectFieldController.js | 34
.../webapp/app/form/directives/formField.js | 31 ++
2 files changed, 31 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/a8bb6fe9/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
--
diff --git
a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
index 7d5b868..e780378 100644
--- a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
+++ b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
@@ -24,44 +24,10 @@
angular.module('form').controller('selectFieldController', ['$scope',
'$injector',
function selectFieldController($scope, $injector) {
-// Required services
-var translationStringService = $injector.get('translationStringService');
-
// Interpret undefined/null as empty string
$scope.$watch('model', function setModel(model) {
if (!model && model !== '')
$scope.model = '';
});
-/**
- * Produces the translation string for the given field option
- * value. The translation string will be of the form:
- *
- * NAMESPACE.FIELD_OPTION_NAME_VALUE
- *
- * where NAMESPACE is the namespace provided to the
- * directive, NAME is the field name transformed
- * via translationStringService.canonicalize(), and
- * VALUE is the option value transformed via
- * translationStringService.canonicalize()
- *
- * @param {String} value
- * The name of the option value.
- *
- * @returns {String}
- * The translation string which produces the translated name of the
- * value specified.
- */
-$scope.getFieldOption = function getFieldOption(value) {
-
-// If no field, or no value, then no corresponding translation string
-if (!$scope.field || !$scope.field.name || !value)
-return '';
-
-return translationStringService.canonicalize($scope.namespace ||
'MISSING_NAMESPACE')
-+ '.FIELD_OPTION_' +
translationStringService.canonicalize($scope.field.name)
-+ '_' +
translationStringService.canonicalize(value || 'EMPTY');
-
-};
-
}]);
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/a8bb6fe9/guacamole/src/main/webapp/app/form/directives/formField.js
--
diff --git a/guacamole/src/main/webapp/app/form/directives/formField.js
b/guacamole/src/main/webapp/app/form/directives/formField.js
index 15bde94..9cf785c 100644
--- a/guacamole/src/main/webapp/app/form/directives/formField.js
+++ b/guacamole/src/main/webapp/app/form/directives/formField.js
@@ -98,6 +98,37 @@ angular.module('form').directive('guacFormField', [function
formField() {
};
/**
+ * Produces the translation string for the given field option
+ * value. The translation string will be of the form:
+ *
+ * NAMESPACE.FIELD_OPTION_NAME_VALUE
+ *
+ * where NAMESPACE is the namespace provided to the
+ * directive, NAME is the field name transformed
+ * via translationStringService.canonicalize(), and
+ * VALUE is the option value transformed via
+ * translationStringService.canonicalize()
+ *
+ * @param {String} value
+ * The name of the option value.
+ *
+ * @returns {String}
+ * The translation string which produces the translated name
of the
+ * value specified.
+ */
+$scope.getFieldOption = function getFieldOption(value) {
+
+// If no field, or no value, then no corresponding translation
string
+if (!$scope.field || !$scope.field.name || !value)
+return '';
+
+return translationStringService.canonicalize($scope.namespace
||
[5/8] guacamole-client git commit: GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet.
GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet.
This reverts commit 4e610f2d1bda0ef073b8b9190fa2135d427f30cb.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/2bc71866
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/2bc71866
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/2bc71866
Branch: refs/heads/staging/1.0.0
Commit: 2bc71866a8e56e2a4926ce433efb54abe7283be3
Parents: 3ae152f
Author: Michael Jumper
Authored: Tue Jun 12 13:35:35 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 14:07:51 2018 -0700
--
.../src/main/resources/org/apache/guacamole/protocols/ssh.json| 3 ++-
.../src/main/resources/org/apache/guacamole/protocols/telnet.json | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/2bc71866/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 45486c8..b3efda3 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,7 +43,8 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "TEXT"
+"type" : "ENUM",
+"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
"name" : "font-name",
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/2bc71866/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 d893991..e3094d8 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,7 +39,8 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "TEXT"
+"type" : "ENUM",
+"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
"name" : "font-name",
[2/9] guacamole-client git commit: GUACAMOLE-470: Make getFieldOption() available to all field types.
GUACAMOLE-470: Make getFieldOption() available to all field types.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a8bb6fe9
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a8bb6fe9
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a8bb6fe9
Branch: refs/heads/master
Commit: a8bb6fe96640ee7c06d02112cd48aea9e5b7c5e2
Parents: 0163cfc
Author: Michael Jumper
Authored: Tue Jun 12 12:09:40 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 13:58:04 2018 -0700
--
.../form/controllers/selectFieldController.js | 34
.../webapp/app/form/directives/formField.js | 31 ++
2 files changed, 31 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/a8bb6fe9/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
--
diff --git
a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
index 7d5b868..e780378 100644
--- a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
+++ b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
@@ -24,44 +24,10 @@
angular.module('form').controller('selectFieldController', ['$scope',
'$injector',
function selectFieldController($scope, $injector) {
-// Required services
-var translationStringService = $injector.get('translationStringService');
-
// Interpret undefined/null as empty string
$scope.$watch('model', function setModel(model) {
if (!model && model !== '')
$scope.model = '';
});
-/**
- * Produces the translation string for the given field option
- * value. The translation string will be of the form:
- *
- * NAMESPACE.FIELD_OPTION_NAME_VALUE
- *
- * where NAMESPACE is the namespace provided to the
- * directive, NAME is the field name transformed
- * via translationStringService.canonicalize(), and
- * VALUE is the option value transformed via
- * translationStringService.canonicalize()
- *
- * @param {String} value
- * The name of the option value.
- *
- * @returns {String}
- * The translation string which produces the translated name of the
- * value specified.
- */
-$scope.getFieldOption = function getFieldOption(value) {
-
-// If no field, or no value, then no corresponding translation string
-if (!$scope.field || !$scope.field.name || !value)
-return '';
-
-return translationStringService.canonicalize($scope.namespace ||
'MISSING_NAMESPACE')
-+ '.FIELD_OPTION_' +
translationStringService.canonicalize($scope.field.name)
-+ '_' +
translationStringService.canonicalize(value || 'EMPTY');
-
-};
-
}]);
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/a8bb6fe9/guacamole/src/main/webapp/app/form/directives/formField.js
--
diff --git a/guacamole/src/main/webapp/app/form/directives/formField.js
b/guacamole/src/main/webapp/app/form/directives/formField.js
index 15bde94..9cf785c 100644
--- a/guacamole/src/main/webapp/app/form/directives/formField.js
+++ b/guacamole/src/main/webapp/app/form/directives/formField.js
@@ -98,6 +98,37 @@ angular.module('form').directive('guacFormField', [function
formField() {
};
/**
+ * Produces the translation string for the given field option
+ * value. The translation string will be of the form:
+ *
+ * NAMESPACE.FIELD_OPTION_NAME_VALUE
+ *
+ * where NAMESPACE is the namespace provided to the
+ * directive, NAME is the field name transformed
+ * via translationStringService.canonicalize(), and
+ * VALUE is the option value transformed via
+ * translationStringService.canonicalize()
+ *
+ * @param {String} value
+ * The name of the option value.
+ *
+ * @returns {String}
+ * The translation string which produces the translated name
of the
+ * value specified.
+ */
+$scope.getFieldOption = function getFieldOption(value) {
+
+// If no field, or no value, then no corresponding translation
string
+if (!$scope.field || !$scope.field.name || !value)
+return '';
+
+return translationStringService.canonicalize($scope.namespace
|| 'MISSING_NAMESPACE')
+
[6/9] guacamole-client git commit: GUACAMOLE-470: Restore translations for "color-scheme" enum values.
GUACAMOLE-470: Restore translations for "color-scheme" enum values. This reverts commit 06f98afcf5446c7d83cef0aaca109b57c523f960. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/73c3107e Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/73c3107e Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/73c3107e Branch: refs/heads/master Commit: 73c3107e915fdeff5c406200639bb9ebb1378ff0 Parents: 2bc7186 Author: Michael Jumper Authored: Tue Jun 12 13:49:18 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 14:07:51 2018 -0700 -- guacamole/src/main/webapp/translations/de.json | 12 guacamole/src/main/webapp/translations/en.json | 12 guacamole/src/main/webapp/translations/es.json | 12 guacamole/src/main/webapp/translations/fr.json | 12 guacamole/src/main/webapp/translations/nl.json | 12 guacamole/src/main/webapp/translations/no.json | 12 6 files changed, 72 insertions(+) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/guacamole/src/main/webapp/translations/de.json -- diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index a5f8517..90953e5 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -378,6 +378,12 @@ "FIELD_HEADER_PRIVATE_KEY" : "Privater Schlüssel:", "FIELD_HEADER_READ_ONLY" : "Nur-Lesen:", +"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf WeiÃ", +"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", +"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weià auf Schwarz", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", @@ -416,6 +422,12 @@ "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Nur-Lesen:", +"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf WeiÃ", +"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", +"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weià auf Schwarz", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/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 1b0377b..56bf614 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -455,6 +455,12 @@ "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", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", @@ -519,6 +525,12 @@ "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", +"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black", +"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black", + "FIELD_OPTION_FONT_SIZE_8" : "8", "FIELD_OPTION_FONT_SIZE_9" : "9", "FIELD_OPTION_FONT_SIZE_10": "10", http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/73c3107e/guacamole/src/main/webapp/translations/es.json -- diff --git a/guacamole/src/main/webapp/translations/es.json b/guacamole/src/main/webapp/translations/es.json index 7bf1f9c..283779a 100644 --- a/guacamole/src/main/webapp/translations/es.json +++
[1/9] guacamole-client git commit: GUACAMOLE-470: Allow TEXT fields to be associated with predefined sets of known-good values.
Repository: guacamole-client
Updated Branches:
refs/heads/master bf3d27611 -> 984ab48ce
GUACAMOLE-470: Allow TEXT fields to be associated with predefined sets of
known-good values.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/426a7919
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/426a7919
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/426a7919
Branch: refs/heads/master
Commit: 426a7919b3a3b4db94354da455354f48ce69f4e8
Parents: a8bb6fe
Author: Michael Jumper
Authored: Tue Jun 12 12:37:07 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 13:58:04 2018 -0700
--
.../org/apache/guacamole/form/TextField.java| 17 +
.../app/form/controllers/textFieldController.js | 40
.../webapp/app/form/services/formService.js | 2 +
.../webapp/app/form/templates/textField.html| 8 +++-
4 files changed, 66 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/426a7919/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
--
diff --git
a/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
index 2751e14..990ad73 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
@@ -19,6 +19,8 @@
package org.apache.guacamole.form;
+import java.util.Collection;
+
/**
* Represents a basic text field. The field may generally contain any data, but
* may not contain multiple lines.
@@ -36,6 +38,21 @@ public class TextField extends Field {
}
/**
+ * Creates a new TextField with the given name and possible values. As a
+ * text field may contain any data by definition, any provided options are
+ * simply known-good values.
+ *
+ * @param name
+ * The unique name to associate with this field.
+ *
+ * @param options
+ * A set of known legal options for this field.
+ */
+public TextField(String name, Collection options) {
+super(name, Field.Type.TEXT, options);
+}
+
+/**
* Parses the given string, interpreting empty strings as equivalent to
* null. For all other cases, the given string is returned verbatim.
*
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/426a7919/guacamole/src/main/webapp/app/form/controllers/textFieldController.js
--
diff --git
a/guacamole/src/main/webapp/app/form/controllers/textFieldController.js
b/guacamole/src/main/webapp/app/form/controllers/textFieldController.js
new file mode 100644
index 000..b5bc753
--- /dev/null
+++ b/guacamole/src/main/webapp/app/form/controllers/textFieldController.js
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+/**
+ * Controller for text fields.
+ */
+angular.module('form').controller('textFieldController', ['$scope',
'$injector',
+function textFieldController($scope, $injector) {
+
+/**
+ * The ID of the datalist element that should be associated with the text
+ * field, providing a set of known-good values. If no such values are
+ * defined, this will be null.
+ *
+ * @type String
+ */
+$scope.dataListId = null;
+
+// Generate unique ID for datalist, if applicable
+if ($scope.field.options && $scope.field.options.length)
+$scope.dataListId = $scope.field.name + '-datalist';
+
+}]);
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/426a7919/guacamole/src/main/webapp/app/form/services/formService.js
--
diff --git a/guacamole/src/main/webapp/app/form/services/formService.js
b/guacamole/src/main/webapp/app/form/services/formService.js
index
[5/9] guacamole-client git commit: GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet.
GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet.
This reverts commit 4e610f2d1bda0ef073b8b9190fa2135d427f30cb.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/2bc71866
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/2bc71866
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/2bc71866
Branch: refs/heads/master
Commit: 2bc71866a8e56e2a4926ce433efb54abe7283be3
Parents: 3ae152f
Author: Michael Jumper
Authored: Tue Jun 12 13:35:35 2018 -0700
Committer: Michael Jumper
Committed: Tue Jun 12 14:07:51 2018 -0700
--
.../src/main/resources/org/apache/guacamole/protocols/ssh.json| 3 ++-
.../src/main/resources/org/apache/guacamole/protocols/telnet.json | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/2bc71866/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 45486c8..b3efda3 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,7 +43,8 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "TEXT"
+"type" : "ENUM",
+"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
"name" : "font-name",
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/2bc71866/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 d893991..e3094d8 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,7 +39,8 @@
"fields" : [
{
"name" : "color-scheme",
-"type" : "TEXT"
+"type" : "ENUM",
+"options" : [ "", "black-white", "gray-black",
"green-black", "white-black" ]
},
{
"name" : "font-name",
[7/9] guacamole-client git commit: GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServl
GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServlet to refuse to serve the file). Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/e5a8442a Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/e5a8442a Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/e5a8442a Branch: refs/heads/master Commit: e5a8442a2ac14590d342d528079d7e159c9d19ee Parents: 74230f0 Author: Michael Jumper Authored: Tue Jun 12 16:29:55 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 16:30:11 2018 -0700 -- guacamole/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/e5a8442a/guacamole/pom.xml -- diff --git a/guacamole/pom.xml b/guacamole/pom.xml index ff662b1..dc4f082 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -388,7 +388,7 @@ -org.webjars.bowergithub.mfranzke +org.webjars.npm datalist-polyfill 1.14.0 runtime
[3/9] guacamole-client git commit: GUACAMOLE-470: Add polyfill for element (not supported by Safari).
GUACAMOLE-470: Add polyfill for element (not supported by Safari). Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3ae152fa Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3ae152fa Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3ae152fa Branch: refs/heads/master Commit: 3ae152fa35b07800ca5edbe42d14e869298fc252 Parents: 426a791 Author: Michael Jumper Authored: Tue Jun 12 13:06:01 2018 -0700 Committer: Michael Jumper Committed: Tue Jun 12 14:07:47 2018 -0700 -- guacamole/pom.xml | 8 guacamole/src/licenses/LICENSE | 9 + .../bundled/datalist-polyfill-1.14.0/LICENSE| 21 guacamole/src/main/webapp/index.html| 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/pom.xml -- diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 0573c4c..ff662b1 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -386,6 +386,14 @@ runtime + + +org.webjars.bowergithub.mfranzke +datalist-polyfill +1.14.0 +runtime + + org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/LICENSE -- diff --git a/guacamole/src/licenses/LICENSE b/guacamole/src/licenses/LICENSE index c2e6bf5..4474707 100644 --- a/guacamole/src/licenses/LICENSE +++ b/guacamole/src/licenses/LICENSE @@ -390,6 +390,15 @@ Carlito (http://code.google.com/p/chromium/issues/detail?id=280557) SIL Open Font (bundled/carlito/LICENSE) +datalist-polyfill (https://github.com/mfranzke/datalist-polyfill) +- + +Version: 1.14.0 +From: 'Maximilian Franzke' (https://github.com/mfranzke) +License(s): +MIT (bundled/datalist-polyfill-1.14.0/LICENSE) + + FileSaver.js (https://github.com/eligrey/FileSaver.js) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE -- diff --git a/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE new file mode 100644 index 000..8864d4a --- /dev/null +++ b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/main/webapp/index.html -- diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html index fd5dba4..5a53d8a 100644 --- a/guacamole/src/main/webapp/index.html +++ b/guacamole/src/main/webapp/index.html @@ -71,8 +71,9 @@ - + +
[9/9] guacamole-client git commit: Merge 1.0.0 changes back to master.
Merge 1.0.0 changes back to master. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/984ab48c Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/984ab48c Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/984ab48c Branch: refs/heads/master Commit: 984ab48ce8dbbb5b9949ce1f5e5f774168b4830b Parents: bf3d276 bc1dc41 Author: Nick Couchman Authored: Wed Jun 13 06:15:10 2018 -0400 Committer: Nick Couchman Committed: Wed Jun 13 06:15:10 2018 -0400 -- .../org/apache/guacamole/form/TextField.java| 17 + .../org/apache/guacamole/protocols/ssh.json | 3 +- .../org/apache/guacamole/protocols/telnet.json | 3 +- guacamole/pom.xml | 8 guacamole/src/licenses/LICENSE | 9 + .../bundled/datalist-polyfill-1.14.0/LICENSE| 21 ++ .../form/controllers/selectFieldController.js | 34 - .../app/form/controllers/textFieldController.js | 40 .../webapp/app/form/directives/formField.js | 31 +++ .../webapp/app/form/services/formService.js | 2 + .../webapp/app/form/templates/textField.html| 8 +++- guacamole/src/main/webapp/index.html| 3 +- guacamole/src/main/webapp/translations/de.json | 12 ++ guacamole/src/main/webapp/translations/en.json | 12 ++ guacamole/src/main/webapp/translations/es.json | 12 ++ guacamole/src/main/webapp/translations/fr.json | 12 ++ guacamole/src/main/webapp/translations/nl.json | 12 ++ guacamole/src/main/webapp/translations/no.json | 12 ++ 18 files changed, 213 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/984ab48c/guacamole/src/main/webapp/translations/en.json --
