This is an automated email from the ASF dual-hosted git repository.

jmuehlner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 69e1f5f51fda02fe1a491884f968a154f8368784
Merge: 037ed21 dd86130
Author: James Muehlner <[email protected]>
AuthorDate: Wed Jul 14 13:41:03 2021 -0700

    GUACAMOLE-724: Merge multiple-connection tile support/view.

 .../src/app/client/controllers/clientController.js | 983 +++++++--------------
 .../src/app/client/directives/guacClient.js        | 964 +++++++++++---------
 .../client/directives/guacClientNotification.js    | 431 +++++++++
 .../src/app/client/directives/guacClientPanel.js   | 100 +--
 .../src/app/client/directives/guacClientZoom.js    |  85 ++
 .../src/app/client/directives/guacFileBrowser.js   |  10 +-
 .../client/directives/guacFileTransferManager.js   |  30 +-
 .../src/app/client/directives/guacThumbnail.js     |  39 -
 .../src/app/client/directives/guacTiledClients.js  | 171 ++++
 .../app/client/directives/guacTiledThumbnails.js   |  77 ++
 .../src/app/client/services/guacClientManager.js   | 207 ++++-
 .../main/frontend/src/app/client/styles/client.css |  12 +-
 .../app/client/styles/connection-select-menu.css   |   5 +
 .../src/app/client/styles/connection-warning.css   |   2 +-
 .../src/app/client/styles/file-browser.css         |   6 +-
 .../src/app/client/styles/filesystem-menu.css      |   2 +-
 .../frontend/src/app/client/styles/guac-menu.css   |  42 +-
 .../main/frontend/src/app/client/styles/menu.css   |  23 +-
 .../src/app/client/styles/notification.css         |  76 +-
 .../frontend/src/app/client/styles/share-menu.css  |   2 +-
 .../src/app/client/styles/thumbnail-display.css    |   5 -
 .../src/app/client/styles/tiled-client-grid.css    | 138 +++
 .../src/app/client/styles/transfer-manager.css     |   8 +
 .../frontend/src/app/client/styles/transfer.css    |   2 +-
 .../main/frontend/src/app/client/styles/zoom.css   |  75 ++
 .../frontend/src/app/client/templates/client.html  |  64 +-
 .../src/app/client/templates/connection.html       |  13 +-
 .../src/app/client/templates/connectionGroup.html  |  14 +-
 .../src/app/client/templates/guacClient.html       |   6 +-
 .../client/templates/guacClientNotification.html   |   5 +
 .../src/app/client/templates/guacClientPanel.html  |  20 +-
 .../src/app/client/templates/guacClientZoom.html   |  18 +
 .../client/templates/guacFileTransferManager.html  |  16 +-
 .../src/app/client/templates/guacThumbnail.html    |   9 +-
 .../src/app/client/templates/guacTiledClients.html |  28 +
 .../app/client/templates/guacTiledThumbnails.html  |  14 +
 .../src/app/client/types/ClientProperties.js       |  17 +-
 .../frontend/src/app/client/types/ManagedClient.js | 215 +++--
 .../src/app/client/types/ManagedClientGroup.js     | 359 ++++++++
 .../src/app/client/types/ManagedFilesystem.js      |  22 +-
 .../src/app/clipboard/directives/guacClipboard.js  |  70 +-
 .../src/app/clipboard/services/clipboardService.js |  84 +-
 .../src/app/clipboard/styles/clipboard.css         |   2 +-
 .../src/app/clipboard/types/ClipboardData.js       |   9 +
 .../src/app/element/directives/guacClick.js        | 126 +++
 .../frontend/src/app/form/styles/form-field.css    |   4 +-
 .../app/home/directives/guacRecentConnections.js   |  41 +-
 .../app/home/templates/guacRecentConnections.html  |  17 -
 .../src/app/index/config/indexRouteConfig.js       |   3 +-
 .../src/app/index/controllers/indexController.js   |  44 +-
 .../frontend/src/app/index/styles/animation.css    |   9 +
 .../main/frontend/src/app/index/styles/buttons.css |  12 +-
 .../src/app/index/styles/fatal-page-error.css      |   2 +-
 .../main/frontend/src/app/index/styles/loading.css |   2 +-
 .../{client => index}/styles/other-connections.css |  15 +-
 .../src/app/index/styles/sorted-tables.css         |   4 +-
 .../src/main/frontend/src/app/index/styles/ui.css  |  32 +-
 .../main/frontend/src/app/list/styles/filter.css   |   2 +-
 .../main/frontend/src/app/list/styles/pager.css    |   8 +-
 .../main/frontend/src/app/login/styles/dialog.css  |   2 +-
 .../src/app/manage/styles/manage-user-group.css    |   6 +-
 .../frontend/src/app/manage/styles/manage-user.css |   6 +-
 .../app/manage/templates/identifierSetEditor.html  |   6 +-
 .../frontend/src/app/navigation/styles/menu.css    |   2 +-
 .../src/app/navigation/styles/user-menu.css        |  10 +-
 .../frontend/src/app/notification/styles/modal.css |  16 +-
 .../src/app/notification/styles/notification.css   |   2 +-
 .../frontend/src/app/settings/styles/buttons.css   |   8 +-
 .../settings/templates/settingsPreferences.html    |   4 +-
 .../frontend/src/images/action-icons/guac-back.png | Bin 586 -> 0 bytes
 .../frontend/src/images/action-icons/guac-back.svg |   1 +
 .../src/images/action-icons/guac-config-dark.png   | Bin 966 -> 0 bytes
 .../src/images/action-icons/guac-config-dark.svg   |   1 +
 .../src/images/action-icons/guac-config.png        | Bin 1230 -> 0 bytes
 .../src/images/action-icons/guac-config.svg        |   1 +
 .../src/images/action-icons/guac-delete.png        | Bin 611 -> 0 bytes
 .../src/images/action-icons/guac-first-page.png    | Bin 690 -> 0 bytes
 .../src/images/action-icons/guac-first-page.svg    |   1 +
 .../src/images/action-icons/guac-group-add.png     | Bin 525 -> 0 bytes
 .../src/images/action-icons/guac-group-add.svg     |   1 +
 .../src/images/action-icons/guac-hide-pass.png     | Bin 721 -> 0 bytes
 .../src/images/action-icons/guac-hide-pass.svg     |   1 +
 .../src/images/action-icons/guac-home-dark.png     | Bin 780 -> 0 bytes
 .../src/images/action-icons/guac-home-dark.svg     |   1 +
 .../frontend/src/images/action-icons/guac-home.png | Bin 874 -> 0 bytes
 .../frontend/src/images/action-icons/guac-home.svg |   1 +
 .../src/images/action-icons/guac-key-dark.png      | Bin 728 -> 0 bytes
 .../frontend/src/images/action-icons/guac-key.png  | Bin 702 -> 0 bytes
 .../frontend/src/images/action-icons/guac-key.svg  |   1 +
 .../src/images/action-icons/guac-last-page.png     | Bin 707 -> 0 bytes
 .../src/images/action-icons/guac-last-page.svg     |   1 +
 .../src/images/action-icons/guac-logout-dark.png   | Bin 1032 -> 0 bytes
 .../src/images/action-icons/guac-logout-dark.svg   |   1 +
 .../src/images/action-icons/guac-logout.png        | Bin 1024 -> 0 bytes
 .../src/images/action-icons/guac-logout.svg        |   1 +
 .../src/images/action-icons/guac-monitor-add.png   | Bin 560 -> 0 bytes
 .../src/images/action-icons/guac-monitor-add.svg   |   1 +
 .../src/images/action-icons/guac-next-page.png     | Bin 626 -> 0 bytes
 .../src/images/action-icons/guac-next-page.svg     |   1 +
 .../src/images/action-icons/guac-prev-page.png     | Bin 648 -> 0 bytes
 .../src/images/action-icons/guac-prev-page.svg     |   1 +
 .../src/images/action-icons/guac-show-pass.png     | Bin 709 -> 0 bytes
 .../src/images/action-icons/guac-show-pass.svg     |   1 +
 .../src/images/action-icons/guac-user-add.png      | Bin 810 -> 0 bytes
 .../src/images/action-icons/guac-user-add.svg      |   1 +
 .../images/action-icons/guac-user-group-add.png    | Bin 1222 -> 0 bytes
 .../images/action-icons/guac-user-group-add.svg    |   1 +
 .../src/main/frontend/src/images/arrows/down.png   | Bin 282 -> 0 bytes
 .../src/main/frontend/src/images/arrows/down.svg   |   1 +
 .../src/main/frontend/src/images/arrows/left.png   | Bin 246 -> 0 bytes
 .../src/main/frontend/src/images/arrows/left.svg   |   1 +
 .../src/main/frontend/src/images/arrows/right.png  | Bin 264 -> 0 bytes
 .../src/main/frontend/src/images/arrows/right.svg  |   1 +
 .../src/main/frontend/src/images/arrows/up.png     | Bin 237 -> 0 bytes
 .../src/main/frontend/src/images/arrows/up.svg     |   1 +
 guacamole/src/main/frontend/src/images/checker.png | Bin 208 -> 0 bytes
 guacamole/src/main/frontend/src/images/checker.svg |   1 +
 .../src/main/frontend/src/images/checkmark.png     | Bin 569 -> 0 bytes
 .../src/main/frontend/src/images/checkmark.svg     |   1 +
 .../src/main/frontend/src/images/circle-arrows.png | Bin 888 -> 0 bytes
 .../src/main/frontend/src/images/circle-arrows.svg |   1 +
 guacamole/src/main/frontend/src/images/cog.png     | Bin 4651 -> 0 bytes
 guacamole/src/main/frontend/src/images/cog.svg     |   1 +
 guacamole/src/main/frontend/src/images/drive.png   | Bin 752 -> 0 bytes
 guacamole/src/main/frontend/src/images/drive.svg   |   1 +
 guacamole/src/main/frontend/src/images/file.png    | Bin 471 -> 0 bytes
 guacamole/src/main/frontend/src/images/file.svg    |   1 +
 .../src/main/frontend/src/images/folder-closed.png | Bin 487 -> 0 bytes
 .../src/main/frontend/src/images/folder-closed.svg |   1 +
 .../src/main/frontend/src/images/folder-open.png   | Bin 803 -> 0 bytes
 .../src/main/frontend/src/images/folder-open.svg   |   1 +
 .../src/main/frontend/src/images/folder-up.png     | Bin 819 -> 0 bytes
 .../src/main/frontend/src/images/folder-up.svg     |   1 +
 .../src/images/group-icons/guac-closed.png         | Bin 843 -> 0 bytes
 .../src/images/group-icons/guac-closed.svg         |   1 +
 .../frontend/src/images/group-icons/guac-open.png  | Bin 717 -> 0 bytes
 .../frontend/src/images/group-icons/guac-open.svg  |   1 +
 .../src/main/frontend/src/images/guac-mono-192.png | Bin 6041 -> 0 bytes
 .../src/main/frontend/src/images/guac-tricolor.png | Bin 14890 -> 0 bytes
 .../src/main/frontend/src/images/guac-tricolor.svg |   1 +
 guacamole/src/main/frontend/src/images/lock.png    | Bin 511 -> 0 bytes
 guacamole/src/main/frontend/src/images/lock.svg    |   1 +
 .../src/main/frontend/src/images/magnifier.png     | Bin 1058 -> 0 bytes
 .../src/main/frontend/src/images/magnifier.svg     |   1 +
 .../frontend/src/images/noguacamole-logo-24.png    | Bin 1245 -> 0 bytes
 guacamole/src/main/frontend/src/images/plus.png    | Bin 299 -> 0 bytes
 guacamole/src/main/frontend/src/images/plus.svg    |   1 +
 .../src/main/frontend/src/images/progress.png      | Bin 473 -> 0 bytes
 .../src/main/frontend/src/images/progress.svg      |   1 +
 .../src/images/protocol-icons/guac-monitor.png     | Bin 691 -> 0 bytes
 .../src/images/protocol-icons/guac-monitor.svg     |   1 +
 .../src/images/protocol-icons/guac-plug.png        | Bin 727 -> 0 bytes
 .../src/images/protocol-icons/guac-plug.svg        |   1 +
 .../src/images/protocol-icons/guac-text.png        | Bin 792 -> 0 bytes
 .../src/images/protocol-icons/guac-text.svg        |   1 +
 .../frontend/src/images/settings/tablet-keys.png   | Bin 3175 -> 0 bytes
 .../frontend/src/images/settings/tablet-keys.svg   |   1 +
 .../main/frontend/src/images/settings/touchpad.png | Bin 38013 -> 0 bytes
 .../main/frontend/src/images/settings/touchpad.svg |   1 +
 .../frontend/src/images/settings/touchscreen.png   | Bin 24025 -> 0 bytes
 .../frontend/src/images/settings/touchscreen.svg   |   1 +
 .../main/frontend/src/images/settings/zoom-in.png  | Bin 1553 -> 0 bytes
 .../main/frontend/src/images/settings/zoom-in.svg  |   1 +
 .../main/frontend/src/images/settings/zoom-out.png | Bin 1521 -> 0 bytes
 .../main/frontend/src/images/settings/zoom-out.svg |   1 +
 .../src/main/frontend/src/images/share-white.svg   |   1 +
 guacamole/src/main/frontend/src/images/share.png   | Bin 1112 -> 0 bytes
 guacamole/src/main/frontend/src/images/share.svg   |   1 +
 .../src/images/user-icons/guac-user-group.png      | Bin 1428 -> 0 bytes
 .../src/images/user-icons/guac-user-group.svg      |   1 +
 .../frontend/src/images/user-icons/guac-user.png   | Bin 1049 -> 0 bytes
 .../frontend/src/images/user-icons/guac-user.svg   |   1 +
 .../src/main/frontend/src/images/warning-white.png | Bin 4506 -> 0 bytes
 .../src/main/frontend/src/images/warning-white.svg |   1 +
 guacamole/src/main/frontend/src/images/warning.png | Bin 1059 -> 0 bytes
 guacamole/src/main/frontend/src/images/warning.svg |   1 +
 guacamole/src/main/frontend/src/images/x-red.png   | Bin 583 -> 0 bytes
 guacamole/src/main/frontend/src/images/x-red.svg   |   1 +
 guacamole/src/main/frontend/src/images/x.png       | Bin 591 -> 0 bytes
 guacamole/src/main/frontend/src/images/x.svg       |   1 +
 guacamole/src/main/frontend/src/index.html         |   7 +-
 pom.xml                                            |   1 +
 182 files changed, 3273 insertions(+), 1652 deletions(-)

Reply via email to