summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Configuration-Settings.mdit332015-10-121-72/+72
| | | Adjusting format so variables are on their own line
* Update Configuration-Settings.mdit332015-10-121-5/+4
| | | Minor corrections
* Update Configuration-Settings.mdit332015-10-121-36/+22
| | | Clarifying config.json settings not in System Console and updating formatting.
* Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-1216-77/+453
|\ | | | | Release 1.1.0rc merging to master
| * Merge pull request #997 from mattermost/PLT-586Corey Hulen2015-10-1214-76/+135
| |\ | | | | | | PLT-586 fixing issues with security alert
| | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-121-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #999 from rgarmsen2295/plt-610Corey Hulen2015-10-121-1/+1
| |\ \ | | | | | | | | PLT-610 Fix broken image in change email verification email
| | * | Replaced change email verification email logo image with a static linkReed Garmsen2015-10-091-1/+1
| | | |
| | | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-121-0/+317
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #1020 from mattermost/config-fixCorey Hulen2015-10-121-0/+317
| |\ \ \ | | | | | | | | | | Adding new config documentation
| | * | | Adding new config documentation=Corey Hulen2015-10-121-0/+317
| |/ / /
| | | * Fixing break=Corey Hulen2015-10-121-2/+0
| | | |
| | | * Removing offical build check=Corey Hulen2015-10-122-2/+2
| | | |
| | | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-122-2/+2
| | | |\ | | |_|/ | |/| |
| | | * PLT-586 fixing issues with security alert=Corey Hulen2015-10-0914-74/+135
| | |/
* | | Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-1211-25/+53
|\ \ \ | | | | | | | | Other UI Improvements
| * \ \ Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-1210-22/+20
| |\ \ \
| * | | | Removing padding from post comment cell in RHSAsaad Mahmood2015-10-121-0/+3
| | | | |
| * | | | Other UI ImprovementsAsaad Mahmood2015-10-1210-25/+50
| | | | |
* | | | | Merge pull request #1015 from mattermost/trouble-shooting-tipCorey Hulen2015-10-121-0/+14
|\ \ \ \ \ | | | | | | | | | | | | Adding troubleshooting tip
| * | | | | Merge branch 'master' into trouble-shooting-tipJoram Wilander2015-10-121-2/+1
| |\| | | |
| * | | | | Adding troubleshooting tipit332015-10-121-0/+14
| | | | | |
* | | | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updating help text
| * \ \ \ \ \ Merge branch 'master' into update-help-textJoram Wilander2015-10-121-2/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Update get_link_modal.jsxit332015-10-111-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-strictCorey Hulen2015-10-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Turning on strict mode for mkdocs
| * | | | | | Turning on strict mode for mkdocsChristopher Speller2015-10-091-1/+1
| | | | | | |
* | | | | | | Merge pull request #992 from mattermost/fast-obvious-forgivingCorey Hulen2015-10-121-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding link to "Fast, Obvious, Forgiving"
| * | | | | | | Adding link to "Fast, Obvious, Forgiving"it332015-10-091-0/+3
| | | | | | | |
* | | | | | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed typos
| * \ \ \ \ \ \ \ Merge branch 'master' into typosJoram Wilander2015-10-1219-123/+124
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Fixed typosit332015-10-081-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-versionCorey Hulen2015-10-121-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Updating Golang versions tested
| * | | | | | | | Merge branch 'master' into golang-versionChristopher Speller2015-10-0917-180/+263
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Updating Golang versions testedit332015-10-081-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #1016 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-129-20/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ui-improvementsasaadmahmoodspin2015-10-121-2/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-129-20/+18
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1000 from hmhealey/plt604Corey Hulen2015-10-121-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | PLT-604 Fixed download links in Safari
| * | | | | | | | Fixed download links in Safarihmhealey2015-10-091-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-121-2/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1008 from mattermost/release-1.1.0it332015-10-112-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Fixing help text in webhooks
| * | | | | | Merge pull request #1001 from mattermost/missed-prit332015-10-112-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Missed PR - Help text update to webhooks
| | * | | | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| | | | | | |
| | * | | | | Update user_settings_integrations.jsxit332015-10-091-1/+1
| | | | | | |
| | * | | | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| |/ / / / /
* | | | | | Update CHANGELOG.mdit332015-10-111-3/+2
| | | | | |
* | | | | | Merge pull request #998 from mattermost/lfbrock-patch-1it332015-10-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing incorrect markdown
| * | | | | | Fixing incorrect markdownlfbrock2015-10-091-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1002 from mattermost/beta-labelit332015-10-101-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding beta label to Slack Import