Merge 1.1.0 changes back to master.

This commit is contained in:
Virtually Nick
2019-05-10 11:04:19 -04:00
3 changed files with 10 additions and 0 deletions

View File

@@ -106,6 +106,10 @@
"tr-tr-qwerty" "tr-tr-qwerty"
] ]
}, },
{
"name" : "timezone",
"type" : "TEXT"
},
{ {
"name" : "console", "name" : "console",
"type" : "BOOLEAN", "type" : "BOOLEAN",

View File

@@ -94,6 +94,10 @@
"name" : "locale", "name" : "locale",
"type" : "TEXT" "type" : "TEXT"
}, },
{
"name" : "timezone",
"type" : "TEXT"
},
{ {
"name" : "server-alive-interval", "name" : "server-alive-interval",
"type" : "NUMERIC" "type" : "NUMERIC"

View File

@@ -432,6 +432,7 @@
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
"FIELD_HEADER_TIMEZONE" : "Time zone:",
"FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_USERNAME" : "Username:",
"FIELD_HEADER_WIDTH" : "Width:", "FIELD_HEADER_WIDTH" : "Width:",
@@ -513,6 +514,7 @@
"FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:", "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:",
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",