Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | 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 | |
| |\ \ | ||||||
| | * | | Refactoring direct channel creation to use transaction to avaoid state where ... | Christopher Speller | 2015-10-22 | 1 | -9/+14 | |
| * | | | 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 | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 4 | -42/+520 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | 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 | |
|/ / | ||||||
* | | Fixed preference test that was failing | hmhealey | 2015-10-16 | 1 | -1/+2 | |
* | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 2 | -0/+69 | |
|\ \ | ||||||
| * | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 2 | -0/+69 | |
| * | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -99/+39 | |
| |/ | ||||||
* | | Merge pull request #1078 from hmhealey/plt701 | Christopher Speller | 2015-10-16 | 3 | -100/+42 | |
|\ \ | ||||||
| * | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -100/+42 | |
* | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 2 | -15/+17 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Sanitize team data | Antti Ahti | 2015-10-14 | 1 | -0/+1 | |
| * | | Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed) | Antti Ahti | 2015-10-14 | 1 | -7/+7 | |
| * | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 2 | -8/+9 | |
| |/ | ||||||
* / | Marking when user ran the unit tests | =Corey Hulen | 2015-10-15 | 1 | -0/+2 | |
|/ | ||||||
* | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 2 | -5/+19 | |
|\ | ||||||
| * | PLT-602 combining welcome and verify email | =Corey Hulen | 2015-10-13 | 2 | -5/+19 | |
* | | Made further changes based on feedback | hmhealey | 2015-10-13 | 2 | -14/+18 | |
* | | Removed Preference.AltId | hmhealey | 2015-10-13 | 2 | -47/+92 | |
* | | Made structural changes to server-side Preference code based on feedback | hmhealey | 2015-10-13 | 2 | -43/+42 | |
* | | Removed setting direct channels for a new user at creation time | hmhealey | 2015-10-13 | 2 | -50/+42 | |
* | | Moved saving multiple user preferences into a database transaction | hmhealey | 2015-10-13 | 1 | -9/+5 | |
* | | Fixed preference tests | hmhealey | 2015-10-13 | 1 | -18/+7 |