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 2018/01/05 15:36:49 UTC
[7/7] guacamole-client git commit: Merge 0.9.14 changes back to
master.
Merge 0.9.14 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/e7cb654c
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/e7cb654c
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/e7cb654c
Branch: refs/heads/master
Commit: e7cb654c23ffc18fb1faadaef1847115618a4848
Parents: c170612 ed6722b
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Jan 5 10:36:14 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Jan 5 10:36:14 2018 -0500
----------------------------------------------------------------------
.../rest/connection/APIConnection.java | 33 ++++-
.../rest/history/APIActivityRecord.java | 131 +++++++++++++++++
.../rest/history/APIConnectionRecord.java | 89 +-----------
.../APIConnectionRecordSortPredicate.java | 144 -------------------
.../rest/history/APISortPredicate.java | 144 +++++++++++++++++++
.../guacamole/rest/history/HistoryResource.java | 60 +++++++-
.../org/apache/guacamole/rest/user/APIUser.java | 31 ++++
.../guacamole/rest/user/UserResource.java | 30 ++++
.../main/webapp/app/rest/types/Connection.js | 9 ++
.../src/main/webapp/app/rest/types/User.js | 9 ++
.../settings/directives/guacSettingsUsers.js | 33 ++++-
.../webapp/app/settings/styles/user-list.css | 42 ++++++
.../app/settings/templates/settingsUsers.html | 35 +++--
guacamole/src/main/webapp/translations/de.json | 6 +-
guacamole/src/main/webapp/translations/en.json | 7 +-
guacamole/src/main/webapp/translations/fr.json | 6 +-
guacamole/src/main/webapp/translations/it.json | 6 +-
guacamole/src/main/webapp/translations/nl.json | 6 +-
guacamole/src/main/webapp/translations/no.json | 6 +-
guacamole/src/main/webapp/translations/ru.json | 6 +-
20 files changed, 580 insertions(+), 253 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/e7cb654c/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------