summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #185 from mattermost/mm-1348Corey Hulen2015-07-179-68/+35
|\ | | | | fixes mm-1348 removing dependency on redis
| * fixes mm-1348 removing dependency on redis=Corey Hulen2015-07-149-68/+35
| |
* | Unify all locations where we determine a user's display named based off of ↵hmhealey2015-07-171-6/+1
| | | | | | | | their nickname/username into a helper function
* | Allow Users to be notified using @all, @channel, and their first name when ↵hmhealey2015-07-171-4/+4
| | | | | | | | other notifications are disabled
* | Use User.FirstName instead of trying to infer a user's first name from their ↵hmhealey2015-07-172-9/+4
| | | | | | | | nickname in multiple places.
* | Renamed FullName column in database to Nickname. Renamed all serverside ↵hmhealey2015-07-1713-112/+112
| | | | | | | | references from FullName to Nickname.
* | Merge pull request #203 from nickago/MM-1601Christopher Speller2015-07-171-1/+1
|\ \ | | | | | | MM-1601 Fixed typo in reset password field
| * | Fixed typonickago2015-07-171-1/+1
| | |
* | | Merge pull request #184 from nickago/MM-1278Joram Wilander2015-07-173-6/+29
|\ \ \ | |/ / |/| | MM-1278 Team admin can now delete any post
| * | 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 ↵Joram Wilander2015-07-161-3/+3
| | | | | | | | | | | | Lanczos interpolation"
* | | fixing merge=Corey Hulen2015-07-153-3/+19
|\ \ \
| * | | Changed image resizing for both the preview and thumbnail to use Lanczos ↵hmhealey2015-07-141-3/+3
| | |/ | |/| | | | | | | interpolation instead of simple nearest neighbour
| * | If a message has no text but has an attached image or file the desktop ↵Reed Garmsen2015-07-131-0/+14
| |/ | | | | | | notification now says uploaded an image or uploaded a file respectively (if both, defaults to image)
| * 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
|\ | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup
| * Small tweaks and cleanupReed Garmsen2015-07-071-2/+2
| |
| * Added a server side check to see if members who are trying to be invited ↵Reed Garmsen2015-07-071-0/+9
| | | | | | | | have already been invited by checking the email. Client handles it as if it was an email error.
* | Merge pull request #136 from mattermost/code-reviewJoram Wilander2015-07-082-5/+7
|\ \ | | | | | | team code review
| * | team code review=Corey Hulen2015-07-062-5/+7
| | |
* | | Merge pull request #143 from rgarmsen2295/mm-1416Corey Hulen2015-07-071-0/+9
|\ \ \ | |_|/ |/| | MM-1416 Changed error message when adding a previously deleted channel to be better suited
| * | Added new error message when trying to add a channel that was previously ↵Reed Garmsen2015-07-061-0/+9
| | | | | | | | | | | | deleted as well as a corresponding unit test
* | | Merge pull request #138 from hmhealey/mm756Christopher Speller2015-07-071-3/+3
|\ \ \ | | | | | | | | MM-756 Don't mark channels as unread after user joined/left messages
| * | | Add a post type for user joined/left messages and don't flag a channel as ↵hmhealey2015-07-071-3/+3
| |/ / | | | | | | | | | unread when one of those is automatically posted
* / / Explicitly cast to an int64 when selecting a random profile picture colour ↵hmhealey2015-07-061-1/+1
|/ / | | | | | | to prevent overflow on 32-bit installations of Go
* | 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
|\ | | | | fixes mm-1119 adds @all and @channel mention capabilites
| * 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 template
| * | 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
|\ \ \ | |/ / |/| | fixes mm-1199 adds off-topic as a default channel