summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-03-08 15:07:43 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-03-08 15:07:43 +0500
commitcc453a048d50e57802bab9363b59c2189143b784 (patch)
treecbd409ec59ad48c40b84337db9a4cf3a063e4915 /web/react/components/admin_console
parent81ccfca2bfc91779d7bf00dbccb6f932d285a87c (diff)
downloadchat-cc453a048d50e57802bab9363b59c2189143b784.tar.gz
chat-cc453a048d50e57802bab9363b59c2189143b784.tar.bz2
chat-cc453a048d50e57802bab9363b59c2189143b784.zip
Multiple UI Improvements
Diffstat (limited to 'web/react/components/admin_console')
-rw-r--r--web/react/components/admin_console/license_settings.jsx7
1 files changed, 2 insertions, 5 deletions
diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx
index fdbe912ef..d4dfa13f2 100644
--- a/web/react/components/admin_console/license_settings.jsx
+++ b/web/react/components/admin_console/license_settings.jsx
@@ -120,8 +120,7 @@ class LicenseSettings extends React.Component {
expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)),
ldap: global.window.mm_license.LDAP
}}
- defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a>
- from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
+ defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
<p>Your subscription details are as follows:</p>
Name: {name}<br />
Company or organization name: {company}<br/>
@@ -152,9 +151,7 @@ class LicenseSettings extends React.Component {
<p className='help-text'>
<FormattedHTMLMessage
id='admin.licence.keyMigration'
- defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,
- <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>.
- This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
+ defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
/>
</p>
</div>