diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
commit | 415145d62fd5195fc03759b5b4ed42c255529d7b (patch) | |
tree | 11e7149396fdbff3efc6c06c536ada1f2a89bd64 /webapp/components/admin_console | |
parent | 5e2b4d1282dc374b54ca2c77fbf84c6533ce8519 (diff) | |
parent | 09d98b486e8245ae84a452331e36e2978a6d01ab (diff) | |
download | chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.gz chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.bz2 chat-415145d62fd5195fc03759b5b4ed42c255529d7b.zip |
Merge branch 'release-3.3'
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 33 | ||||
-rw-r--r-- | webapp/components/admin_console/oauth_settings.jsx | 2 |
2 files changed, 21 insertions, 14 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 3966f0219..4fcfe2731 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -323,6 +323,25 @@ export default class AdminSidebar extends React.Component { ); } + let otherCategory = null; + if (license || audits) { + otherCategory = ( + <AdminSidebarCategory + parentLink='/admin_console' + icon='fa-wrench' + title={ + <FormattedMessage + id='admin.sidebar.other' + defaultMessage='OTHER' + /> + } + > + {license} + {audits} + </AdminSidebarCategory> + ); + } + return ( <div className='admin-sidebar'> <AdminSidebarHeader/> @@ -347,7 +366,6 @@ export default class AdminSidebar extends React.Component { /> } /> - {audits} <AdminSidebarSection name='logs' title={ @@ -675,18 +693,7 @@ export default class AdminSidebar extends React.Component { </AdminSidebarSection> </AdminSidebarCategory> {this.renderTeams()} - <AdminSidebarCategory - parentLink='/admin_console' - icon='fa-wrench' - title={ - <FormattedMessage - id='admin.sidebar.other' - defaultMessage='OTHER' - /> - } - > - {license} - </AdminSidebarCategory> + {otherCategory} </ul> </div> <SelectTeamModal diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index ad7d2159f..92663ece8 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -393,7 +393,7 @@ export default class OAuthSettings extends AdminSettings { helpText = ( <FormattedHTMLMessage id='admin.office365.EnableHtmlDesc' - defaultMessage='<ol><li><a href="https://login.microsoftonline.com/">Log in</a> to your Microsoft or Office 365 account. Make sure its the account on the same <a href="https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0">tenant</a> that you would like users to log in with.</li><li>Go to <a href="https://apps.dev.microsoft.com">https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use "Mattermost - your-company-name" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>' + defaultMessage='<ol><li><a href="https://login.microsoftonline.com/">Log in</a> to your Microsoft or Office 365 account. Make sure it`s the account on the same <a href="https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0">tenant</a> that you would like users to log in with.</li><li>Go to <a href="https://apps.dev.microsoft.com">https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use "Mattermost - your-company-name" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>' /> ); } |