[guacamole-client] branch master updated (d61203c -> e02dcf8)

2019-05-10 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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


from d61203c  Merge 1.1.0 changes back to master.
 add 212a39b  GUACAMOLE-422: Add definitions and translations for the 
RDP/SSH "timezone" parameter.
 add 863147e  GUACAMOLE-422: Merge add definitions and translations for the 
RDP/SSH "timezone" parameter.
 new e02dcf8  Merge 1.1.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:
 .../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.

2019-05-10 Thread vnick
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: GUACAMOLE-422: Merge add definitions and translations for the RDP/SSH "timezone" parameter.

2019-05-10 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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

commit 863147eb50e79ffeb76111c06b2d6a8eb51656c9
Merge: 4f55001 212a39b
Author: Virtually Nick 
AuthorDate: Fri May 10 10:59:48 2019 -0400

GUACAMOLE-422: Merge add definitions and translations for the RDP/SSH 
"timezone" parameter.

 .../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] branch staging/1.1.0 updated (4f55001 -> 863147e)

2019-05-10 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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


from 4f55001  GUACAMOLE-649: Merge add definition and translation for SSH 
"locale" parameter.
 add 212a39b  GUACAMOLE-422: Add definitions and translations for the 
RDP/SSH "timezone" parameter.
 new 863147e  GUACAMOLE-422: Merge add definitions and translations for the 
RDP/SSH "timezone" parameter.

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:
 .../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] branch staging/1.1.0 updated (4d1e0f1 -> 4f55001)

2019-05-10 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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


from 4d1e0f1  GUACAMOLE-696: Merge changes taking database groups into 
account with respect to database objects when user is otherwise external to the 
database.
 add b5c5fa3  GUACAMOLE-649: Add definition and translation for SSH 
"locale" parameter.
 new 4f55001  GUACAMOLE-649: Merge add definition and translation for SSH 
"locale" parameter.

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:
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json| 4 
 guacamole/src/main/webapp/translations/en.json| 1 +
 2 files changed, 5 insertions(+)