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 2019/06/15 21:11:49 UTC
[guacamole-client] branch master updated (6dad3b2 -> 15bb363)
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 6dad3b2 Merge 1.1.0 changes back to master.
add ec963dd GUACAMOLE-422: Define field type which represents the ID of any supported language.
add 78977ae GUACAMOLE-422: Use the same display mechanism and structure (the guacForm directive) for all locale preferences, not just the time zone.
add 8b239ae GUACAMOLE-422: Merge use consistent mechanism for locale preferences.
new 15bb363 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 | 8 +++
.../org/apache/guacamole/form/LanguageField.java | 64 ++++++++++++++++++++++
...eldController.js => languageFieldController.js} | 27 ++++++++-
guacamole/src/main/webapp/app/form/formModule.js | 5 +-
.../main/webapp/app/form/services/formService.js | 15 +++++
.../webapp/app/form/templates/languageField.html | 1 +
.../settings/directives/guacSettingsPreferences.js | 40 +++++---------
.../webapp/app/settings/styles/preferences.css | 23 ++++++--
.../settings/templates/settingsPreferences.html | 20 +------
9 files changed, 151 insertions(+), 52 deletions(-)
create mode 100644 guacamole-ext/src/main/java/org/apache/guacamole/form/LanguageField.java
copy guacamole/src/main/webapp/app/form/controllers/{selectFieldController.js => languageFieldController.js} (52%)
create mode 100644 guacamole/src/main/webapp/app/form/templates/languageField.html
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 15bb363de37f9f54020f03635cbe1c9e6cf28928
Merge: 6dad3b2 8b239ae
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Jun 15 17:11:13 2019 -0400
Merge 1.1.0 changes back to master.
.../main/java/org/apache/guacamole/form/Field.java | 8 +++
.../org/apache/guacamole/form/LanguageField.java | 64 ++++++++++++++++++++++
.../form/controllers/languageFieldController.js | 54 ++++++++++++++++++
guacamole/src/main/webapp/app/form/formModule.js | 5 +-
.../main/webapp/app/form/services/formService.js | 15 +++++
.../webapp/app/form/templates/languageField.html | 1 +
.../settings/directives/guacSettingsPreferences.js | 40 +++++---------
.../webapp/app/settings/styles/preferences.css | 23 ++++++--
.../settings/templates/settingsPreferences.html | 20 +------
9 files changed, 181 insertions(+), 49 deletions(-)