From 6aff5900f79721783599a7ab9fe29074e4050544 Mon Sep 17 00:00:00 2001
From: it33 <iantien@gmail.com>
Date: Thu, 8 Oct 2015 22:39:16 -0700
Subject: Fixed typos

There was no space after "user name." before the next sentence. Also, "user name" should be "username"
---
 web/react/components/user_settings/user_settings_general.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index c23c61948..66d83725c 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -368,8 +368,7 @@ export default class UserSettingsGeneralTab extends React.Component {
 
             const extraInfo = (
                 <span>
-                    {'Use Nickname for a name you might be called that is different from your first name and user name.'}
-                    {'This is most often used when two or more people have similar sounding names and usernames.'}
+                    {'Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.'}
                 </span>
             );
 
-- 
cgit v1.2.3-1-g7c22


From 2bfd6d9ac2071614437f8ac4e8586172994b6cc3 Mon Sep 17 00:00:00 2001
From: it33 <iantien@gmail.com>
Date: Sun, 11 Oct 2015 21:30:02 -0700
Subject: Update get_link_modal.jsx

Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
---
 web/react/components/get_link_modal.jsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index 234013b93..eb6bfa9b6 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -96,7 +96,6 @@ export default class GetLinkModal extends React.Component {
                                 <p>
                                 Send teammates the link below for them to sign-up to this team site.
                                 <br /><br />
-                                Be careful not to share this link publicly, since anyone with the link can join your team.
                                 </p>
                                 <textarea
                                     className='form-control no-resize'
-- 
cgit v1.2.3-1-g7c22