| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-23 | 2 | -78/+188 |
| |\ | |||||
| | * | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 1 | -77/+187 |
| | |\ | | | | | | | fixes mm-1570 adds support for using mattermost as an OAuth client | ||||
| | | * | added store unit test for user.GetByAuth and added password length checking ↵ | JoramWilander | 2015-07-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | in api.login | ||||
| | | * | add check on server to prevent password updating for users who log in ↵ | JoramWilander | 2015-07-22 | 1 | -0/+7 |
| | | | | | | | | | | | | | through oauth | ||||
| | | * | add changes from team review | JoramWilander | 2015-07-22 | 1 | -0/+1 |
| | | | | |||||
| | | * | added error case for login and removed authdata + authservice unique ↵ | JoramWilander | 2015-07-22 | 1 | -9/+23 |
| | | | | | | | | | | | | | constraint in users table | ||||
| | | * | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 1 | -45/+34 |
| | | | | |||||
| | | * | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 1 | -1/+1 |
| | | | | |||||
| | | * | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 1 | -6/+6 |
| | | | | |||||
| | | * | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 1 | -13/+48 |
| | | | | |||||
| | | * | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 1 | -46/+104 |
| | | | | |||||
| | * | | Minor UI Improvements | Asaad Mahmood | 2015-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-22 | 7 | -191/+332 |
| |\| | | |||||
| | * | | Merge pull request #214 from hmhealey/mm1498 | Joram Wilander | 2015-07-22 | 1 | -0/+31 |
| | |\ \ | | | | | | | | | MM-1498 Provide a replacement message for email notifications for posts only containing files | ||||
| | | * | | Use QueryUnescape function to convert to a human readable filename in email ↵ | hmhealey | 2015-07-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | notifications | ||||
| | | * | | 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 | ||||
| | * | | | Changed the subject line for emails sent regarding mentions and other team ↵ | Reed Garmsen | 2015-07-21 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | notifications. This is meant to prevent notification emails from different teams from combining into a single email thread | ||||
| | * | | removed unnecessary debug statements | JoramWilander | 2015-07-21 | 2 | -4/+0 |
| | | | | |||||
| | * | | fixed unit tests to work with team domain changes and update partial url ↵ | JoramWilander | 2015-07-21 | 4 | -17/+53 |
| | | | | | | | | | | | | | regex for files | ||||
| | * | | added sanitization to filenames to remove the possibility of relative paths | JoramWilander | 2015-07-21 | 2 | -4/+12 |
| | | | | |||||
| | * | | updated create profile image unit test to clean up images properly | JoramWilander | 2015-07-21 | 1 | -0/+18 |
| | | | | |||||
| | * | | add proper url encoding for filenames | JoramWilander | 2015-07-21 | 1 | -1/+4 |
| | | | | |||||
| | * | | update file unit tests | JoramWilander | 2015-07-21 | 3 | -67/+143 |
| | | | | |||||
| | * | | initial implementation of local server storage for files | JoramWilander | 2015-07-21 | 2 | -103/+109 |
| | | | | |||||
| | * | | Fixing issues with files trasitioning to relative paths | Christopher Speller | 2015-07-21 | 2 | -34/+1 |
| | | | | |||||
| | * | | Old files are saved with full paths, this changes so that new files are not ↵ | Christopher Speller | 2015-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | saved with absolute paths and detects old files saved and fixes them. | ||||
| * | | | fixing merge conflicts | =Corey Hulen | 2015-07-21 | 39 | -681/+660 |
| |\| | | |||||
| | * | | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 34 | -490/+473 |
| | |/ | | | | | | | | | | | | | domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users | ||||
| | * | 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 |
| | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |