Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1013 from optimistiks/PLT-590 | Joram Wilander | 2015-10-13 | 5 | -8/+8 |
|\ | | | | | PLT-590: Change "Manage Team" to "Manage Members" | ||||
| * | Merge branch 'master' into PLT-590 | Maxim | 2015-10-13 | 42 | -132/+533 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1024 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 0 | -0/+0 |
|\ \ | | | | | | | Merging docs Release 1.1.0rc | ||||
| * \ | Merge pull request #1023 from mattermost/fix-config | Corey Hulen | 2015-10-12 | 1 | -111/+96 |
| |\ \ | | | | | | | | | Fixing document | ||||
| | * | | Fixing document | =Corey Hulen | 2015-10-12 | 1 | -111/+96 |
| |/ / | |||||
* | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -72/+72 |
| | | | | | | | | | Adjusting format so variables are on their own line | ||||
* | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -5/+4 |
| | | | | | | | | | Minor corrections | ||||
* | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -36/+22 |
| | | | | | | | | | Clarifying config.json settings not in System Console and updating formatting. | ||||
* | | | Merge pull request #1022 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 16 | -77/+453 |
|\| | | | | | | | | Release 1.1.0rc merging to master | ||||
| * | | Merge pull request #997 from mattermost/PLT-586 | Corey Hulen | 2015-10-12 | 14 | -76/+135 |
| |\ \ | | | | | | | | | PLT-586 fixing issues with security alert | ||||
| | * \ | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #999 from rgarmsen2295/plt-610 | Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | PLT-610 Fix broken image in change email verification email | ||||
| | * | | | Replaced change email verification email logo image with a static link | Reed Garmsen | 2015-10-09 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #1020 from mattermost/config-fix | Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| |\ \ \ \ | | | | | | | | | | | | | Adding new config documentation | ||||
| | * | | | | Adding new config documentation | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| |/ / / / | |||||
| | | * | | Fixing break | =Corey Hulen | 2015-10-12 | 1 | -2/+0 |
| | | | | | |||||
| | | * | | Removing offical build check | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | | | | | |||||
| | | * | | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| | | * | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 14 | -74/+135 |
| | |/ / | |||||
* | | | | Merge pull request #1018 from asaadmahmoodspin/ui-fixes | Corey Hulen | 2015-10-12 | 11 | -25/+53 |
|\ \ \ \ | | | | | | | | | | | Other UI Improvements | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2015-10-12 | 10 | -22/+20 |
| |\ \ \ \ | |||||
| * | | | | | Removing padding from post comment cell in RHS | Asaad Mahmood | 2015-10-12 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Other UI Improvements | Asaad Mahmood | 2015-10-12 | 10 | -25/+50 |
| | | | | | | |||||
* | | | | | | Merge pull request #1015 from mattermost/trouble-shooting-tip | Corey Hulen | 2015-10-12 | 1 | -0/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding troubleshooting tip | ||||
| * | | | | | | Merge branch 'master' into trouble-shooting-tip | Joram Wilander | 2015-10-12 | 1 | -2/+1 |
| |\| | | | | | |||||
| * | | | | | | Adding troubleshooting tip | it33 | 2015-10-12 | 1 | -0/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1009 from mattermost/update-help-text | Corey Hulen | 2015-10-12 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updating help text | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into update-help-text | Joram Wilander | 2015-10-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Update get_link_modal.jsx | it33 | 2015-10-11 | 1 | -1/+0 |
| | |/ / / / / | |/| | | | | | | | | | | | | 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 | ||||
* | | | | | | | Merge pull request #994 from mattermost/mkdocs-strict | Corey Hulen | 2015-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Turning on strict mode for mkdocs | ||||
| * | | | | | | | Turning on strict mode for mkdocs | Christopher Speller | 2015-10-09 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #992 from mattermost/fast-obvious-forgiving | Corey Hulen | 2015-10-12 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Adding link to "Fast, Obvious, Forgiving" | ||||
| * | | | | | | | | Adding link to "Fast, Obvious, Forgiving" | it33 | 2015-10-09 | 1 | -0/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #989 from mattermost/typos | Corey Hulen | 2015-10-12 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed typos | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into typos | Joram Wilander | 2015-10-12 | 19 | -123/+124 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Fixed typos | it33 | 2015-10-08 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username" | ||||
* | | | | | | | | | | Merge pull request #988 from mattermost/golang-version | Corey Hulen | 2015-10-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | Updating Golang versions tested | ||||
| * | | | | | | | | | Merge branch 'master' into golang-version | Christopher Speller | 2015-10-09 | 17 | -180/+263 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Updating Golang versions tested | it33 | 2015-10-08 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1016 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-12 | 9 | -20/+18 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ui-improvements | asaadmahmoodspin | 2015-10-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-12 | 9 | -20/+18 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1000 from hmhealey/plt604 | Corey Hulen | 2015-10-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | PLT-604 Fixed download links in Safari | ||||
| * | | | | | | | | | Fixed download links in Safari | hmhealey | 2015-10-09 | 1 | -2/+2 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Update Code-Contribution-Guidelines.md | it33 | 2015-10-12 | 1 | -2/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
| | | | | | | * | PLT-590: Change "Manage Team" to "Manage Members" | Potapov Max | 2015-10-12 | 5 | -8/+8 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #1008 from mattermost/release-1.1.0 | it33 | 2015-10-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Fixing help text in webhooks | ||||
| * | | | | | | Merge pull request #1001 from mattermost/missed-pr | it33 | 2015-10-11 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Missed PR - Help text update to webhooks | ||||
| | * | | | | | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | | | | | |