Commit 7ce4503b authored by Derrick Anderson's avatar Derrick Anderson
Browse files

Merge branch 'merge49final'

parents 33b1b456 1472d931
......@@ -437,6 +437,13 @@ export default {
name: 'admin.general.log',
name_default: 'Logging',
settings: [
{
type: Constants.SettingsTypes.TYPE_BANNER,
label: 'admin.log.noteDescription',
label_default: 'Changing properties other than <a href="#EnableWebhookDebugging">Enable Webhook Debugging</a> and <a href="#EnableDiagnostics">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.',
label_html: true,
banner_type: 'info',
},
{
type: Constants.SettingsTypes.TYPE_BOOL,
key: 'EnableConsole',
......
......@@ -4,9 +4,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import * as UserAgent from 'utils/user_agent';
import * as Utils from 'utils/utils';
// A component that can be used to make controlled inputs that function properly in certain
// environments (ie. IE11) where typing quickly would sometimes miss inputs
export default class QuickInput extends React.PureComponent {
......@@ -44,20 +41,7 @@ export default class QuickInput extends React.PureComponent {
}
updateInputFromProps = () => {
if (!this.input) {
return;
}
if ((UserAgent.isWindows7() && UserAgent.isInternetExplorer()) || UserAgent.isDesktopApp()) {
// The textbox already knows where it's cursor is supposed to be because we've already
// typed in it, but it needs to be reminded of that
const caret = Utils.getCaretPosition(this.input);
this.input.value = this.props.value;
this.input.selectionStart = caret;
this.input.selectionEnd = this.input.selectionStart;
if (!this.input || this.input.value === this.props.value) {
return;
}
......
......@@ -664,6 +664,7 @@
"admin.license.upload": "Upload",
"admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target='_blank'>Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
"admin.license.uploading": "Uploading License...",
"admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
"admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option. If true, server writes messages to the standard output stream (stdout).",
"admin.log.consoleLogLevel": "Console Log Level",
"admin.log.consoleTitle": "Output logs to console: ",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment