GUACAMOLE-208: Merge new codes and translations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/6a2235ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6a2235ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6a2235ef Branch: refs/heads/master Commit: 6a2235eff73fa52dab95a7d38961f6a0b8931d1d Parents: fa07460 ecf506e Author: James Muehlner <james.muehl...@guac-dev.org> Authored: Wed Feb 15 22:00:35 2017 -0800 Committer: James Muehlner <james.muehl...@guac-dev.org> Committed: Wed Feb 15 22:04:27 2017 -0800 ---------------------------------------------------------------------- .../src/main/webapp/modules/Status.js | 39 ++++++++++++++++++++ .../guacamole/protocol/GuacamoleStatus.java | 35 ++++++++++++++++++ .../app/client/controllers/clientController.js | 12 +++++- guacamole/src/main/webapp/translations/en.json | 10 ++++- 4 files changed, 93 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
