Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added additional check when adding a message to an email notification for a ↵ | hmhealey | 2015-07-20 | 1 | -2/+2 |
| | | | | blank post and corrected a comment | ||||
* | Provide a replacement message for email notifications for posts only ↵ | hmhealey | 2015-07-20 | 1 | -4/+29 |
| | | | | containing files | ||||
* | Merge pull request #185 from mattermost/mm-1348 | Corey Hulen | 2015-07-17 | 9 | -68/+35 |
|\ | | | | | fixes mm-1348 removing dependency on redis | ||||
| * | fixes mm-1348 removing dependency on redis | =Corey Hulen | 2015-07-14 | 9 | -68/+35 |
| | | |||||
* | | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 1 | -6/+1 |
| | | | | | | | | their nickname/username into a helper function | ||||
* | | Allow Users to be notified using @all, @channel, and their first name when ↵ | hmhealey | 2015-07-17 | 1 | -4/+4 |
| | | | | | | | | other notifications are disabled | ||||
* | | Use User.FirstName instead of trying to infer a user's first name from their ↵ | hmhealey | 2015-07-17 | 2 | -9/+4 |
| | | | | | | | | nickname in multiple places. | ||||
* | | Renamed FullName column in database to Nickname. Renamed all serverside ↵ | hmhealey | 2015-07-17 | 13 | -112/+112 |
| | | | | | | | | references from FullName to Nickname. | ||||
* | | Merge pull request #203 from nickago/MM-1601 | Christopher Speller | 2015-07-17 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1601 Fixed typo in reset password field | ||||
| * | | Fixed typo | nickago | 2015-07-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #184 from nickago/MM-1278 | Joram Wilander | 2015-07-17 | 3 | -6/+29 |
|\ \ \ | |/ / |/| | | MM-1278 Team admin can now delete any post | ||||
| * | | removed testing material | nickago | 2015-07-16 | 1 | -1/+0 |
| | | | |||||
| * | | removed testing material | nickago | 2015-07-16 | 1 | -4/+0 |
| | | | |||||
| * | | Check your credentials from session | nickago | 2015-07-16 | 2 | -1/+6 |
| | | | |||||
| * | | reworked logic to stem from post | nickago | 2015-07-16 | 2 | -6/+6 |
| | | | |||||
| * | | Moved admin checking into seperate function | nickago | 2015-07-16 | 2 | -13/+17 |
| | | | |||||
| * | | Team admin can now delete any post | nickago | 2015-07-14 | 2 | -8/+27 |
| | | | |||||
* | | | Added last updated for pictures | nickago | 2015-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | Revert "MM-1494 Change image resizing for preview and thumbnail to use ↵ | Joram Wilander | 2015-07-16 | 1 | -3/+3 |
| | | | | | | | | | | | | Lanczos interpolation" | ||||
* | | | fixing merge | =Corey Hulen | 2015-07-15 | 3 | -3/+19 |
|\ \ \ | |||||
| * | | | Changed image resizing for both the preview and thumbnail to use Lanczos ↵ | hmhealey | 2015-07-14 | 1 | -3/+3 |
| | |/ | |/| | | | | | | | interpolation instead of simple nearest neighbour | ||||
| * | | If a message has no text but has an attached image or file the desktop ↵ | Reed Garmsen | 2015-07-13 | 1 | -0/+14 |
| |/ | | | | | | | notification now says uploaded an image or uploaded a file respectively (if both, defaults to image) | ||||
| * | removed testing state | nickago | 2015-07-13 | 1 | -2/+0 |
| | | |||||
| * | Added User update function | nickago | 2015-07-13 | 1 | -0/+4 |
| | | |||||
* | | Fixes mm-1415 adding email bypass flag | =Corey Hulen | 2015-07-12 | 2 | -2/+2 |
|/ | |||||
* | Server now notifies users they have been added to a new channel | nickago | 2015-07-09 | 1 | -0/+4 |
| | |||||
* | Merge pull request #149 from rgarmsen2295/mm-1260 | Christopher Speller | 2015-07-08 | 1 | -0/+9 |
|\ | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup | ||||
| * | Small tweaks and cleanup | Reed Garmsen | 2015-07-07 | 1 | -2/+2 |
| | | |||||
| * | Added a server side check to see if members who are trying to be invited ↵ | Reed Garmsen | 2015-07-07 | 1 | -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-review | Joram Wilander | 2015-07-08 | 2 | -5/+7 |
|\ \ | | | | | | | team code review | ||||
| * | | team code review | =Corey Hulen | 2015-07-06 | 2 | -5/+7 |
| | | | |||||
* | | | Merge pull request #143 from rgarmsen2295/mm-1416 | Corey Hulen | 2015-07-07 | 1 | -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 Garmsen | 2015-07-06 | 1 | -0/+9 |
| | | | | | | | | | | | | deleted as well as a corresponding unit test | ||||
* | | | Merge pull request #138 from hmhealey/mm756 | Christopher Speller | 2015-07-07 | 1 | -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 ↵ | hmhealey | 2015-07-07 | 1 | -3/+3 |
| |/ / | | | | | | | | | | unread when one of those is automatically posted | ||||
* / / | Explicitly cast to an int64 when selecting a random profile picture colour ↵ | hmhealey | 2015-07-06 | 1 | -1/+1 |
|/ / | | | | | | | to prevent overflow on 32-bit installations of Go | ||||
* | | Fixing unit tests | =Corey Hulen | 2015-07-06 | 10 | -87/+97 |
| | | |||||
* | | adding debugging | =Corey Hulen | 2015-07-06 | 1 | -2/+4 |
| | | |||||
* | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -7/+8 |
| | | |||||
* | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -6/+7 |
| | | |||||
* | | fixing unit tests | =Corey Hulen | 2015-07-05 | 2 | -0/+4 |
| | | |||||
* | | Fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -4/+4 |
| | | |||||
* | | Fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -3/+3 |
| | | |||||
* | | fixing unit tests | =Corey Hulen | 2015-07-05 | 2 | -2/+2 |
| | | |||||
* | | fixing race condition in unit tests | =Corey Hulen | 2015-07-05 | 9 | -70/+70 |
|/ | |||||
* | MM-1426 - Updating UI | Asaad Mahmood | 2015-07-17 | 1 | -1/+1 |
| | |||||
* | Facelifted "direct message" to "private message" | nickago | 2015-07-01 | 1 | -1/+1 |
| | |||||
* | Merge pull request #106 from mattermost/mm-1119 | Joram Wilander | 2015-06-30 | 1 | -2/+12 |
|\ | | | | | fixes mm-1119 adds @all and @channel mention capabilites | ||||
| * | added team-wide and channel-wide mentions | JoramWilander | 2015-06-29 | 1 | -2/+12 |
| | | |||||
* | | Merge pull request #100 from asaadmahmoodspin/master | Corey Hulen | 2015-06-29 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1268 - Updating button in email template |