GUACAMOLE-339: Merge addition of remote host to connection history table.

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/682a6e49
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/682a6e49
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/682a6e49

Branch: refs/heads/master
Commit: 682a6e49abce2c23b5286d2140f382fe4da95d80
Parents: 7c162fd 8b71e30
Author: Michael Jumper <[email protected]>
Authored: Sun Jul 16 19:49:26 2017 -0700
Committer: Michael Jumper <[email protected]>
Committed: Sun Jul 16 19:49:26 2017 -0700

----------------------------------------------------------------------
 .../jdbc/connection/ConnectionRecordModel.java  | 25 ++++++++++++++++++++
 .../connection/ModeledConnectionRecord.java     |  2 +-
 .../tunnel/AbstractGuacamoleTunnelService.java  |  1 +
 .../schema/001-create-schema.sql                |  1 +
 .../schema/upgrade/upgrade-pre-0.9.14.sql       |  7 ++++++
 .../jdbc/connection/ConnectionRecordMapper.xml  |  8 ++++++-
 .../schema/001-create-schema.sql                |  1 +
 .../schema/upgrade/upgrade-pre-0.9.14.sql       |  7 ++++++
 .../jdbc/connection/ConnectionRecordMapper.xml  |  8 ++++++-
 .../app/manage/templates/manageConnection.html  |  2 ++
 .../app/rest/types/ConnectionHistoryEntry.js    |  9 ++++++-
 .../directives/guacSettingsConnectionHistory.js | 10 +++++---
 .../templates/settingsConnectionHistory.html    |  4 ++++
 .../types/ConnectionHistoryEntryWrapper.js      |  7 ++++++
 guacamole/src/main/webapp/translations/en.json  |  8 ++++---
 15 files changed, 90 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


Reply via email to