safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-05 20:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.5.0 changes back to master.

Browse Source
This commit is contained in:
Mike Jumper
2023-01-10 21:52:26 -08:00
parent 6721f20b93 5966dcae63
commit 9f176ed489
90 changed files with 638 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>1.4.0</version>
<version>1.5.0</version>
<name>guacamole</name>
<url>http://guacamole.apache.org/</url>
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<relativePath>../</relativePath>
</parent>
@@ -246,14 +246,14 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

678
guacamole/src/main/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
guacamole/src/main/frontend/package.json
View File

@@ -5,8 +5,8 @@
},
"dependencies": {
"@simonwep/pickr": "^1.8.2",
"angular": "^1.8.2",
"angular-route": "^1.8.2",
"angular": "^1.8.3",
"angular-route": "^1.8.3",
"angular-templatecache-webpack-plugin": "^1.0.1",
"angular-translate": "^2.19.0",
"angular-translate-interpolation-messageformat": "^2.19.0",
@@ -14,7 +14,7 @@
"blob-polyfill": ">=7.0.20220408",
"datalist-polyfill": "^1.25.0",
"file-saver": "^2.0.5",
"jquery": "^3.6.1",
"jquery": "^3.6.3",
"jstz": "^2.1.1",
"lodash": "^4.17.21"
},

3
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
View File

@@ -68,7 +68,8 @@ public class ExtensionModule extends ServletModule {
"1.1.0",
"1.2.0",
"1.3.0",
"1.4.0"
"1.4.0",
"1.5.0"
));
/**