Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1556 from npcode/sso-github-ent | Joram Wilander | 2015-12-02 | 1 | -1/+6 |
|\ | | | | | Make the Gitlab SSO Support compatible with Github Enterprise | ||||
| * | Make the Gitlab SSO Support compatible with Github Enterprise | Yi EungJun | 2015-12-02 | 1 | -1/+6 |
| | | | | | | | | | | | | | | See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error. | ||||
* | | PLT-902 switching to push proxy server | =Corey Hulen | 2015-11-30 | 3 | -5/+77 |
|/ | |||||
* | add unit tests | Florian Orben | 2015-11-27 | 1 | -0/+1 |
| | |||||
* | upgrading libs | =Corey Hulen | 2015-11-23 | 2 | -2/+2 |
| | |||||
* | PLT-1087: return NewAppError instead of nil | Wim | 2015-11-19 | 1 | -1/+1 |
| | |||||
* | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-16 | 1 | -0/+1 |
|\ | |||||
| * | Updating version to 1.2.1 | Christopher Speller | 2015-11-16 | 1 | -0/+1 |
| | | |||||
* | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵ | hmhealey | 2015-11-12 | 1 | -2/+3 |
| | | | | | | | | we truncate the list of members to 20 | ||||
* | | Merge pull request #1396 from 42wim/useractivity | Joram Wilander | 2015-11-11 | 1 | -1/+0 |
|\ \ | | | | | | | Do not clear LastActivityAt for GetProfiles | ||||
| * | | Do not clear LastActivityAt for GetProfiles | Wim | 2015-11-11 | 1 | -1/+0 |
| | | | |||||
* | | | Fix: Unable to change password | Florian Orben | 2015-11-11 | 1 | -1/+1 |
|/ / | |||||
* / | Omit unneeded fields from user object in getProfiles service and remove ↵ | JoramWilander | 2015-11-09 | 2 | -22/+33 |
|/ | | | | ImgCount field from Post model | ||||
* | Updating version to v1.2.0 | Christopher Speller | 2015-11-09 | 1 | -0/+1 |
| | |||||
* | Add tutorial pref for new users by default | JoramWilander | 2015-11-06 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1334 from mattermost/plt-121 | Joram Wilander | 2015-11-06 | 3 | -6/+170 |
|\ | | | | | PLT-121 Fixing searching for quotations | ||||
| * | Fixing searching for quotations | Christopher Speller | 2015-11-06 | 3 | -6/+170 |
| | | |||||
* | | Merge pull request #1332 from mattermost/plt-560 | Christopher Speller | 2015-11-06 | 1 | -0/+7 |
|\ \ | | | | | | | PLT-560 Prevent SSO users from changing their email | ||||
| * | | Prevent SSO users from changing their email | JoramWilander | 2015-11-06 | 1 | -0/+7 |
| |/ | |||||
* / | PLT-857: Support for Incoming Webhooks - Try #2 | Florian Orben | 2015-11-05 | 3 | -26/+51 |
|/ | |||||
* | Fixed string length checks for fields that can contain unicode characters | hmhealey | 2015-11-05 | 6 | -12/+18 |
| | |||||
* | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 1 | -2/+2 |
|\ | | | | | PLT-516 Part 1 of performance fixes for large teams | ||||
| * | 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 |
|\ \ | |/ |/| | PLT-824 Adding ability to fetch posts around a specifc post | ||||
| * | 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 |
|\ \ | | | | | | | PLT-823 Refactor of center channel | ||||
| * | | 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 allow team directory and open invites | ||||
| * | 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 |
|\ \ \ | |_|/ |/| | | PLT-600 Renamed channel description to channel header and added channel purpose field | ||||
| * | | 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 |
| |\ \ | | | | | | | | | Parse incoming webhook requests into model instead of string map | ||||
| | * | | 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 |
| |\ \ | | |/ | |/| | 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 | -39/+28 |
| | | | | | | | | | | | | query | ||||
| | * | 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 |
| | | | | | | | | | | | | resolves #827 | ||||
* | | | 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 |
| |_|/ |/| | |