summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-08-27 10:46:42 -0700
committerit33 <iantien@gmail.com>2015-08-27 10:46:42 -0700
commit1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a (patch)
tree4b2322a4a2b84cbfa20d86d70e3ad47db2bd079a /web
parent0f06599763c5afbf2702674f162a34a771f2f5f8 (diff)
downloadchat-1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a.tar.gz
chat-1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a.tar.bz2
chat-1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a.zip
Updating help text for Slack Import screen
Diffstat (limited to 'web')
-rw-r--r--web/react/components/team_import_tab.jsx10
1 files changed, 4 insertions, 6 deletions
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx
index ecb3491b0..e3415d7f4 100644
--- a/web/react/components/team_import_tab.jsx
+++ b/web/react/components/team_import_tab.jsx
@@ -23,12 +23,10 @@ module.exports = React.createClass({
var uploadHelpText = (
<div>
<br/>
- Slack does now allow you to export any of your files or images stored in slack. Private channels and direct message channels are also not exported. Therefore, no files, images, or private channels will be imported.
- <br/>
- Slack bot posts are not imported.
- <br/>
- Unable to import Slack channels that are not valid Mattermost channels. (ex underscores)
- <br/>
+ Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.
+ <br/><br/>
+ The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.
+ <br/><br/>
</div>
);
var uploadSection = (