safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.1.0 changes to master.

Browse Source
This commit is contained in:
Virtually Nick
2019-05-13 21:37:17 -04:00
parent e02dcf8c84 65a7802a5f
commit 3b60f135b9
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
View File

@@ -20,8 +20,9 @@
package org.apache.guacamole.form; package org.apache.guacamole.form;
/** /**
* Represents a time zone field. The field may contain only valid time zone IDs, * Represents a time zone field. The field may contain only valid time zone
* as dictated by TimeZone.getAvailableIDs(). * identifiers, as defined by the IANA time zone database. Such identifiers are
* also valid Java time zone IDs as dictated by TimeZone.getAvailableIDs().
*/ */
public class TimeZoneField extends Field { public class TimeZoneField extends Field {

2
guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
View File

@@ -108,7 +108,7 @@
}, },
{ {
"name" : "timezone", "name" : "timezone",
"type" : "TEXT" "type" : "TIMEZONE"
}, },
{ {
"name" : "console", "name" : "console",

2
guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
View File

@@ -96,7 +96,7 @@
}, },
{ {
"name" : "timezone", "name" : "timezone",
"type" : "TEXT" "type" : "TIMEZONE"
}, },
{ {
"name" : "server-alive-interval", "name" : "server-alive-interval",

6
guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js
View File

@@ -19,8 +19,9 @@
/** /**
* Controller for time zone fields. Time zone fields use Java IDs as the * Controller for time zone fields. Time zone fields use IANA time zone
* standard representation for each supported time zone. * database identifiers as the standard representation for each supported time
* zone. These identifiers are also legal Java time zone IDs.
*/ */
angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector', angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector',
function timeZoneFieldController($scope, $injector) { function timeZoneFieldController($scope, $injector) {
@@ -418,7 +419,6 @@ angular.module('form').controller('timeZoneFieldController', ['$scope', '$inject
"Canada" : { "Canada" : {
"Atlantic" : "Canada/Atlantic", "Atlantic" : "Canada/Atlantic",
"Central" : "Canada/Central", "Central" : "Canada/Central",
"East-Saskatchewan" : "Canada/East-Saskatchewan",
"Eastern" : "Canada/Eastern", "Eastern" : "Canada/Eastern",
"Mountain" : "Canada/Mountain", "Mountain" : "Canada/Mountain",
"Newfoundland" : "Canada/Newfoundland", "Newfoundland" : "Canada/Newfoundland",