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 <vn...@apache.org>
Authored: Wed Jun 13 06:15:10 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
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
----------------------------------------------------------------------

Reply via email to