Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #1332 from mattermost/plt-560 | Christopher Speller | 2015-11-06 | 1 | -1/+1 | |
|\ | | | | | PLT-560 Prevent SSO users from changing their email | |||||
| * | Prevent SSO users from changing their email | JoramWilander | 2015-11-06 | 1 | -1/+1 | |
| | | ||||||
* | | PLT-857: Support for Incoming Webhooks - Try #2 | Florian Orben | 2015-11-05 | 1 | -3/+11 | |
|/ | ||||||
* | Update email css | JoramWilander | 2015-11-05 | 1 | -1/+1 | |
| | ||||||
* | Don't send welcome emails for users signing up from an email invite, update ↵ | JoramWilander | 2015-11-05 | 3 | -7/+12 | |
| | | | | email content | |||||
* | Changed post searching to ignore requests to return everything by searching ↵ | hmhealey | 2015-11-04 | 2 | -1/+8 | |
| | | | | for * | |||||
* | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 2 | -3/+24 | |
|\ | | | | | PLT-516 Part 1 of performance fixes for large teams | |||||
| * | Updated getStatuses unit testgs | JoramWilander | 2015-11-03 | 1 | -1/+7 | |
| | | ||||||
| * | Multiple fixes to major performance issues with teams with 50+ users | JoramWilander | 2015-11-03 | 1 | -2/+17 | |
| | | ||||||
* | | Merge pull request #1285 from mattermost/plt-824 | Joram Wilander | 2015-11-04 | 2 | -0/+143 | |
|\ \ | |/ |/| | 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 | 2 | -0/+143 | |
| | | ||||||
* | | Merge pull request #1263 from yuvipanda/add-me | Corey Hulen | 2015-11-02 | 1 | -0/+30 | |
|\ \ | |/ |/| | Add a /me command | |||||
| * | PLT-394: Add a /me command | YuviPanda | 2015-11-01 | 1 | -0/+30 | |
| | | | | | | | | | | | | | | - Just italicizes the message to mark it as 'action' - Same behavior as slack - Is super useful for people moving from IRC, since /me is often burnt into muscle memory | |||||
* | | Go fmt and rename file with 'enviroment' in filename | Pat Lathem | 2015-10-30 | 1 | -1/+1 | |
| | | ||||||
* | | Fix spelling of environment | Pat Lathem | 2015-10-30 | 3 | -24/+24 | |
|/ | ||||||
* | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 3 | -56/+33 | |
|\ | | | | | PLT-340 allow team directory and open invites | |||||
| * | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 1 | -0/+6 | |
| |\ | ||||||
| * | | PLT-340 | =Corey Hulen | 2015-10-27 | 3 | -56/+33 | |
| | | | ||||||
* | | | Fixed nil pointer when failing to upload an oversized image | hmhealey | 2015-10-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fixing 200 error bug | =Corey Hulen | 2015-10-29 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #1214 from mattermost/outgoing-hook-fix | Corey Hulen | 2015-10-28 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | Pass in iter vars to closures properly for outgoing webhooks | |||||
| * | | | Pass in iter vars to closure properly | JoramWilander | 2015-10-28 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | Merge pull request #1199 from hmhealey/plt600 | Corey Hulen | 2015-10-28 | 4 | -38/+150 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-600 Renamed channel description to channel header and added channel purpose field | |||||
| * | | | Added Channel.Purpose on the server | hmhealey | 2015-10-27 | 3 | -7/+119 | |
| | | | | ||||||
| * | | | Renamed Channel.Description to Channel.Header on the server | hmhealey | 2015-10-27 | 4 | -37/+37 | |
| | | | | ||||||
* | | | | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 1 | -0/+6 | |
| |_|/ |/| | | ||||||
* | | | 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 | |
| |\ \ \ | | | |/ | | |/| |