This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit e550b244f8bfefdbf26aeed6b5bba7c78e43e6d9 Merge: 960db9a 85bc4ac Author: Virtually Nick <[email protected]> AuthorDate: Tue Jun 15 17:22:29 2021 -0400 GUACAMOLE-680: Merge do not immediately re-authenticate after logout. .../src/app/auth/service/authenticationService.js | 29 +++++-- .../src/app/client/controllers/clientController.js | 5 +- .../src/app/index/controllers/indexController.js | 93 ++++++++++++++++++++-- .../main/frontend/src/app/index/styles/cloak.css | 27 +++++++ .../src/app/index/styles/fatal-page-error.css | 15 +--- .../frontend/src/app/index/styles/logged-out.css | 29 +++++++ .../main/frontend/src/app/index/styles/status.css | 46 +---------- .../main/frontend/src/app/login/styles/dialog.css | 2 - .../frontend/src/app/login/templates/login.html | 2 +- .../src/app/navigation/directives/guacUserMenu.js | 8 +- .../src/app/notification/directives/guacModal.js | 29 +++++++ .../dialog.css => notification/styles/modal.css} | 67 ++-------------- .../src/app/notification/styles/notification.css | 4 +- .../src/app/notification/templates/guacModal.html | 3 + guacamole/src/main/frontend/src/index.html | 59 ++++++++------ .../src/main/frontend/src/translations/en.json | 2 + 16 files changed, 247 insertions(+), 173 deletions(-)
