From 73371fe33033f32c89bf7dd49170afc4afb1540c Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 15:49:31 -0700 Subject: Updating Golang versions tested --- doc/developer/Setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/developer/Setup.md b/doc/developer/Setup.md index c63bde512..afaef4ee4 100644 --- a/doc/developer/Setup.md +++ b/doc/developer/Setup.md @@ -11,7 +11,7 @@ Developer Machine Setup `docker-machine ip dev` 3. Add a line to your /etc/hosts that goes ` dockerhost` 4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile -2. Download Go (version 1.4.2) from http://golang.org/dl/ +2. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/ 3. Set up your Go workspace 1. `mkdir ~/go` 2. Add the following to your ~/.bash_profile @@ -51,7 +51,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org `127.0.0.1 dockerhost` 3. Install build essentials 1. `apt-get install build-essential` -4. Download Go (version 1.4.2) from http://golang.org/dl/ +4. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/ 5. Set up your Go workspace and add Go to the PATH 1. `mkdir ~/go` 2. Add the following to your ~/.bashrc -- cgit v1.2.3-1-g7c22 From 6aff5900f79721783599a7ab9fe29074e4050544 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 22:39:16 -0700 Subject: Fixed typos There was no space after "user name." before the next sentence. Also, "user name" should be "username" --- web/react/components/user_settings/user_settings_general.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index c23c61948..66d83725c 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -368,8 +368,7 @@ export default class UserSettingsGeneralTab extends React.Component { const extraInfo = ( - {'Use Nickname for a name you might be called that is different from your first name and user name.'} - {'This is most often used when two or more people have similar sounding names and usernames.'} + {'Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.'} ); -- cgit v1.2.3-1-g7c22 From 759ac7feee1ab4579c5186e5e599fc1d31efdc27 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 9 Oct 2015 06:21:43 -0700 Subject: Adding link to "Fast, Obvious, Forgiving" --- doc/developer/Code-Contribution-Guidelines.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md index 80676f107..3bab47d23 100644 --- a/doc/developer/Code-Contribution-Guidelines.md +++ b/doc/developer/Code-Contribution-Guidelines.md @@ -29,6 +29,9 @@ git checkout -b 2. Please make sure to thoroughly test your change before submitting a pull request. + Please review the ["Fast, Obvious, Forgiving" experience design principles](http://www.mattermost.org/design-principles/) for Mattermost and check that your feature meets the criteria. Also, for any changes to user interface or help text, please read the changes out loud, as a quick and easy way to catch any inconsitencies. + + ## Submitting a Pull Request 1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). -- cgit v1.2.3-1-g7c22 From 049662f9ae9c1a1c6f817ed02f9da925f2dd516c Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 9 Oct 2015 11:58:19 -0400 Subject: Turning on strict mode for mkdocs --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 12b209c84..103370288 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ travis: rm $(DIST_PATH)/web/templates/*.bak mv doc/README.md doc/index.md - mkdocs build + mkdocs build --strict cp -r documentation-html $(DIST_PATH)/documentation-html tar -C dist -czf $(DIST_PATH).tar.gz mattermost -- cgit v1.2.3-1-g7c22 From 2bfd6d9ac2071614437f8ac4e8586172994b6cc3 Mon Sep 17 00:00:00 2001 From: it33 Date: Sun, 11 Oct 2015 21:30:02 -0700 Subject: Update get_link_modal.jsx Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options --- web/react/components/get_link_modal.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx index 234013b93..eb6bfa9b6 100644 --- a/web/react/components/get_link_modal.jsx +++ b/web/react/components/get_link_modal.jsx @@ -96,7 +96,6 @@ export default class GetLinkModal extends React.Component {

Send teammates the link below for them to sign-up to this team site.

- Be careful not to share this link publicly, since anyone with the link can join your team.