Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | 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 | ||||
| * | 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 |
|\ \ | | | | | | | PLT-701 Removed preference migration code | ||||
| * | | 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 |
|\ \ \ | |_|/ |/| | | Use display name instead of name in team switcher menu | ||||
| * | | Sanitize team data | Antti Ahti | 2015-10-14 | 1 | -0/+1 |
| | | | | | | | | | | | | We don't want to expose sensitive data that might pose a security risk. | ||||
| * | | 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 |
| |/ | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu | ||||
* / | 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 |
| | | |||||
* | | Added default direct channels for previously existing users | hmhealey | 2015-10-13 | 2 | -29/+45 |
| | | |||||
* | | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 2 | -9/+9 |
| | | |||||
* | | Re-added default direct channels for new users | hmhealey | 2015-10-13 | 1 | -0/+42 |
| | | |||||
* | | Added api to get and set preferences | hmhealey | 2015-10-13 | 3 | -0/+240 |
| | | |||||
* | | Merge pull request #1022 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 2 | -1/+3 |
|\| | | | | | Release 1.1.0rc merging to master | ||||
| * | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| |\ | |||||
| | * | Replaced change email verification email logo image with a static link | Reed Garmsen | 2015-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 1 | -0/+2 |
| |/ | |||||
* / | Fixed download links in Safari | hmhealey | 2015-10-09 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 52 | -52/+52 |
|\ | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 52 | -52/+52 |
| | | |||||
* | | Merge pull request #978 from mattermost/plt-355 | Corey Hulen | 2015-10-08 | 2 | -108/+103 |
|\ \ | |/ |/| | PLT-355 Fixing ability to dynamicly update members list. | ||||
| * | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 2 | -108/+103 |
| | | |||||
* | | Merge pull request #966 from mattermost/GIT-960 | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
|\ \ | | | | | | | GIT-960 show error when you cannot create a team | ||||
| * | | GIT-960 show error when you cannot create a team | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 5 | -7/+87 |
|\ \ | | | | | | | PLT-112 Improves email change verification process |