[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 5ff81f7735798c3804097d97f7422f03ba769379
Merge: 7a68a78 981adc9
Author: Michael Jumper
AuthorDate: Mon Sep 9 18:57:01 2019 -0700
Merge 1.1.0 changes back to master.
Conflicts:
* extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
* extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
* extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
*
extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
* extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
* extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
* guacamole/src/main/webapp/translations/de.json
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 12 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 13 +
.../src/main/resources/translations/de.json| 112 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 12 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 18 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 13 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/de.json| 32 ++
guacamole/src/main/webapp/translations/de.json | 485 +++--
18 files changed, 574 insertions(+), 133 deletions(-)
diff --cc extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index 40d0334,549bba9..7af8059
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@@ -10,8 -10,8 +10,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
"js" : [
diff --cc extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
index 7daefdd,efb0dda..8f49e4b
--- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
@@@ -10,8 -10,8 +10,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
"js" : [
diff --cc extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
index b15f83f,c517be1..2da0c18
--- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
@@@ -10,8 -10,8 +10,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
"js" : [
diff --cc
extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
index 48eeb42,eca4d94..1dbb2bf
---
a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
+++
b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
@@@ -21,8 -21,8 +21,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
"resources" : {
diff --cc extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
index 707f233,304a87d..117c8fb
--- a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
@@@ -10,8 -10,8 +10,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
"js" : [
diff --cc extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
index ed42d6f,6845286..7067d59
--- a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
@@@ -10,8 -10,8 +10,9 @@@
],
"translations" : [
+ "translations/de.json",
-"translations/en.json"
+"translations/en.json",
+"translations/ja.json"
],
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 a00baf6d893224b23b70cf475a368469814d5b83 Merge: a9e9f50 276f8d4 Author: Michael Jumper AuthorDate: Sun Sep 1 15:07:38 2019 -0700 Merge 1.1.0 changes back to master. .../java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 e58101997ff6af6e2b58347e92464038c607090d Merge: 339c920 7fd9bf4 Author: Virtually Nick AuthorDate: Mon Aug 19 08:17:29 2019 -0400 Merge 1.1.0 changes back to master. .../webapp/app/form/directives/guacInputColor.js | 123 ++ .../webapp/app/form/services/colorPickerService.js | 268 + .../main/webapp/app/form/services/formService.js | 37 ++- .../webapp/app/form/templates/guacInputColor.html | 3 +- 4 files changed, 325 insertions(+), 106 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 25c87922d587f00243e7fb0b712663f336a2b8e2 Merge: a4495cf c643fe9 Author: Michael Jumper AuthorDate: Mon Aug 12 10:15:49 2019 -0700 Merge 1.1.0 changes back to master. .../guacamole/auth/ldap/LDAPConnectionService.java | 16 +++- .../guacamole/auth/ldap/ObjectQueryService.java| 29 +++--- 2 files changed, 17 insertions(+), 28 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 51b1c08cf408191b4a19f6d6a336496e2f4e84b2
Merge: 6a8ffa0 91bf843
Author: James Muehlner
AuthorDate: Thu Aug 8 22:13:05 2019 -0700
Merge 1.1.0 changes back to master.
.../main/java/org/apache/guacamole/form/Field.java | 6 +
.../guacamole/form/TerminalColorSchemeField.java | 25 +-
.../org/apache/guacamole/protocols/kubernetes.json | 2 +-
.../org/apache/guacamole/protocols/ssh.json| 2 +-
.../org/apache/guacamole/protocols/telnet.json | 2 +-
guacamole/pom.xml | 7 +
guacamole/src/licenses/LICENSE | 31 +
guacamole/src/licenses/bundled/pickr-1.2.6/LICENSE | 21 +
.../terminalColorSchemeFieldController.js | 142 +++
.../app/form/controllers/textFieldController.js| 2 +-
.../main/webapp/app/form/directives/formField.js | 14 +-
.../webapp/app/form/directives/guacInputColor.js | 202 +
.../main/webapp/app/form/services/formService.js | 18 +
.../form/styles/terminal-color-scheme-field.css| 158
.../webapp/app/form/templates/checkboxField.html | 8 +-
.../main/webapp/app/form/templates/dateField.html | 1 +
.../main/webapp/app/form/templates/emailField.html | 3 +-
.../main/webapp/app/form/templates/formField.html | 8 +-
.../webapp/app/form/templates/guacInputColor.html | 10 +
.../webapp/app/form/templates/languageField.html | 5 +-
.../webapp/app/form/templates/numberField.html | 8 +-
.../webapp/app/form/templates/passwordField.html | 11 +-
.../webapp/app/form/templates/selectField.html | 5 +-
.../form/templates/terminalColorSchemeField.html | 63 ++
.../webapp/app/form/templates/textAreaField.html | 7 +-
.../main/webapp/app/form/templates/textField.html | 14 +-
.../main/webapp/app/form/templates/timeField.html | 1 +
.../webapp/app/form/templates/timeZoneField.html | 1 +
.../src/main/webapp/app/form/types/ColorScheme.js | 949 +
.../app/manage/styles/connection-parameter.css | 4 +
guacamole/src/main/webapp/app/rest/types/Field.js | 11 +-
guacamole/src/main/webapp/index.html | 6 +-
guacamole/src/main/webapp/translations/en.json | 16 +
33 files changed, 1728 insertions(+), 35 deletions(-)
diff --cc guacamole/src/main/webapp/app/form/templates/checkboxField.html
index 252441b,110ab14..e906f7d
--- a/guacamole/src/main/webapp/app/form/templates/checkboxField.html
+++ b/guacamole/src/main/webapp/app/form/templates/checkboxField.html
@@@ -1,1 -1,5 +1,7 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/dateField.html
index 6fd38da,2da96a1..7673e36
--- a/guacamole/src/main/webapp/app/form/templates/dateField.html
+++ b/guacamole/src/main/webapp/app/form/templates/dateField.html
@@@ -1,6 -1,6 +1,7 @@@
mailto:{{model}}; ng-show="readOnly">{{model}}
diff --cc guacamole/src/main/webapp/app/form/templates/languageField.html
index 5af4e75,b1f25e8..2a22ff2
--- a/guacamole/src/main/webapp/app/form/templates/languageField.html
+++ b/guacamole/src/main/webapp/app/form/templates/languageField.html
@@@ -1,1 -1,3 +1,4 @@@
-
-
diff --cc guacamole/src/main/webapp/app/form/templates/numberField.html
index 9e4c28b,f802b4a..c86fb8e
--- a/guacamole/src/main/webapp/app/form/templates/numberField.html
+++ b/guacamole/src/main/webapp/app/form/templates/numberField.html
@@@ -1,1 -1,5 +1,7 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/passwordField.html
index 68d36f7,69d67e8..35eba9e
--- a/guacamole/src/main/webapp/app/form/templates/passwordField.html
+++ b/guacamole/src/main/webapp/app/form/templates/passwordField.html
@@@ -1,4 -1,9 +1,11 @@@
-
+
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/selectField.html
index f173d54,e5ce0e9..2c672aa
--- a/guacamole/src/main/webapp/app/form/templates/selectField.html
+++ b/guacamole/src/main/webapp/app/form/templates/selectField.html
@@@ -1,2 -1,3 +1,5 @@@
-
diff --cc guacamole/src/main/webapp/app/form/templates/textAreaField.html
index 6614bfb,2d4144b..9761af7
--- a/guacamole/src/main/webapp/app/form/templates/textAreaField.html
+++ b/guacamole/src/main/webapp/app/form/templates/textAreaField.html
@@@ -1,1 -1,4 +1,6 @@@
-
+
diff --cc guacamole/src/main/webapp/app/form/templates/textField.html
index 6abd4f6,938b81c..3aea2bc
--- a/guacamole/src/main/webapp/app/form/templates/textField.html
+++ b/guacamole/src/main/webapp/app/form/templates/textField.html
@@@ -1,7 -1,11 +1,13 @@@
-
-
+
+
{{ getFieldOption(option) | translate
}}
diff --cc guacamole/src/main/webapp/app/form/templates/timeField.html
index 6f7201f,292e44c..2a88230
--- a/guacamole/src/main/webapp/app/form/templates/timeField.html
+++
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 6a8ffa0acf3c6ef35787feb365f13653e14d85f5 Merge: 02ef3ae 8b04414 Author: James Muehlner AuthorDate: Thu Aug 8 20:54:09 2019 -0700 Merge 1.1.0 changes back to master. .../app/client/controllers/clientController.js | 40 +- .../main/webapp/app/client/templates/client.html | 8 ++ .../webapp/app/client/types/ManagedArgument.js | 152 + .../main/webapp/app/client/types/ManagedClient.js | 116 +++- 4 files changed, 308 insertions(+), 8 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 02ef3ae2d89cdeb429c8b39bdbb584f724a59fb1 Merge: ed374fc 02dadfa Author: Virtually Nick AuthorDate: Sat Aug 3 17:06:42 2019 -0400 Merge 1.1.0 changes back to master. .../guacamole/environment/LocalEnvironment.java| 2 +- .../org/apache/guacamole/protocols/kubernetes.json | 174 + guacamole/src/main/webapp/app/index/styles/ui.css | 1 + guacamole/src/main/webapp/translations/en.json | 68 +++- 4 files changed, 243 insertions(+), 2 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 ba12003fd2910f073e8e80e9e3443c8dfc4c8961 Merge: 63fa850 66d2fe3 Author: Virtually Nick AuthorDate: Tue Jul 16 18:39:03 2019 -0400 Merge 1.1.0 changes back to master. .../src/main/resources/org/apache/guacamole/protocols/ssh.json| 4 .../src/main/resources/org/apache/guacamole/protocols/telnet.json | 4 guacamole/src/main/webapp/translations/en.json| 2 ++ 3 files changed, 10 insertions(+)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 00f59420e50c8d2682e052cc51df75b77ffa9b62
Merge: 30f6ac4 f5aa986
Author: Michael Jumper
AuthorDate: Sun Jun 23 19:37:32 2019 -0700
Merge 1.1.0 changes back to master.
.../auth/cas/AuthenticationProviderService.java| 16 +++---
.../auth/cas/CASAuthenticationProvider.java| 15 ++
.../auth/cas/ticket/TicketValidationService.java | 50 --
...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++-
extensions/guacamole-auth-ldap/pom.xml | 8 ---
.../auth/ldap/AuthenticationProviderService.java | 13 +++--
.../guacamole/auth/ldap/LDAPConnectionService.java | 1 -
.../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++--
.../apache/guacamole/auth/ldap/TokenNameTest.java | 53 ---
.../org/apache/guacamole/token}/TokenName.java | 60 ++
.../org/apache/guacamole/token/TokenNameTest.java | 55
11 files changed, 209 insertions(+), 114 deletions(-)
diff --cc
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
index 958ea2c,ba7ac83..fce4760
---
a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
+++
b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
@@@ -30,7 -28,12 +30,11 @@@ import javax.crypto.Cipher
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.nio.charset.Charset;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Map.Entry;
-import javax.xml.bind.DatatypeConverter;
import org.apache.guacamole.GuacamoleException;
+ import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.auth.cas.conf.ConfigurationService;
import org.apache.guacamole.net.auth.Credentials;
@@@ -89,9 -98,12 +99,12 @@@ public class TicketValidationService
validator.setAcceptAnyProxy(true);
validator.setEncoding("UTF-8");
try {
+ Map tokens = new HashMap<>();
-String confRedirectURI = confService.getRedirectURI();
-Assertion a = validator.validate(ticket, confRedirectURI);
+URI confRedirectURI = confService.getRedirectURI();
+Assertion a = validator.validate(ticket,
confRedirectURI.toString());
AttributePrincipal principal = a.getPrincipal();
+ Map ticketAttrs =
+ new HashMap<>(principal.getAttributes());
// Retrieve username and set the credentials.
String username = principal.getName();
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 5f1c70e737ca0b0e7726d5df62ef1631eac078d0 Merge: 1b48f21 82ea1d6 Author: Michael Jumper AuthorDate: Mon Jun 17 18:38:29 2019 -0700 Merge 1.1.0 changes back to master. guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 + guacamole/src/main/webapp/translations/en.json | 1 + 2 files changed, 2 insertions(+)
[guacamole-client] 01/01: merge 1.1.0 changes back to master.
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 1b48f21573e1c07bcc39da9863e7f82036aaf7fc Merge: 15bb363 ce106d6 Author: Virtually Nick AuthorDate: Sat Jun 15 17:16:40 2019 -0400 merge 1.1.0 changes back to master. .../src/main/resources/org/apache/guacamole/protocols/rdp.json| 4 .../src/main/resources/org/apache/guacamole/protocols/ssh.json| 4 guacamole/src/main/webapp/translations/en.json| 1 - 3 files changed, 9 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 15bb363de37f9f54020f03635cbe1c9e6cf28928 Merge: 6dad3b2 8b239ae Author: Virtually Nick AuthorDate: Sat Jun 15 17:11:13 2019 -0400 Merge 1.1.0 changes back to master. .../main/java/org/apache/guacamole/form/Field.java | 8 +++ .../org/apache/guacamole/form/LanguageField.java | 64 ++ .../form/controllers/languageFieldController.js| 54 ++ guacamole/src/main/webapp/app/form/formModule.js | 5 +- .../main/webapp/app/form/services/formService.js | 15 + .../webapp/app/form/templates/languageField.html | 1 + .../settings/directives/guacSettingsPreferences.js | 40 +- .../webapp/app/settings/styles/preferences.css | 23 ++-- .../settings/templates/settingsPreferences.html| 20 +-- 9 files changed, 181 insertions(+), 49 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 6dad3b249c0821f07d9e3b52ae5cd6119a9f8630 Merge: ee6a799 28833f3 Author: Virtually Nick AuthorDate: Sat Jun 8 17:45:42 2019 -0400 Merge 1.1.0 changes back to master. .../protocol/ConfiguredGuacamoleSocket.java| 50 +-- .../protocol/GuacamoleProtocolCapability.java | 48 +++--- .../protocol/GuacamoleProtocolVersion.java | 161 - .../protocol/GuacamoleProtocolVersionTest.java | 151 +++ 4 files changed, 274 insertions(+), 136 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 4df22ce67bdafc028ed0042cd277b3de6264f7aa Merge: a78186e f2ae848 Author: Michael Jumper AuthorDate: Fri Jun 7 09:01:40 2019 -0700 Merge 1.1.0 changes back to master. .../protocol/ConfiguredGuacamoleSocket.java| 30 ++- .../protocol/GuacamoleClientInformation.java | 31 +++ .../protocol/GuacamoleProtocolCapability.java | 77 +++ .../protocol/GuacamoleProtocolVersion.java | 250 + .../org/apache/guacamole/protocols/rdp.json| 4 + .../org/apache/guacamole/protocols/ssh.json| 6 +- guacamole/pom.xml | 7 + guacamole/src/licenses/LICENSE | 30 +++ guacamole/src/licenses/bundled/jstz-1.0.10/LICENSE | 22 ++ .../org/apache/guacamole/tunnel/TunnelRequest.java | 18 +- .../guacamole/tunnel/TunnelRequestService.java | 5 + .../main/webapp/app/client/types/ManagedClient.js | 2 + .../app/settings/services/preferenceService.js | 22 +- .../webapp/app/settings/styles/preferences.css | 2 +- .../settings/templates/settingsPreferences.html| 15 +- guacamole/src/main/webapp/index.html | 3 + guacamole/src/main/webapp/translations/en.json | 4 +- 17 files changed, 519 insertions(+), 9 deletions(-) diff --cc guacamole/pom.xml index 3834b63,7a68606..5552e4b --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@@ -494,13 -494,13 +494,20 @@@ + + +com.google.guava +guava +27.0.1-jre + + + + + org.webjars.npm + jstz + 1.0.10 + +
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 a78186ee2e2079f4787039bb0e243ed4c4c878c5 Merge: 0344ef3 4f340d9 Author: Virtually Nick AuthorDate: Fri Jun 7 11:49:13 2019 -0400 Merge 1.1.0 changes back to master. .../org/apache/guacamole/auth/ldap/connection/ConnectionService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 e02dcf8c84f0f7f2f9c866b0258bde0551c847b9 Merge: d61203c 863147e Author: Virtually Nick AuthorDate: Fri May 10 11:04:19 2019 -0400 Merge 1.1.0 changes back to master. .../src/main/resources/org/apache/guacamole/protocols/rdp.json| 4 .../src/main/resources/org/apache/guacamole/protocols/ssh.json| 4 guacamole/src/main/webapp/translations/en.json| 2 ++ 3 files changed, 10 insertions(+)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 1623f55191d0486b59fffd216fc2ae0d2cc57021 Merge: 95f10f5 4d1e0f1 Author: Michael Jumper AuthorDate: Sun May 5 19:39:21 2019 -0700 Merge 1.1.0 changes back to master. .../apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java | 7 +++ 1 file changed, 7 insertions(+)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 fbcb04e6709f72c2355d971ac7c6c58cbed8d162 Merge: 3c9f880 2140bed Author: Virtually Nick AuthorDate: Thu Apr 25 16:42:57 2019 -0400 Merge 1.1.0 changes back to master. .../guacamole/auth/jdbc/base/EntityMapper.xml | 46 -- 1 file changed, 25 insertions(+), 21 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 3ac3c1dc4f4a134c4c4afbaf7ecc2a1c35391c22 Merge: 0bf1a7d 3c9302f Author: Michael Jumper AuthorDate: Sat Apr 20 10:50:53 2019 -0700 Merge 1.1.0 changes back to master. guacamole-docker/bin/start.sh | 1 + 1 file changed, 1 insertion(+)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 ea1b10e9d1e3f1fa640dff2ca64d61b44bf1ace9 Merge: f170b7e 60ff499 Author: Michael Jumper AuthorDate: Tue Apr 9 11:11:50 2019 -0700 Merge 1.1.0 changes back to master. .../jdbc/JDBCAuthenticationProviderService.java| 24 +++--- .../apache/guacamole/auth/jdbc/user/UserModel.java | 11 +++ .../guacamole/auth/jdbc/user/UserService.java | 37 ++ 3 files changed, 60 insertions(+), 12 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 8f2d3ef1531c19834922b0cdfd71b9ed82937fd6 Merge: c4d70f4 15e5e70 Author: Michael Jumper AuthorDate: Tue Mar 5 11:35:24 2019 -0800 Merge 1.1.0 changes back to master. guacamole/src/main/webapp/translations/zh.json | 3 --- 1 file changed, 3 deletions(-)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
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 8f27896dca01e11453e02787277d0754bfd65c7b Merge: 1bbf9f0 215b643 Author: Virtually Nick AuthorDate: Sat Feb 9 14:24:49 2019 -0500 Merge 1.1.0 changes back to master. doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml| 4 ++-- extensions/guacamole-auth-cas/pom.xml | 6 +++--- .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 4 ++-- .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 4 ++-- .../guacamole-auth-header/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml | 8 .../guacamole-auth-jdbc/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| 4 ++-- extensions/guacamole-auth-ldap/pom.xml| 4 ++-- .../guacamole-auth-ldap/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-openid/pom.xml | 4 ++-- .../guacamole-auth-openid/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-quickconnect/pom.xml| 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/pom.xml | 6 +++--- .../guacamole-auth-radius/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-totp/pom.xml| 4 ++-- .../guacamole-auth-totp/src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- guacamole-common-js/src/main/webapp/modules/Version.js| 2 +- guacamole-common/pom.xml | 2 +- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 8 .../main/java/org/apache/guacamole/extension/ExtensionModule.java | 3 ++- pom.xml | 2 +- 34 files changed, 59 insertions(+), 58 deletions(-)
