summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-589Stas Vovk2015-10-126-6/+21
|\
| * 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
* | | | | | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
* | | | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-1210-22/+20
|\| | | | | | |
| * | | | | | | 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
* | | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
|/ / / / / / /
* | / / / / / Update Code-Contribution-Guidelines.mdit332015-10-121-2/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1008 from mattermost/release-1.1.0it332015-10-112-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1001 from mattermost/missed-prit332015-10-112-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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 markdownlfbrock2015-10-091-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1002 from mattermost/beta-labelit332015-10-101-3/+3
|\ \ \ \ \ \
| * | | | | | Adding beta label to Slack Importit332015-10-101-3/+3
| |/ / / / /
* | | | | | Merge pull request #1003 from mattermost/heading-alignmentit332015-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Aligning heading with textit332015-10-101-1/+1
| |/ / / / /
* | | | | | Merge pull request #1004 from mattermost/bug-fixit332015-10-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | bugfix should be two wordsit332015-10-101-1/+1
|/ / / / /
* | | | | Merge branch 'release-1.1.0'Christopher Speller2015-10-0911-108/+109
|\| | | |
| * | | | Fixing broken travis release buildChristopher Speller2015-10-082-3/+14
| * | | | Adding release 1.1.0 versionChristopher Speller2015-10-081-0/+1
| * | | | Creating dockerfiles for release 1.1.0Christopher Speller2015-10-088-105/+94
| |/ / /
* | | / Update README.mdit332015-10-091-1/+1
| |_|/ |/| |
* | | Update README.mdit332015-10-081-0/+2
* | | Update Slack-Import.mdit332015-10-081-1/+1
* | | Update README.mdit332015-10-081-1/+1
* | | Rename doc/usage/Slack-Import.md to doc/help/Slack-Import.mdit332015-10-081-0/+0
| |/ |/|
* | Update README.mdit332015-10-081-9/+22