Merge 1.0.0 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/587c0c20 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/587c0c20 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/587c0c20 Branch: refs/heads/master Commit: 587c0c207327c24c94d253defafe864beec71598 Parents: 661ed46 c36d333 Author: Nick Couchman <vn...@apache.org> Authored: Thu Jul 26 06:15:30 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Thu Jul 26 06:15:30 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/587c0c20/guacamole/src/main/webapp/translations/en.json ----------------------------------------------------------------------
