diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | STYLE-GUIDE.md | 14 | ||||
| -rw-r--r-- | api/file.go | 1 | ||||
| -rw-r--r-- | web/react/components/team_import_tab.jsx | 10 |
4 files changed, 13 insertions, 14 deletions
@@ -205,7 +205,7 @@ Contributing To contribute to this open source project please review the [Mattermost Contribution Guidelines]( http://www.mattermost.org/contribute-to-mattermost/). -To setup your machine for development of mattermost see: [Developer Machine Setup](scripts/README_DEV.md) +To setup your machine for development of mattermost see: [Developer Machine Setup](scripts/README_DEV.md). License ------- diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md index 0da0a14f8..470788cf5 100644 --- a/STYLE-GUIDE.md +++ b/STYLE-GUIDE.md @@ -22,8 +22,8 @@ The following is an abridged version of the [Airbnb Javascript Style Guide](http ### Whitespace -- Indentation is four spaces -- Use a space before the leading brace +- Indentation is four spaces. +- Use a space before the leading brace. - Use one space between the comma and the next argument in a bracketed list. No other space. - Use whitespace to make code more readable. - Do not use more than one newline to separate code blocks. @@ -49,7 +49,7 @@ function myFunction ( parm1, parm2 ){ ### Semicolons -- You must use them always +- You must use them always. ```javascript // Correct @@ -85,14 +85,14 @@ var my_variable = 4; ```javascript // Correct -if (somthing) { +if (something) { stuff...; } else if (otherthing) { stuff...; } // Incorrect -if (somthing) +if (something) { stuff...; } @@ -102,8 +102,8 @@ else } // Incorrect -if (somthing) stuff...; -if (somthing) +if (something) stuff...; +if (something) stuff...; ``` diff --git a/api/file.go b/api/file.go index 50482a057..800c512c5 100644 --- a/api/file.go +++ b/api/file.go @@ -347,6 +347,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) { } w.Header().Set("Cache-Control", "max-age=2592000, public") + w.Header().Set("Content-Length", strconv.Itoa(len(f))) w.Write(f) } 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 = ( |