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 <[email protected]> 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(-)
