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 2f30b6aad6909048746ff7e3a18e90252d1fffe3 Merge: f194ca636 9193b37ed Author: Virtually Nick <[email protected]> AuthorDate: Fri Feb 3 14:31:12 2023 -0500 Merge 1.5.0 changes back to master. .../src/main/webapp/modules/Client.js | 81 ++++++++- .../src/app/client/controllers/clientController.js | 18 -- .../src/app/client/directives/guacClientMessage.js | 87 --------- .../app/client/directives/guacClientUserCount.js | 196 +++++++++++++++++++++ .../src/app/client/directives/guacMessageDialog.js | 76 -------- .../src/app/client/styles/client-message.css | 23 --- .../src/app/client/styles/message-dialog.css | 122 ------------- .../src/app/client/styles/tiled-client-grid.css | 134 ++++++++++++++ .../frontend/src/app/client/templates/client.html | 5 - .../app/client/templates/guacClientMessage.html | 8 - .../app/client/templates/guacClientUserCount.html | 9 + .../app/client/templates/guacMessageDialog.html | 21 --- .../src/app/client/templates/guacTiledClients.html | 7 +- .../frontend/src/app/client/types/ManagedClient.js | 78 ++++---- .../src/app/client/types/ManagedClientMessage.js | 59 ------- .../src/images/user-icons/guac-user-white.svg | 1 + .../src/main/frontend/src/translations/en.json | 7 +- 17 files changed, 474 insertions(+), 458 deletions(-)
