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 588915d232500ce17870e8977bdcfd312d58130f Merge: 666ae93 a9e15a9 Author: Virtually Nick <[email protected]> AuthorDate: Sun Dec 12 07:25:13 2021 -0500 Merge 1.4.0 changes back to master. doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-duo/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 8 ++++---- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 6 +++--- extensions/guacamole-auth-json/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-ldap/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-quickconnect/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-base/pom.xml | 2 +- .../modules/guacamole-auth-sso-cas/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-dist/pom.xml | 8 ++++---- .../modules/guacamole-auth-sso-openid/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-saml/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-sso/pom.xml | 8 ++++---- extensions/guacamole-auth-totp/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/pom.xml | 4 ++-- guacamole-common-js/pom.xml | 4 ++-- guacamole-common-js/src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 4 ++-- guacamole-ext/pom.xml | 6 +++--- guacamole/pom.xml | 8 ++++---- .../src/app/index/controllers/indexController.js | 18 ++++++++++++++---- .../apache/guacamole/extension/ExtensionModule.java | 3 ++- pom.xml | 2 +- 43 files changed, 99 insertions(+), 88 deletions(-)
