burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Merge from master guacamole updates

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-03-12 07:21:22 +01:00
parent dba5e4267a
commit ee72b65534
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-tunnel/pom.xml
View File

@ -81,14 +81,14 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version> <version>0.9.14</version>
</dependency> </dependency>
<!-- Guacamole JavaScript library --> <!-- Guacamole JavaScript library -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>0.9.12-incubating</version> <version>0.9.14</version>
<type>zip</type> <type>zip</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

38
guacamole-tunnel/src/main/webapp/scripts/client-ui.js
View File

@ -51,6 +51,12 @@ GuacUI.Client = {
0x0205: "This connection is currently in use, and concurrent access to \ 0x0205: "This connection is currently in use, and concurrent access to \
this connection is not allowed. Please try again later.", this connection is not allowed. Please try again later.",
0x0207: "The Guacamole server is not currently reachable. Please \
check your network and try again.",
0x0208: "The Guacamole server is not accepting connections. Please \
check your network and try again.",
0x0301: "You do not have permission to access this connection because \ 0x0301: "You do not have permission to access this connection because \
you are not logged in. Please log in and try again.", you are not logged in. Please log in and try again.",
@ -94,14 +100,32 @@ GuacUI.Client = {
the connection. Please try again or contact your system \ the connection. Please try again or contact your system \
administrator.", administrator.",
0x0205: "This connection has been closed because it conflicts with \ 0x0207: "The remote desktop server is currently unreachable. If the \
another connection. Please try again later.", problem persists, please notify your system administrator, or \
check your system logs.",
0x0208: "The remote desktop server is currently unavailable. If the \
problem persists, please notify your system administrator, or \
check your system logs.",
0x0209: "The remote desktop server has closed the connection because \
it conflicts with another connection. Please try again later.",
0x020A: "The remote desktop server has closed the connection because \
it appeared to be inactive. If this is undesired or \
unexpected, please notify your system administrator, or check \
your system settings.",
0x020B: "The remote desktop server has forcibly closed the connection. \
If this is undesired or unexpected, please notify your system \
administrator, or check your system logs.",
0x0301: "Log in failed. Please reconnect and try again.", 0x0301: "Log in failed. Please reconnect and try again.",
0x0303: "You do not have permission to access this connection. If you \ 0x0303: "The remote desktop server has denied access to this \
require access, please ask your system administrator to add \ connection. If you require access, please ask your system \
you the list of allowed users, or check your system settings.", administrator to grant your account access, or check your \
system settings.",
0x0308: "The Guacamole server has closed the connection because there \ 0x0308: "The Guacamole server has closed the connection because there \
has been no response from your browser for long enough that \ has been no response from your browser for long enough that \
@ -179,6 +203,8 @@ GuacUI.Client = {
0x0200: true, 0x0200: true,
0x0202: true, 0x0202: true,
0x0203: true, 0x0203: true,
0x0207: true,
0x0208: true,
0x0308: true 0x0308: true
}, },
@ -190,6 +216,8 @@ GuacUI.Client = {
0x0200: true, 0x0200: true,
0x0202: true, 0x0202: true,
0x0203: true, 0x0203: true,
0x0207: true,
0x0208: true,
0x0301: true, 0x0301: true,
0x0308: true 0x0308: true
}, },