summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge release branch 'release-1.1.0'Christopher Speller2015-10-132-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Updating dockerfile for release v1.1.0-rc2Christopher Speller2015-10-131-1/+1
| * | | | | | | | Merge pull request #1025 from mattermost/PLT-596Christopher Speller2015-10-131-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | PLT-596 - Update to email verification titleit332015-10-121-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1013 from optimistiks/PLT-590Joram Wilander2015-10-135-8/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into PLT-590Maxim2015-10-1342-132/+533
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1024 from mattermost/release-1.1.0Corey Hulen2015-10-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1023 from mattermost/fix-configCorey Hulen2015-10-121-111/+96
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixing document=Corey Hulen2015-10-121-111/+96
| |/ / / / / / / /
* | | | | | | | | Update Configuration-Settings.mdit332015-10-121-72/+72
* | | | | | | | | Update Configuration-Settings.mdit332015-10-121-5/+4
* | | | | | | | | Update Configuration-Settings.mdit332015-10-121-36/+22
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-1216-77/+453
|\| | | | | | |
| * | | | | | | Merge pull request #997 from mattermost/PLT-586Corey Hulen2015-10-1214-76/+135
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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=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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into update-help-textJoram Wilander2015-10-121-2/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Update get_link_modal.jsxit332015-10-111-1/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #994 from mattermost/mkdocs-strictCorey Hulen2015-10-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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"it332015-10-091-0/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into typosJoram Wilander2015-10-1219-123/+124
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Fixed typosit332015-10-081-2/+1
* | | | | | | | | | Merge pull request #988 from mattermost/golang-versionCorey Hulen2015-10-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed download links in Safarihmhealey2015-10-091-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-121-2/+1
| |/ / / / / / / |/| | | | | | |