Merge pull request #1993 from mattermost/PLT-1586

PLT-1586 adding LDAP/OAuth to iOS

web/react/components/activity_log_modal.jsx

@@ -100,12 +100,15 @@ export default class ActivityLogModal extends React.Component {
 
             if (currentSession.props.platform === 'Windows') {
                 devicePicture = 'fa fa-windows';
+            } else if (currentSession.device_id.indexOf('apple:') === 0) {
+                devicePicture = 'fa fa-apple';
+                devicePlatform = 'iPhone Native App';
+            } else if (currentSession.device_id.indexOf('android:') === 0) {
+                devicePlatform = 'Android Native App';
+                devicePicture = 'fa fa-android';
             } else if (currentSession.props.platform === 'Macintosh' ||
                 currentSession.props.platform === 'iPhone') {
                 devicePicture = 'fa fa-apple';
-            } else if (currentSession.props.platform.browser.indexOf('Mattermost/') === 0) {
-                devicePicture = 'fa fa-apple';
-                devicePlatform = 'iPhone';
             } else if (currentSession.props.platform === 'Linux') {
                 if (currentSession.props.os.indexOf('Android') >= 0) {
                     devicePlatform = 'Android';

web/react/components/login.jsx

@@ -115,7 +115,7 @@ export default class Login extends React.Component {
         }
 
         let teamSignUp = null;
-        if (global.window.mm_config.EnableTeamCreation === 'true') {
+        if (global.window.mm_config.EnableTeamCreation === 'true' && !Utils.isMobileApp()) {
             teamSignUp = (
                 <div className='margin--extra'>
                     <a
@@ -137,6 +137,21 @@ export default class Login extends React.Component {
             );
         }
 
+        let findTeams = null;
+        if (!Utils.isMobileApp()) {
+            findTeams = (
+                <div className='form-group margin--extra form-group--small'>
+                    <span>
+                        <a href='/find_team'>
+                            <FormattedMessage
+                                id='login.find_teams'
+                                defaultMessage='Find your other teams'
+                            />
+                        </a></span>
+                </div>
+            );
+        }
+
         return (
             <div className='signup-team__container'>
                 <h5 className='margin--less'>{'Sign in to:'}</h5>
@@ -147,15 +162,7 @@ export default class Login extends React.Component {
                     {emailSignup}
                     {ldapLogin}
                     {userSignUp}
-                    <div className='form-group margin--extra form-group--small'>
-                        <span>
-                            <a href='/find_team'>
-                                <FormattedMessage
-                                    id='login.find_teams'
-                                    defaultMessage='Find your other teams'
-                                />
-                            </a></span>
-                    </div>
+                    {findTeams}
                     {forgotPassword}
                     {teamSignUp}
             </div>