diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-27 14:18:59 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-27 14:18:59 -0400 |
| commit | bc171ba7c9d40f49c4c5a9686822d62b785a8c50 (patch) | |
| tree | 6a1f0c3710e870768cf011c2ab12c99f8297ba8e | |
| parent | db7e8c12889485234fb2d1ba6556106e5fc7548b (diff) | |
| parent | 1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a (diff) | |
| download | chat-bc171ba7c9d40f49c4c5a9686822d62b785a8c50.tar.gz chat-bc171ba7c9d40f49c4c5a9686822d62b785a8c50.tar.bz2 chat-bc171ba7c9d40f49c4c5a9686822d62b785a8c50.zip | |
Merge pull request #498 from mattermost/it33-patch-1
Updating help text for Slack Import screen
| -rw-r--r-- | web/react/components/team_import_tab.jsx | 10 |
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 = ( |