This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from f194ca636 Merge 1.5.0 changes back to master.
add 250039aaf GUACAMOLE-1293: Replace message list with overall shared
user count.
add a0d5824e8 GUACAMOLE-1293: Add "onjoin" and "onleave" events as
alternative to handling low-level "msg" instructions directly.
add c45c52952 GUACAMOLE-1293: Display user count and join/leave
notifications in out-of-the-way status indicator.
add b7e3f73ff GUACAMOLE-1293: Clarify message parameter mapping with
variable naming.
add bd9132741 GUACAMOLE-1293: Allow "onmsg" to determine whether "onjoin"
and "onleave" fire.
add 9193b37ed GUACAMOLE-1293: Merge add list/count of current users joined
to a connection.
new 2f30b6aad Merge 1.5.0 changes back to master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
delete mode 100644
guacamole/src/main/frontend/src/app/client/directives/guacClientMessage.js
create mode 100644
guacamole/src/main/frontend/src/app/client/directives/guacClientUserCount.js
delete mode 100644
guacamole/src/main/frontend/src/app/client/directives/guacMessageDialog.js
delete mode 100644
guacamole/src/main/frontend/src/app/client/styles/client-message.css
delete mode 100644
guacamole/src/main/frontend/src/app/client/styles/message-dialog.css
delete mode 100644
guacamole/src/main/frontend/src/app/client/templates/guacClientMessage.html
create mode 100644
guacamole/src/main/frontend/src/app/client/templates/guacClientUserCount.html
delete mode 100644
guacamole/src/main/frontend/src/app/client/templates/guacMessageDialog.html
delete mode 100644
guacamole/src/main/frontend/src/app/client/types/ManagedClientMessage.js
create mode 100644
guacamole/src/main/frontend/src/images/user-icons/guac-user-white.svg