summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | Update Incoming-Webhooks.mdit332015-10-081-6/+12
* | Merge pull request #973 from mattermost/new-webhook-docsit332015-10-082-62/+74
|\ \
| * | Update and rename Incoming.md to Incoming-Webhooks.mdit332015-10-072-62/+74
* | | Update README.mdit332015-10-081-1/+1
* | | Create README.mdit332015-10-081-0/+12
* | | Create Manage-Team.mdit332015-10-081-0/+37
| |/ |/|
* | Merge pull request #984 from hmhealey/linkfixCorey Hulen2015-10-081-1/+1
|\ \
| * | Fixed html used for autolinkinghmhealey2015-10-081-1/+1
|/ /
* | Merge pull request #983 from mattermost/fix-db-upgradeHarrison Healey2015-10-084-9/+3
|\ \
| * | Fixing db upgrade for 1.1=Corey Hulen2015-10-084-9/+3
* | | Merge pull request #977 from mattermost/lfbrock-patch-1Corey Hulen2015-10-081-0/+64
|\ \ \ | |/ / |/| |
| * | Update CHANGELOG.mdlfbrock2015-10-081-0/+1
| * | Update to include v1.1.0lfbrock2015-10-081-0/+63
* | | Renaming SpinPunch, Inc. to Mattermost, Inc.it332015-10-081-2/+2
* | | Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\ \ \
| * | | Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| * | | Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| * | | Switched :p emoticonhmhealey2015-10-081-1/+1
* | | | Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08303-303/+303
|\ \ \ \
| * | | | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08303-303/+303
| |/ / /
* | | | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-085-114/+111
|\ \ \ \
| * | | | Fixing ability to dynamicly update members list.Christopher Speller2015-10-085-114/+111
| | |_|/ | |/| |
* | | | Merge pull request #971 from mattermost/PLT-567Corey Hulen2015-10-083-6/+30
|\ \ \ \
| * | | | Fixing issue with lastIndexOf=Corey Hulen2015-10-082-2/+2
| * | | | Adding removing blank target for browser links=Corey Hulen2015-10-082-2/+7
| * | | | PLT-567 auto join open channels=Corey Hulen2015-10-072-5/+24
| |/ / /
* | | | Merge pull request #979 from mattermost/it33-patch-1Corey Hulen2015-10-081-6/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Tweaking welcome text in Town-Squareit332015-10-081-6/+2
|/ / /
* | | Merge pull request #966 from mattermost/GIT-960Christopher Speller2015-10-083-11/+17
|\ \ \
| * | | GIT-960 show error when you cannot create a team=Corey Hulen2015-10-073-11/+17
| |/ /
* | | Merge pull request #944 from mattermost/PLT-518Christopher Speller2015-10-0811-59/+198
|\ \ \
| * | | Moving to url.Values=Corey Hulen2015-10-071-11/+3