Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 1 | -0/+6 |
|\ | |||||
| * | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 1 | -0/+6 |
| | | |||||
* | | PLT-340 | =Corey Hulen | 2015-10-27 | 3 | -56/+33 |
|/ | |||||
* | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 5 | -60/+134 |
|\ | |||||
| * | Merge pull request #1164 from hmhealey/plt778 | Corey Hulen | 2015-10-26 | 2 | -33/+49 |
| |\ | | | | | | | PLT-778 Changed post searching to allow searching by multiple users/channels | ||||
| | * | Moved logic for searching for posts by multiple users/channels into the sql ↵ | hmhealey | 2015-10-26 | 1 | -0/+3 |
| | | | | | | | | | | | | query | ||||
| | * | Changed post searching to allow searching by multiple users/channels | hmhealey | 2015-10-23 | 2 | -33/+46 |
| | | | |||||
| * | | Prevented image files larger than 4k resolution from being uploaded | hmhealey | 2015-10-26 | 2 | -5/+29 |
| | | | |||||
| * | | Merge pull request #1179 from florianorben/issue-827 | Christopher Speller | 2015-10-26 | 1 | -21/+54 |
| |\ \ | | | | | | | | | Mattermost can not send message start with slash | ||||
| | * | | Mattermost can not send message start with slash | Florian Orben | 2015-10-25 | 1 | -21/+54 |
| | | | | | | | | | | | | | | | | resolves #827 | ||||
| * | | | Merge pull request #1176 from florianorben/fix-shrug-command | Christopher Speller | 2015-10-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix /shrug command | ||||
| | * | | | Fix /shrug command | Florian Orben | 2015-10-25 | 1 | -1/+1 |
| | |/ / | |||||
| * / / | Set correct mime type for profile images | Florian Orben | 2015-10-25 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-25 | 1 | -1/+1 |
|\| | | |||||
| * | | PLT-629 - Update the reset password notification email | it33 | 2015-10-23 | 1 | -1/+1 |
| | | | | | | | | | PLT-629 - Update the reset password notification email | ||||
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 27 | -131/+238 |
|\| | | |||||
| * | | Merge pull request #1149 from mattermost/plt-808 | Christopher Speller | 2015-10-23 | 1 | -0/+27 |
| |\ \ | | | | | | | | | PLT-808 Fix deleting channels breaking the webhook UI | ||||
| | * | | Delete webhooks when the associated channel gets deleted | JoramWilander | 2015-10-22 | 1 | -0/+27 |
| | |/ | |||||
| * | | Merge pull request #1143 from mattermost/plt-803 | Corey Hulen | 2015-10-22 | 2 | -0/+34 |
| |\ \ | | | | | | | | | PLT-803 Prevent users from resetting their password when the user is using SSO | ||||
| | * | | Prevent users from resetting their password when the user is using SSO | JoramWilander | 2015-10-22 | 2 | -0/+34 |
| | |/ | |||||
| * | | Merge pull request #1142 from mattermost/plt-414 | Corey Hulen | 2015-10-22 | 1 | -9/+14 |
| |\ \ | | | | | | | | | PLT-414 Fix direct channel creation. | ||||
| | * | | Refactoring direct channel creation to use transaction to avaoid state where ↵ | Christopher Speller | 2015-10-22 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | channel is created without both users | ||||
| * | | | Fixing code review issues | =Corey Hulen | 2015-10-22 | 3 | -6/+5 |
| | | | | |||||
| * | | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 2 | -2/+3 |
| | | | | |||||
| * | | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 1 | -20/+9 |
| | | | | |||||
| * | | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 3 | -7/+41 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 4 | -25/+147 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Multi-session login | =Corey Hulen | 2015-10-20 | 3 | -57/+75 |
| | | | | |||||
| * | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 2 | -34/+39 |
| | | | | |||||
| * | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 4 | -42/+520 |
| |\ \ \ | |||||
| * \ \ \ | Merging from master | =Corey Hulen | 2015-10-19 | 3 | -24/+39 |
| |\ \ \ \ | |||||
| * | | | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 1 | -12/+38 |
| | | | | | | |||||
| * | | | | | Fixing merge | =Corey Hulen | 2015-10-16 | 5 | -115/+129 |
| |\ \ \ \ \ | |||||
| * | | | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 23 | -50/+53 |
| | | | | | | | |||||
* | | | | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 2 | -1/+209 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #1094 from trashcan/slash-shrug | Joram Wilander | 2015-10-22 | 1 | -0/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add a /shrug command | ||||
| * | | | | | | Add a /shrug command | Pat Lathem | 2015-10-16 | 1 | -0/+29 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 1 | -7/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 2 | -5/+127 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-716/717 Added from:, in:, and channel: search filters | ||||
| * | | | | | Added from:, in:, and channel: search modifiers | hmhealey | 2015-10-19 | 2 | -5/+127 |
| |/ / / / | |||||
* | | | / | Changed all goroutine functions to use '...AndForget' as the standard naming ↵ | Reed Garmsen | 2015-10-19 | 3 | -20/+20 |
| |_|_|/ |/| | | | | | | | | | | | system | ||||
* | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 4 | -42/+520 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-235 Implement outgoing webhooks. | ||||
| * | | | Generalized webhook post code and added it to outgoing webhooks | JoramWilander | 2015-10-19 | 1 | -2/+40 |
| | | | | |||||
| * | | | Refactor to hit database less often. | JoramWilander | 2015-10-19 | 1 | -81/+65 |
| | | | | |||||
| * | | | Remove special team logic. | JoramWilander | 2015-10-19 | 1 | -29/+19 |
| | | | | |||||
| * | | | Fix minor style for gofmt. | JoramWilander | 2015-10-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add api unit tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 1 | -0/+181 |
| | | | | |||||
| * | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 3 | -10/+295 |
| |/ / | |||||
* / / | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 3 | -24/+39 |
|/ / |