From 78bc7a326feb9be7eaff312d5d7fcb7634c6aa5b Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 18 Jun 2015 17:39:12 -0400 Subject: [PATCH 01/12] fixes br tags causing new lines --- web/react/components/create_post.jsx | 4 +--- web/react/utils/utils.jsx | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index 191be9bf8e..a534e495d9 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -31,9 +31,7 @@ module.exports = React.createClass({ post.message = this.state.messageText; - var repRegex = new RegExp("
", "g"); - if (post.message.replace(repRegex, " ").trim().length === 0 - && this.state.previews.length === 0) { + if (post.message.trim().length === 0 && this.state.previews.length === 0) { return; } diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index e570886143..fb4f3a34e4 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -366,9 +366,6 @@ module.exports.textToJsx = function(text, options) { if (options && options['singleline']) { var repRegex = new RegExp("\n", "g"); text = text.replace(repRegex, " "); - } else { - var repRegex = new RegExp("\n", "g"); - text = text.replace(repRegex, "
"); } var searchTerm = "" @@ -392,7 +389,7 @@ module.exports.textToJsx = function(text, options) { implicitKeywords[keywordArray[i]] = true; } - var lines = text.split("
"); + var lines = text.split("\n"); var urlMatcher = new LinkifyIt(); for (var i = 0; i < lines.length; i++) { var line = lines[i]; From 0377d68335b38b09c0693e5b2833ddecfb3e4dc6 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 18 Jun 2015 23:14:43 -0800 Subject: [PATCH 02/12] Updating readme --- README.md | 85 +++++++++++++++++++++++++------------------ scripts/README_DEV.md | 42 +++++++++++++++++++++ 2 files changed, 91 insertions(+), 36 deletions(-) create mode 100644 scripts/README_DEV.md diff --git a/README.md b/README.md index c3e844f611..f8d269f9a9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -**Mattermost Preview
** -**Team Communication Service
** +**Mattermost Preview** +**Team Communication Service** **Version 0.40** What matters most to your team? =============================== -Words have power.
-Mattermost serves teams who use words to shape the future.
+Words have power. +Mattermost serves teams who use words to shape the future. The words you choose are up to you. *- SpinPunch* @@ -18,49 +18,62 @@ You're installing "Mattermost Preview", a pre-released 0.40 version intended for That said, any issues at all, please let us know on the Mattermost forum at: http://bit.ly/1MY1kul -Developer Machine Setup (Mac) ------------------------------ +Developer Machine Setup (Docker/Mac) +------------------------------------ -DOCKER SETUP - -1. Follow the instructions at http://docs.docker.com/installation/mac/ -
a) Use the Boot2Docker command-line utility -
b) If you do command-line setup use: `boot2docker init eval “$(boot2docker shellinit)”` +1. Follow the instructions at http://docs.docker.com/installation/mac/ + 1. Use the Boot2Docker command-line utility + 2. If you do command-line setup use: `boot2docker init eval “$(boot2docker shellinit)”` 2. Get your Docker IP address with `boot2docker ip` -3. Add a line to your /etc/hosts that goes ` dockerhost` -4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile +3. Add a line to your /etc/hosts that goes ` dockerhost` +4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile +5. Run `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:helium` +6. When docker is done fetching the image, open http://dockerhost:8065/ in your browser -Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul +If you want to work with the latest bits in the repo you can run the cmd `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:latest` +You can update to the latest bits by running `docker pull mattermost/platform:latest` -GO SETUP +If you wish to remove mattermost-dev use the following commands +1. docker stop mattermost-dev +2. docker rm -v mattermost-dev -1. Download Go from http://golang.org/dl/ +AWS Elastic Beanstalk Setup (Docker) +------------------------------------ -NODE.JS SETUP +1. From the AWS console select Elastic Beanstalk +2. Select "Create New Application" from the top right. +3. Name the application and press next +4. Select "Create a web server" environment. +5. If asked, select create and AIM role and instance profile and press next. +6. For predefined configuration select docker. Environment type may be left at default. +7. For application source, select upload your own and upload Dockerrun.aws.json from docker/Dockerrun.aws.json. Everything else may be left at default. +8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next. +9. The options on the additional resources page may be left at default unless you wish to change them. Press Next. +10. On the configuration details place. Select an instance type of t2.small or larger. +11. You can set the configuration details as you please but they may be left at their defaults. When you are done press next. +12. Environment tags my be left blank. Press next. +13. You will be asked to review your information. Press Launch. +14. Up near the top of the dashboard you will see a domain of the form \*.elasticbeanstalk.com copy this as you will need it later. -1. Install homebrew from http://brew.sh -2. `brew install node` +15. From the AWS console select route 53 +16. From the sidebar select Hosted Zones +17. Select the domain you want to use or create a new one. +18. Modify an existing CNAME record set or create a new one with the name * and the value of the domain you copied in step 13. +19. Save the record set -COMPASS SETUP - -1. Make sure you have the latest version of Ruby -2. `gem install compass` - -MATTERMOST SETUP - -1. Make a project directory for Mattermost, which we'll call **$PROJECT** for the rest of these instructions -2. Make a `go` directory in your $PROJECT directory -3. Open or create your ~/.bash_profile and add the following lines:
`export GOPATH=$PROJECT/go`
`export PATH=$PATH:$GOPATH/bin`
then refresh your bash profile with `source ~/.bash_profile` -4. Then use `cd $GOPATH` and `mkdir -p src/github.com/mattermost` then cd into this directory and run `git clone github.com/mattermost/platform.git` -5. If you do not have Mercurial, download it with: `brew install mercurial` -6. Then do `cd platform` and `make test`. Provided the test runs fine, you now have a complete build environment. -7. Use `make run` to run your code - -Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul +20. Return the Elastic Beanstalk from the AWS console. +21. Select the environment you created. +22. Select configuration from the sidebar. +23. Click the gear beside software configuration. +24. Add an environment property with the name “MATTERMOST\_DOMAIN” and a value of the domain you mapped in route 53. For example if your domain is \*.example.com you would enter example.com not www.example.com. +25. Select apply. +26. Return to the dashboard on the sidebar and wait for beanstalk update the environment. +27. Try it out by entering the domain you mapped into your browser. License ------- -This software uses the Apache 2.0 open source license. For more details see: http://bit.ly/1Lc25Sv
+This software uses the Apache 2.0 open source license. For more details see: http://bit.ly/1Lc25Sv + **XXXXXX TODO: Test install procedures** diff --git a/scripts/README_DEV.md b/scripts/README_DEV.md new file mode 100644 index 0000000000..6a2dfc54da --- /dev/null +++ b/scripts/README_DEV.md @@ -0,0 +1,42 @@ +Developer Machine Setup (Mac) +----------------------------- + +DOCKER SETUP + +1. Follow the instructions at http://docs.docker.com/installation/mac/ + 1. Use the Boot2Docker command-line utility + 2. If you do command-line setup use: `boot2docker init eval “$(boot2docker shellinit)”` +2. Get your Docker IP address with `boot2docker ip` +3. Add a line to your /etc/hosts that goes ` dockerhost` +4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile + +Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul + +GO SETUP + +1. Download Go from http://golang.org/dl/ + +NODE.JS SETUP + +1. Install homebrew from http://brew.sh +2. `brew install node` + +COMPASS SETUP + +1. Make sure you have the latest version of Ruby +2. `gem install compass` + +MATTERMOST SETUP + +1. Make a project directory for Mattermost, which we'll call **$PROJECT** for the rest of these instructions +2. Make a `go` directory in your $PROJECT directory +3. Open or create your ~/.bash_profile and add the following lines: + `export GOPATH=$PROJECT/go` + `export PATH=$PATH:$GOPATH/bin` + then refresh your bash profile with `source ~/.bash_profile` +4. Then use `cd $GOPATH` and `mkdir -p src/github.com/mattermost` then cd into this directory and run `git clone github.com/mattermost/platform.git` +5. If you do not have Mercurial, download it with: `brew install mercurial` +6. Then do `cd platform` and `make test`. Provided the test runs fine, you now have a complete build environment. +7. Use `make run` to run your code + +Any issues? Please let us know on our forums at: http://bit.ly/1MY1kul \ No newline at end of file From a6078ad7f8a0eff11b2907bb3f5b1f7e08b0c4ce Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 18 Jun 2015 23:18:54 -0800 Subject: [PATCH 03/12] tweaking readme --- README.md | 65 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index f8d269f9a9..0a2ff2b382 100644 --- a/README.md +++ b/README.md @@ -30,44 +30,45 @@ Developer Machine Setup (Docker/Mac) 5. Run `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:helium` 6. When docker is done fetching the image, open http://dockerhost:8065/ in your browser -If you want to work with the latest bits in the repo you can run the cmd `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:latest` -You can update to the latest bits by running `docker pull mattermost/platform:latest` +If you want to work with the latest bits in the repo you can run the cmd +`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:latest` -If you wish to remove mattermost-dev use the following commands -1. docker stop mattermost-dev -2. docker rm -v mattermost-dev +You can update to the latest bits by running +`docker pull mattermost/platform:latest` + +If you wish to remove mattermost-dev use the following commands +1. `docker stop mattermost-dev` +2. `docker rm -v mattermost-dev` AWS Elastic Beanstalk Setup (Docker) ------------------------------------ -1. From the AWS console select Elastic Beanstalk -2. Select "Create New Application" from the top right. -3. Name the application and press next -4. Select "Create a web server" environment. -5. If asked, select create and AIM role and instance profile and press next. -6. For predefined configuration select docker. Environment type may be left at default. -7. For application source, select upload your own and upload Dockerrun.aws.json from docker/Dockerrun.aws.json. Everything else may be left at default. -8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next. -9. The options on the additional resources page may be left at default unless you wish to change them. Press Next. -10. On the configuration details place. Select an instance type of t2.small or larger. -11. You can set the configuration details as you please but they may be left at their defaults. When you are done press next. -12. Environment tags my be left blank. Press next. -13. You will be asked to review your information. Press Launch. -14. Up near the top of the dashboard you will see a domain of the form \*.elasticbeanstalk.com copy this as you will need it later. - -15. From the AWS console select route 53 +1. From the AWS console select Elastic Beanstalk +2. Select "Create New Application" from the top right. +3. Name the application and press next +4. Select "Create a web server" environment. +5. If asked, select create and AIM role and instance profile and press next. +6. For predefined configuration select docker. Environment type may be left at default. +7. For application source, select upload your own and upload Dockerrun.aws.json from docker/Dockerrun.aws.json. Everything else may be left at default. +8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next. +9. The options on the additional resources page may be left at default unless you wish to change them. Press Next. +10. On the configuration details place. Select an instance type of t2.small or larger. +11. You can set the configuration details as you please but they may be left at their defaults. When you are done press next. +12. Environment tags my be left blank. Press next. +13. You will be asked to review your information. Press Launch. +14. Up near the top of the dashboard you will see a domain of the form \*.elasticbeanstalk.com copy this as you will need it later. +15. From the AWS console select route 53 16. From the sidebar select Hosted Zones -17. Select the domain you want to use or create a new one. -18. Modify an existing CNAME record set or create a new one with the name * and the value of the domain you copied in step 13. -19. Save the record set - -20. Return the Elastic Beanstalk from the AWS console. -21. Select the environment you created. -22. Select configuration from the sidebar. -23. Click the gear beside software configuration. -24. Add an environment property with the name “MATTERMOST\_DOMAIN” and a value of the domain you mapped in route 53. For example if your domain is \*.example.com you would enter example.com not www.example.com. -25. Select apply. -26. Return to the dashboard on the sidebar and wait for beanstalk update the environment. +17. Select the domain you want to use or create a new one. +18. Modify an existing CNAME record set or create a new one with the name * and the value of the domain you copied in step 13. +19. Save the record set +20. Return the Elastic Beanstalk from the AWS console. +21. Select the environment you created. +22. Select configuration from the sidebar. +23. Click the gear beside software configuration. +24. Add an environment property with the name “MATTERMOST\_DOMAIN” and a value of the domain you mapped in route 53. For example if your domain is \*.example.com you would enter example.com not www.example.com. +25. Select apply. +26. Return to the dashboard on the sidebar and wait for beanstalk update the environment. 27. Try it out by entering the domain you mapped into your browser. License From a15b4219579c89cc44d0ed1f9a35bc58f7367426 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 19 Jun 2015 05:52:31 -0700 Subject: [PATCH 04/12] Adding "About Mattermost" to README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a2ff2b382..9c42d9da9a 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ **Team Communication Service** **Version 0.40** -What matters most to your team? -=============================== +WHAT MATTERS MOST TO YOUR TEAM? Words have power. Mattermost serves teams who use words to shape the future. @@ -11,6 +10,13 @@ The words you choose are up to you. *- SpinPunch* + +About Mattermost +================ + +Mattermost is an open source team communication service. It brings messages and files shared by your team into one place accessible across PCs and phones, with archiving and search. + + Installing the Mattermost Preview ================================= From 5ca9397c3ca4a34b4e5546deec03d6c1fe967b43 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 19 Jun 2015 05:57:56 -0700 Subject: [PATCH 05/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c42d9da9a..db513b16bb 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The words you choose are up to you. About Mattermost ================ -Mattermost is an open source team communication service. It brings messages and files shared by your team into one place accessible across PCs and phones, with archiving and search. +Mattermost is an open source team communication service. It brings messaging and files shared by your team into one place accessible across PCs and phones, with archiving and search. Installing the Mattermost Preview From ce0b89a26ef5d45b6aa797eac9426faa7c04d2d2 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 19 Jun 2015 09:00:28 -0400 Subject: [PATCH 06/12] Adding linux setup instructions to readme. Adding Dockerrun.aws.json file --- README.md | 33 ++++++++++++++++++++++++++++++--- docker/Dockerrun.aws.json | 13 +++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 docker/Dockerrun.aws.json diff --git a/README.md b/README.md index db513b16bb..0a3798aef5 100644 --- a/README.md +++ b/README.md @@ -24,18 +24,44 @@ You're installing "Mattermost Preview", a pre-released 0.40 version intended for That said, any issues at all, please let us know on the Mattermost forum at: http://bit.ly/1MY1kul -Developer Machine Setup (Docker/Mac) ------------------------------------- +Local Machine Setup (Docker) +----------------------------- + +### Mac OSX ### 1. Follow the instructions at http://docs.docker.com/installation/mac/ 1. Use the Boot2Docker command-line utility 2. If you do command-line setup use: `boot2docker init eval “$(boot2docker shellinit)”` 2. Get your Docker IP address with `boot2docker ip` 3. Add a line to your /etc/hosts that goes ` dockerhost` -4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile +4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash\_profile 5. Run `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:helium` 6. When docker is done fetching the image, open http://dockerhost:8065/ in your browser +### Ubuntu ### +1. Follow the instructions at https://docs.docker.com/installation/ubuntulinux/ or use the summery below. +`sudo apt-get update` +`sudo apt-get install wget` +`wget -qO- https://get.docker.com/ | sh` +`sudo usermod -aG docker ` +`sudo service docker start` +`newgrp docker` +2. Run `docker run -d --publish 8086:80 mattermost/platform` +3. When docker is done fetching the image, open http://localhost:8086/ in your browser + +### Arch ### +1. Install docker using the following commands +`pacman -S docker` +`systemctl enable docker.service` +`systemctl start docker.service` +`gpasswd -a docker` +`newgrp docker` +2. docker run -d --publish 8086:80 mattermost/platform +3. When docker is done fetching the image, open http://localhost:8086/ in your browser + +### Notes ### +If your ISP blocks port 25 then you may install locally but email will not be sent. + If you want to work with the latest bits in the repo you can run the cmd `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:latest` @@ -46,6 +72,7 @@ If you wish to remove mattermost-dev use the following commands 1. `docker stop mattermost-dev` 2. `docker rm -v mattermost-dev` + AWS Elastic Beanstalk Setup (Docker) ------------------------------------ diff --git a/docker/Dockerrun.aws.json b/docker/Dockerrun.aws.json new file mode 100755 index 0000000000..52bbb2ae5c --- /dev/null +++ b/docker/Dockerrun.aws.json @@ -0,0 +1,13 @@ +{ + "AWSEBDockerrunVersion": "1", + "Image": { + "Name": "mattermost/platform", + "Update": "true" + }, + "Ports": [ + { + "ContainerPort": "80" + } + ], + "Logging": "/var/log/" +} From 60ccc8fcfe35c4c8baa3816ea11a7f90425c4d17 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 19 Jun 2015 09:21:16 -0400 Subject: [PATCH 07/12] Adding name and tag to commands --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a3798aef5..ed51ad6529 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Local Machine Setup (Docker) `sudo usermod -aG docker ` `sudo service docker start` `newgrp docker` -2. Run `docker run -d --publish 8086:80 mattermost/platform` +2. Run `docker run --name mattermost-dev -d --publish 8086:80 mattermost/platform:helium 3. When docker is done fetching the image, open http://localhost:8086/ in your browser ### Arch ### @@ -56,7 +56,7 @@ Local Machine Setup (Docker) `systemctl start docker.service` `gpasswd -a docker` `newgrp docker` -2. docker run -d --publish 8086:80 mattermost/platform +2. docker run --name mattermost-dev -d --publish 8086:80 mattermost/platform:helium 3. When docker is done fetching the image, open http://localhost:8086/ in your browser ### Notes ### From 4f0563ddea6cfc2ad067f141123d4c6023927c2e Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 19 Jun 2015 09:23:27 -0400 Subject: [PATCH 08/12] Switching port --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ed51ad6529..7e564fdd6a 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ Local Machine Setup (Docker) `sudo usermod -aG docker ` `sudo service docker start` `newgrp docker` -2. Run `docker run --name mattermost-dev -d --publish 8086:80 mattermost/platform:helium -3. When docker is done fetching the image, open http://localhost:8086/ in your browser +2. Run `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:helium +3. When docker is done fetching the image, open http://localhost:8065/ in your browser ### Arch ### 1. Install docker using the following commands @@ -56,8 +56,8 @@ Local Machine Setup (Docker) `systemctl start docker.service` `gpasswd -a docker` `newgrp docker` -2. docker run --name mattermost-dev -d --publish 8086:80 mattermost/platform:helium -3. When docker is done fetching the image, open http://localhost:8086/ in your browser +2. docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:helium +3. When docker is done fetching the image, open http://localhost:8065/ in your browser ### Notes ### If your ISP blocks port 25 then you may install locally but email will not be sent. From 634d29feadd6602895c595e791cd53f81eea41ff Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 19 Jun 2015 09:52:04 -0400 Subject: [PATCH 09/12] Defaulting to domain of localhost when no domain is given --- utils/config.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/config.go b/utils/config.go index 23bd3e85af..6a7e4589c6 100644 --- a/utils/config.go +++ b/utils/config.go @@ -221,6 +221,10 @@ func LoadConfig(fileName string) { // Grabs the domain from enviroment variable if not in configuration if config.ServiceSettings.Domain == "" { config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN") + // If the enviroment variable is not set, use a default + if config.ServiceSettings.Domain == "" { + config.ServiceSettings.Domain = "localhost" + } } // Check for a valid email for feedback, if not then do feedback@domain From cb38322bcc157f1836b81a1a9eadcd74d07851f9 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 19 Jun 2015 06:58:24 -0700 Subject: [PATCH 10/12] Update README.md --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7e564fdd6a..6bcb0fcfcc 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,13 @@ **Team Communication Service** **Version 0.40** + +About Mattermost +================ + +Mattermost is an open source team communication service. It brings messaging and files shared by your team into one place accessible across PCs and phones, with archiving and search. + +
WHAT MATTERS MOST TO YOUR TEAM? Words have power. @@ -11,12 +18,6 @@ The words you choose are up to you. *- SpinPunch* -About Mattermost -================ - -Mattermost is an open source team communication service. It brings messaging and files shared by your team into one place accessible across PCs and phones, with archiving and search. - - Installing the Mattermost Preview ================================= From 71a945bc2ee54b6cf78d95b2e2c6ac00d2980bab Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 19 Jun 2015 07:47:24 -0700 Subject: [PATCH 11/12] Update README.md --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 6bcb0fcfcc..30baeffd46 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,7 @@ About Mattermost Mattermost is an open source team communication service. It brings messaging and files shared by your team into one place accessible across PCs and phones, with archiving and search. -
-WHAT MATTERS MOST TO YOUR TEAM? - -Words have power. -Mattermost serves teams who use words to shape the future. -The words you choose are up to you. - -*- SpinPunch* +We built Mattermost to help teams focus on what matters most to them. It works for us, we hope it works for you too. Installing the Mattermost Preview From 8dab13c7ded5ca04e06b68146dbd8c34fb997763 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 19 Jun 2015 07:50:39 -0700 Subject: [PATCH 12/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30baeffd46..53259ea10a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ About Mattermost ================ -Mattermost is an open source team communication service. It brings messaging and files shared by your team into one place accessible across PCs and phones, with archiving and search. +Mattermost is a team communication service. It brings team messaging and file sharing into one place, accessible across PCs and phones, with archiving and search. We built Mattermost to help teams focus on what matters most to them. It works for us, we hope it works for you too.