GUACAMOLE-220: Merge display readable connections only by default within 
permission editor.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/c36d3332
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/c36d3332
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/c36d3332

Branch: refs/heads/staging/1.0.0
Commit: c36d333216d539958d7b600456076151fa8f3995
Parents: d6ecfaa 055219b
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Jul 26 06:13:07 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Jul 26 06:13:07 2018 -0400

----------------------------------------------------------------------
 .../groupList/directives/guacGroupListFilter.js | 114 ++++++++-
 .../main/webapp/app/index/styles/headers.css    |   4 +
 .../directives/connectionPermissionEditor.js    | 248 +++++++++++++++----
 .../webapp/app/manage/styles/manage-user.css    |   4 -
 .../templates/connectionPermissionEditor.html   |   5 +-
 .../webapp/app/manage/templates/manageUser.html |   2 +-
 .../navigation/directives/guacSectionTabs.js    | 143 +++++++++++
 .../webapp/app/navigation/styles/page-tabs.css  |  55 ----
 .../main/webapp/app/navigation/styles/tabs.css  |  63 +++++
 .../navigation/templates/guacSectionTabs.html   |  10 +
 .../webapp/app/settings/styles/settings.css     |   4 -
 .../webapp/app/settings/templates/settings.html |   2 +-
 guacamole/src/main/webapp/translations/en.json  |   8 +-
 13 files changed, 531 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


Reply via email to