Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 1 | -2/+2 |
|\ | |||||
| * | Revert model/version.go | JoramWilander | 2015-11-03 | 1 | -4/+4 |
| * | Updated getStatuses unit testgs | JoramWilander | 2015-11-03 | 2 | -6/+6 |
* | | Merge pull request #1285 from mattermost/plt-824 | Joram Wilander | 2015-11-04 | 1 | -0/+18 |
|\ \ | |/ |/| | |||||
| * | Adding ability to fetch posts around a specifc post | Christopher Speller | 2015-11-03 | 1 | -0/+18 |
* | | Merge pull request #1249 from mattermost/plt-823 | Harrison Healey | 2015-11-02 | 1 | -1/+0 |
|\ \ | |||||
| * | | Refactoring center channel | Christopher Speller | 2015-11-02 | 1 | -1/+0 |
| |/ | |||||
* / | Validate callback urls on the server and add help text to outgoing webhooks | JoramWilander | 2015-11-02 | 3 | -0/+24 |
|/ | |||||
* | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 3 | -13/+26 |
|\ | |||||
| * | PLT-340 | =Corey Hulen | 2015-10-27 | 3 | -7/+13 |
| * | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-27 | 8 | -44/+223 |
| |\ | |||||
| * | | Adding new fields to team model | =Corey Hulen | 2015-10-26 | 1 | -10/+17 |
* | | | Merge pull request #1199 from hmhealey/plt600 | Corey Hulen | 2015-10-28 | 3 | -5/+39 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Added Channel.Purpose on the server | hmhealey | 2015-10-27 | 3 | -0/+34 |
| * | | Renamed Channel.Description to Channel.Header on the server | hmhealey | 2015-10-27 | 2 | -5/+5 |
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 6 | -45/+124 |
|\| | | |||||
| * | | Merge pull request #1194 from mattermost/webhook-request | Corey Hulen | 2015-10-26 | 1 | -0/+18 |
| |\ \ | |||||
| | * | | Remove unused iconemoji field | JoramWilander | 2015-10-26 | 1 | -1/+0 |
| | * | | Parse incoming webhook requsets into model instead of string map | JoramWilander | 2015-10-26 | 1 | -0/+19 |
| | |/ | |||||
| * | | Merge pull request #1164 from hmhealey/plt778 | Corey Hulen | 2015-10-26 | 4 | -44/+104 |
| |\ \ | | |/ | |/| | |||||
| | * | Moved logic for searching for posts by multiple users/channels into the sql q... | hmhealey | 2015-10-26 | 1 | -39/+28 |
| | * | Changed post searching to allow searching by multiple users/channels | hmhealey | 2015-10-23 | 4 | -42/+113 |
| * | | Mattermost can not send message start with slash | Florian Orben | 2015-10-25 | 1 | -1/+2 |
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 2 | -14/+15 |
|\| | | |||||
| * | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 3 | -10/+16 |
| |\| | |||||
| * | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 5 | -11/+211 |
| |\ \ | |||||
| * | | | Multi-session login | =Corey Hulen | 2015-10-20 | 1 | -12/+13 |
| * | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 2 | -14/+14 |
* | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 3 | -0/+101 |
| |_|/ |/| | | |||||
* | | | Fixing unit tests | =Corey Hulen | 2015-10-20 | 1 | -4/+4 |
* | | | Fixing unit test | =Corey Hulen | 2015-10-20 | 1 | -4/+4 |
* | | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 2 | -2/+8 |
| |/ |/| | |||||
* | | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-20 | 1 | -8/+8 |
|\ \ | |||||
| * | | Allowing salts longer than 32 chars | =Corey Hulen | 2015-10-19 | 1 | -8/+8 |
* | | | Merge pull request #1116 from sharms/master | Joram Wilander | 2015-10-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed missing colon | Steven Harms | 2015-10-19 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 3 | -2/+202 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added from:, in:, and channel: search modifiers | hmhealey | 2015-10-19 | 3 | -2/+202 |
* | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 6 | -0/+269 |
|\ \ \ | |||||
| * | | | Refactor to hit database less often. | JoramWilander | 2015-10-19 | 1 | -0/+14 |
| * | | | Remove temporary test code. | JoramWilander | 2015-10-19 | 1 | -4/+0 |
| * | | | Add api unit tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 1 | -0/+36 |
| * | | | Add model test for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -0/+97 |
| * | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 4 | -0/+126 |
* | | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 1 | -8/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 1 | -8/+8 |
| |/ / | |||||
* | | | Merge pull request #1085 from mattermost/plt-633 | Harrison Healey | 2015-10-16 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 1 | -0/+5 |
* | | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 1 | -0/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 1 | -0/+9 |