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

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

commit ed86774148a080b65ef88b81cd5ee3521d611d0d
Merge: 3c52d71f8 ad3a007e9
Author: Virtually Nick <[email protected]>
AuthorDate: Sun Aug 25 08:37:31 2024 -0400

    Merge main branch changes to next.

 .../src/app/clipboard/directives/guacClipboard.js  | 25 ++++++++-----
 .../src/app/clipboard/styles/clipboard.css         | 43 ++++++++++++++++++++--
 .../src/app/clipboard/templates/guacClipboard.html | 14 +++++--
 .../src/app/home/controllers/homeController.js     |  8 ++--
 .../app/home/directives/guacRecentConnections.js   | 10 -----
 .../src/main/frontend/src/app/home/styles/home.css | 12 +++---
 .../app/home/templates/guacRecentConnections.html  |  2 +-
 .../main/frontend/src/app/home/templates/home.html | 13 +++----
 .../main/frontend/src/app/index/styles/headers.css |  9 +++--
 .../settings/templates/settingsPreferences.html    | 38 +++++++++----------
 guacamole/src/main/frontend/src/images/x-black.svg |  1 +
 .../src/main/frontend/src/translations/ca.json     |  2 +-
 .../src/main/frontend/src/translations/cs.json     |  2 +-
 .../src/main/frontend/src/translations/de.json     |  2 +-
 .../src/main/frontend/src/translations/en.json     |  6 +--
 .../src/main/frontend/src/translations/fr.json     |  5 +--
 .../src/main/frontend/src/translations/ja.json     |  4 +-
 .../src/main/frontend/src/translations/zh.json     |  2 +-
 18 files changed, 122 insertions(+), 76 deletions(-)

Reply via email to