summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| | | | | | | * Multi-session login=Corey Hulen2015-10-2026-108/+143
| | | | | | | * Adding multi-session cookie=Corey Hulen2015-10-208-94/+78
| | | | | | | * Fixing merge conflicts=Corey Hulen2015-10-1928-115/+1623
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
| | | | | | | | * Fixing merge issue=Corey Hulen2015-10-191-8/+3
| | | | | | | | * Merging from master=Corey Hulen2015-10-1942-403/+602
| | | | | | | | |\ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Updating scroll on admin consoleAsaad Mahmood2015-10-191-0/+3
* | | | | | | | | Clarifying creds aren't real in docsit332015-10-191-1/+2
* | | | | | | | | Merge pull request #1104 from florianorben/fix_arrow_left_rightHarrison Healey2015-10-191-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No longer try to navigate to next/prev image if image preview modal is not openFlorian Orben2015-10-191-3/+4
* | | | | | | | | | Merge pull request #1102 from florianorben/fix_email_tooltipHarrison Healey2015-10-191-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixes wrong tooltip on user profileFlorian Orben2015-10-191-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1101 from stasvovk/admin_console_urlsHarrison Healey2015-10-195-6/+26
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | change url when a user navigates between tabs [#962]Stas Vovk2015-10-185-6/+26
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1087 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-196-83/+101
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Updating scroll on LHSAsaad Mahmood2015-10-191-1/+3
| * | | | | | | | Updating userEntries div to tr tdAsaad Mahmood2015-10-181-1/+1
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-186-17/+19
| |\| | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1615-102/+152
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixing more direct channel modal scrollingAsaad Mahmood2015-10-163-1/+23
| * | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1624-149/+488
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-168-88/+82
* | | | | | | | | | | Update Troubleshooting.mdit332015-10-181-0/+5
* | | | | | | | | | | Update README.mdit332015-10-181-1/+1
* | | | | | | | | | | IE 10 support deprecatedit332015-10-181-0/+6
| |_|_|_|/ / / / / / |/| | | | | | | | |