summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #184 from nickago/MM-1278Joram Wilander2015-07-173-6/+29
|\
| * removed testing materialnickago2015-07-161-1/+0
| * removed testing materialnickago2015-07-161-4/+0
| * Check your credentials from sessionnickago2015-07-162-1/+6
| * reworked logic to stem from postnickago2015-07-162-6/+6
| * Moved admin checking into seperate functionnickago2015-07-162-13/+17
| * Team admin can now delete any postnickago2015-07-142-8/+27
* | Added last updated for picturesnickago2015-07-161-1/+1
* | Revert "MM-1494 Change image resizing for preview and thumbnail to use Lanczo...Joram Wilander2015-07-161-3/+3
* | fixing merge=Corey Hulen2015-07-153-3/+19
|\ \
| * | Changed image resizing for both the preview and thumbnail to use Lanczos inte...hmhealey2015-07-141-3/+3
| * | If a message has no text but has an attached image or file the desktop notifi...Reed Garmsen2015-07-131-0/+14
| |/
| * removed testing statenickago2015-07-131-2/+0
| * Added User update functionnickago2015-07-131-0/+4
* | Fixes mm-1415 adding email bypass flag=Corey Hulen2015-07-122-2/+2
|/
* Server now notifies users they have been added to a new channelnickago2015-07-091-0/+4
* Merge pull request #149 from rgarmsen2295/mm-1260Christopher Speller2015-07-081-0/+9
|\
| * Small tweaks and cleanupReed Garmsen2015-07-071-2/+2
| * Added a server side check to see if members who are trying to be invited have...Reed Garmsen2015-07-071-0/+9
* | Merge pull request #136 from mattermost/code-reviewJoram Wilander2015-07-082-5/+7
|\ \
| * | team code review=Corey Hulen2015-07-062-5/+7
* | | Merge pull request #143 from rgarmsen2295/mm-1416Corey Hulen2015-07-071-0/+9
|\ \ \ | |_|/ |/| |
| * | Added new error message when trying to add a channel that was previously dele...Reed Garmsen2015-07-061-0/+9
* | | Merge pull request #138 from hmhealey/mm756Christopher Speller2015-07-071-3/+3
|\ \ \
| * | | Add a post type for user joined/left messages and don't flag a channel as unr...hmhealey2015-07-071-3/+3
| |/ /
* / / Explicitly cast to an int64 when selecting a random profile picture colour to...hmhealey2015-07-061-1/+1
|/ /
* | Fixing unit tests=Corey Hulen2015-07-0610-87/+97
* | adding debugging=Corey Hulen2015-07-061-2/+4
* | adding debugging=Corey Hulen2015-07-051-7/+8
* | adding debugging=Corey Hulen2015-07-051-6/+7
* | fixing unit tests=Corey Hulen2015-07-052-0/+4
* | Fixing unit test=Corey Hulen2015-07-051-4/+4
* | Fixing unit test=Corey Hulen2015-07-051-3/+3
* | fixing unit tests=Corey Hulen2015-07-052-2/+2
* | fixing race condition in unit tests=Corey Hulen2015-07-059-70/+70
|/
* MM-1426 - Updating UIAsaad Mahmood2015-07-171-1/+1
* Facelifted "direct message" to "private message"nickago2015-07-011-1/+1
* Merge pull request #106 from mattermost/mm-1119Joram Wilander2015-06-301-2/+12
|\
| * added team-wide and channel-wide mentionsJoramWilander2015-06-291-2/+12
* | Merge pull request #100 from asaadmahmoodspin/masterCorey Hulen2015-06-291-1/+1
|\ \
| * | MM-1268 - Updating button in email templateAsaad Mahmood2015-06-301-1/+1
* | | Merge pull request #98 from mattermost/mm-1199Corey Hulen2015-06-297-30/+87
|\ \ \ | |/ / |/| |
| * | update unit tests for default channelsJoramWilander2015-06-293-3/+26
| * | new users now join off-topic defaultlyJoramWilander2015-06-294-16/+43
| * | move default channel creation to seperate func and add off-topicJoramWilander2015-06-293-20/+27
| |/
* / Changed invite email to reflect the sender's status in the team (e.g. admin v...Reed Garmsen2015-06-292-1/+10
|/
* updated channel unit testJoramWilander2015-06-291-3/+9
* Merge pull request #59 from haikoschol/masterCorey Hulen2015-06-271-1/+1
|\
| * Fix typo in function nameHaiko Schol2015-06-241-1/+1
* | Merge pull request #48 from rgarmsen2295/mm-1364Corey Hulen2015-06-251-0/+1
|\ \