diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-13 15:23:16 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-13 15:23:16 -0400 |
| commit | 1dfffacc3170290836f7159df34f33861e09245f (patch) | |
| tree | 8fef212a10b71167df1c0271d055d526aaff40ab | |
| parent | 669a14520f255fc03e9f02ef3369567df00a5be3 (diff) | |
| parent | 62bbf11224344190cc1ffb68fcb3095dad66fc83 (diff) | |
| download | chat-1dfffacc3170290836f7159df34f33861e09245f.tar.gz chat-1dfffacc3170290836f7159df34f33861e09245f.tar.bz2 chat-1dfffacc3170290836f7159df34f33861e09245f.zip | |
Merge pull request #1030 from mattermost/Slack-import-UI-update
Slack Import changing "Preview" label to "Beta"
| -rw-r--r-- | web/react/components/team_import_tab.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx index 40f06c382..a80b1a472 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -34,14 +34,14 @@ export default class TeamImportTab extends React.Component { render() { var uploadHelpText = ( <div> - <p>{'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.'}</p> - <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts do not yet import and Slack @mentions are not currently supported.'}</p> + <p>{'To import a team from Slack go to Slack > Team Settings > Import/Export Data > Export > Start Export. 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.'}</p> + <p>{'The Slack import to Mattermost is in "Beta". Slack bot posts do not yet import and Slack @mentions are not currently supported.'}</p> </div> ); var uploadSection = ( <SettingUpload - title='Import from Slack' + title='Import from Slack (Beta)' submit={this.doImportSlack} helpText={uploadHelpText} fileTypesAccepted='.zip' |