You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2021/12/24 22:52:37 UTC
[guacamole-client] branch master updated (a543db5 -> 841b659)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from a543db5 Merge 1.4.0 changes back to master.
add f34477f GUACAMOLE-1261: Escape strings used to generate URLs for user, groups, and connections.
add 5de1063 GUACAMOLE-1261: Merge correction to handling of generated settings URLs.
new 841b659 Merge 1.4.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:
.../guacModal.js => index/filters/escapeFilter.js} | 18 ++++++++++++------
.../app/settings/templates/settingsConnections.html | 4 ++--
.../src/app/settings/templates/settingsUserGroups.html | 4 ++--
.../src/app/settings/templates/settingsUsers.html | 4 ++--
4 files changed, 18 insertions(+), 12 deletions(-)
copy guacamole/src/main/frontend/src/app/{notification/directives/guacModal.js => index/filters/escapeFilter.js} (70%)
[guacamole-client] 01/01: Merge 1.4.0 changes back to master.
Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 841b659a20e0b72f3b548ece5bde5556b1dc4ce1
Merge: a543db5 5de1063
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Fri Dec 24 14:52:16 2021 -0800
Merge 1.4.0 changes back to master.
.../frontend/src/app/index/filters/escapeFilter.js | 35 ++++++++++++++++++++++
.../settings/templates/settingsConnections.html | 4 +--
.../app/settings/templates/settingsUserGroups.html | 4 +--
.../src/app/settings/templates/settingsUsers.html | 4 +--
4 files changed, 41 insertions(+), 6 deletions(-)