summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1126 from mattermost/upgrade-guideit332015-10-201-0/+16
|\
| * Create Upgrade-Guide.mdit332015-10-201-0/+16
* | Merge branch 'release-1.1.0'Christopher Speller2015-10-205-9/+189
|\ \ | |/ |/|
| * Merge pull request #1125 from mattermost/changelog-updateChristopher Speller2015-10-201-4/+169
| |\
| | * Update CHANGELOG.mdit332015-10-201-4/+169
| |/
| * Merge pull request #1115 from mattermost/salt-fixChristopher Speller2015-10-201-8/+8
| |\
| | * Allowing salts longer than 32 chars=Corey Hulen2015-10-191-8/+8
| * | Merge pull request #1119 from mattermost/fix-db-upgradeHarrison Healey2015-10-203-1/+19
| |\ \ | | |/ | |/|
| | * Hotfix to allow .7 to be upgraded to 1.1=Corey Hulen2015-10-203-1/+19
| |/
* | Merge pull request #1100 from girishso/wink_emojiJoram Wilander2015-10-201-0/+1
|\ \
| * | translate ;) to wink emojiGirish S2015-10-181-0/+1
* | | Merge pull request #1116 from sharms/masterJoram Wilander2015-10-201-1/+1
|\ \ \
| * | | Fixed missing colonSteven Harms2015-10-191-1/+1
* | | | Merge pull request #1084 from apaatsio/handle-window-resize-properlyJoram Wilander2015-10-206-34/+95
|\ \ \ \
| * | | | Handle window resize events in React wayAntti Ahti2015-10-206-34/+95
* | | | | Merge pull request #1113 from hmhealey/plt716Joram Wilander2015-10-208-68/+420
|\ \ \ \ \
| * | | | | Fixed incorrectly escaped * in wildcard search for postgreshmhealey2015-10-191-1/+1
| * | | | | Added from:, in:, and channel: search modifiershmhealey2015-10-198-68/+420
* | | | | | Merge pull request #1095 from rgarmsen2295/plt-661Joram Wilander2015-10-206-25/+25
|\ \ \ \ \ \
| * | | | | | Changed all goroutine functions to use '...AndForget' as the standard naming ...Reed Garmsen2015-10-196-25/+25
| | |_|/ / / | |/| | | |
* | | | | | Create Gitlab-Integration-Service-for-Mattermost.mdit332015-10-201-0/+9
| |_|/ / / |/| | | |
* | | | | Minor formatting adjustmentit332015-10-191-9/+9
|/ / / /
* | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-194-10/+12
|\ \ \ \
| * | | | Updating direct messages titleAsaad Mahmood2015-10-191-1/+1
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1920-201/+328
| |\ \ \ \
| * | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-194-9/+11
* | | | | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-1926-113/+1612
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update db index for outgoing webhookJoramWilander2015-10-191-1/+1
| * | | | | Generalized webhook post code and added it to outgoing webhooksJoramWilander2015-10-192-35/+46
| * | | | | Refactor to hit database less often.JoramWilander2015-10-197-161/+89
| * | | | | Remove special team logic.JoramWilander2015-10-191-29/+19
| * | | | | Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| * | | | | Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-193-10/+7
| * | | | | Remove temporary test code.JoramWilander2015-10-191-4/+0
| * | | | | Fix minor style for gofmt.JoramWilander2015-10-191-1/+1
| * | | | | Add api unit tests for outgoing webhooks.JoramWilander2015-10-192-0/+217
| * | | | | Added store tests for outgoing webhooks.JoramWilander2015-10-192-5/+222
| * | | | | Add model test for outgoing webhooks.JoramWilander2015-10-192-0/+97
| * | | | | Implement outgoing webhooks.JoramWilander2015-10-1920-23/+1065
* | | | | | Merge pull request #1109 from mattermost/setup-devHarrison Healey2015-10-191-2/+6
|\ \ \ \ \ \
| * | | | | | Fixing formatting and typos=Corey Hulen2015-10-191-6/+6
| * | | | | | Fixing formatting and typos=Corey Hulen2015-10-191-2/+4
| * | | | | | Updating developer machine setup=Corey Hulen2015-10-191-0/+2
* | | | | | | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-1910-184/+277
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary bindJoramWilander2015-10-161-1/+0
| * | | | | | | Fix typing socket constantJoramWilander2015-10-162-3/+3
| * | | | | | | Small refactor of websocket code on client and serverJoramWilander2015-10-1610-182/+276
* | | | | | | | Merge pull request #1067 from layzerar/fix_email_encodingCorey Hulen2015-10-191-3/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix email encoding issueMelvi Ts2015-10-161-3/+11
* | | | | | | | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |