summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1063 from mattermost/SMTP-updateCorey Hulen2015-10-151-45/+36
|\ | | | | Updated to use System Console
| * Updated to use System Consoleit332015-10-141-45/+36
| |
* | Update Production-Ubuntu.mdit332015-10-151-1/+1
| |
* | Updating /docs TOCit332015-10-141-1/+3
|/
* Merge pull request #1062 from mattermost/release-1.1.0Corey Hulen2015-10-141-1/+1
|\ | | | | Fixing doc
| * Fixing doc=Corey Hulen2015-10-141-1/+1
| |
* | Merge pull request #1061 from mattermost/release-1.1.0Corey Hulen2015-10-141-18/+23
|\| | | | | Release 1.1.0 final merge
| * Update SMTP instructionsesethna2015-10-141-18/+23
| | | | | | Needs dev review.
| * Fixing document=Corey Hulen2015-10-121-111/+96
| |
* | Clarifying descriptionit332015-10-141-1/+1
| |
* | Update Slack-Import.mdit332015-10-141-1/+1
| |
* | Clarifying instructionit332015-10-141-1/+1
| |
* | Adjusting formattingit332015-10-141-1/+1
| |
* | Update Slack-Import.mdit332015-10-141-6/+11
| |
* | Update Slack-Import.mdit332015-10-141-8/+10
| |
* | Update Slack-Import.mdit332015-10-141-1/+1
| |
* | Update SMTP-Email-Setup.mdit332015-10-131-2/+2
| |
* | Merge pull request #1034 from mattermost/PRs-to-masterCorey Hulen2015-10-131-2/+2
|\ \ | | | | | | Clarifying PRs should go to master
| * | 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 #1029 from mattermost/Slack-import-help-updateChristopher Speller2015-10-131-5/+9
|\ \ \ | | | | | | | | Update help text for Slack Import
| * | | Update help text for Slack Importit332015-10-131-5/+9
| |/ /
* | | Merge pull request #1039 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \ | | | | | | | | Minor updates to incoming webhook documenatation
| * | | Minor updates to incoming webhook documenatationJoramWilander2015-10-131-1/+1
| | | |
* | | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-132-10/+12
|\ \ \ \ | | | | | | | | | | Updating SSO help on HTTP/HTTPS
| * | | | Update Configuration-Settings.mdit332015-10-131-5/+5
| | | | |
| * | | | Update Gitlab.mdit332015-10-131-5/+7
| | |/ / | |/| |
* | | | Merge pull request #1033 from mattermost/trouble-shootingCorey Hulen2015-10-131-0/+7
|\ \ \ \ | |_|/ / |/| | | Create Troubleshooting.md
| * | | Create Troubleshooting.mdit332015-10-131-0/+7
| |/ /
* | | Minor changes to incoming webhook docJoramWilander2015-10-131-1/+1
| | |
* | | Minor doc updatesJoramWilander2015-10-131-2/+2
| | |
* | | Update incoming webhook docJoramWilander2015-10-131-27/+39
|/ /
* | Merge branch 'master' into PLT-590Maxim2015-10-134-4/+322
|\ \
| * | 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-121-0/+317
| |\| | | | | | | Release 1.1.0rc merging to master
| | * Adding new config documentation=Corey Hulen2015-10-121-0/+317
| | |
| * | 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 #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 #988 from mattermost/golang-versionCorey Hulen2015-10-121-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Updating Golang versions tested
| | * | | | Merge branch 'master' into golang-versionChristopher Speller2015-10-096-72/+154
| | |\ \ \ \
| | * | | | | Updating Golang versions testedit332015-10-081-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Update Code-Contribution-Guidelines.mdit332015-10-121-2/+1
| | |_|_|/ | |/| | |
* / | | | PLT-590: Change "Manage Team" to "Manage Members"Potapov Max2015-10-123-6/+6
|/ / / /
* | | | Merge pull request #1002 from mattermost/beta-labelit332015-10-101-3/+3
|\ \ \ \ | | | | | | | | | | Adding beta label to Slack Import