GUACAMOLE-360: Merge support for managing own sessions.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/33679a08 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/33679a08 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/33679a08 Branch: refs/heads/master Commit: 33679a08d4b90169f8c5ff64c9762d20e47c288b Parents: 984ab48 9aa369d Author: Michael Jumper <[email protected]> Authored: Wed Jun 20 11:01:16 2018 -0700 Committer: Michael Jumper <[email protected]> Committed: Wed Jun 20 11:01:16 2018 -0700 ---------------------------------------------------------------------- .../ActiveConnectionPermissionService.java | 4 +- .../ActiveConnectionService.java | 65 ++++++++++++++++++-- .../app/navigation/services/userPageService.js | 26 ++++---- .../settings/directives/guacSettingsSessions.js | 14 +++-- .../src/main/webapp/layouts/es-es-qwerty.json | 2 +- guacamole/src/main/webapp/translations/de.json | 2 +- guacamole/src/main/webapp/translations/en.json | 2 +- guacamole/src/main/webapp/translations/es.json | 2 +- guacamole/src/main/webapp/translations/fr.json | 2 +- guacamole/src/main/webapp/translations/it.json | 2 +- guacamole/src/main/webapp/translations/nl.json | 2 +- guacamole/src/main/webapp/translations/no.json | 2 +- guacamole/src/main/webapp/translations/ru.json | 2 +- guacamole/src/main/webapp/translations/zh.json | 2 +- 14 files changed, 91 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
