summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1034 from mattermost/PRs-to-masterCorey Hulen2015-10-131-2/+2
|\
| * Update Code-Contribution-Guidelines.mdit332015-10-131-1/+1
| * Update Code-Contribution-Guidelines.mdit332015-10-131-1/+1
| * Clarifying PRs should go to masterit332015-10-131-1/+1
* | Merge pull request #1030 from mattermost/Slack-import-UI-updateChristopher Speller2015-10-131-3/+3
|\ \
| * | Slack Import changing "Preview" label to "Beta"it332015-10-131-3/+3
| |/
* | Merge pull request #1029 from mattermost/Slack-import-help-updateChristopher Speller2015-10-131-5/+9
|\ \
| * | Update help text for Slack Importit332015-10-131-5/+9
| |/
* | Merge pull request #1037 from hmhealey/revert987Joram Wilander2015-10-132-39/+8
|\ \
| * | Revert "Modified markdown lexer to not break up words written in snake_case"hmhealey2015-10-132-39/+8
* | | Merge pull request #1039 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \ | |/ / |/| |
| * | Minor updates to incoming webhook documenatationJoramWilander2015-10-131-1/+1
* | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-133-13/+15
|\ \ \
| * | | Update Configuration-Settings.mdit332015-10-131-5/+5
| * | | Update gitlab_settings.jsxit332015-10-131-3/+3
| * | | Update Gitlab.mdit332015-10-131-5/+7
* | | | Merge pull request #1033 from mattermost/trouble-shootingCorey Hulen2015-10-131-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Create Troubleshooting.mdit332015-10-131-0/+7
| | |/ | |/|
* | | Merge pull request #1035 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \
| * | | Minor changes to incoming webhook docJoramWilander2015-10-131-1/+1
|/ / /
* | | Merge pull request #1032 from mattermost/incoming-docJoram Wilander2015-10-131-27/+39
|\ \ \ | |/ / |/| |
| * | Minor doc updatesJoramWilander2015-10-131-2/+2
| * | Update incoming webhook docJoramWilander2015-10-131-27/+39
|/ /
* | Merge pull request #1026 from asaadmahmoodspin/masterJoram Wilander2015-10-131-0/+1
|\ \
| * | Fixing code block markdownAsaad Mahmood2015-10-131-0/+1
* | | Merge pull request #1007 from florianorben/PLT-486Joram Wilander2015-10-1314-0/+19
|\ \ \
| * | | PLT-486: Remove spell check feature from input boxes during signup flowFlorian Orben2015-10-1214-0/+19
* | | | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ \ \
| * | | | Modified markdown lexer to not break up words written in snake_casehmhealey2015-10-092-8/+39
* | | | | 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