summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mm-1420=Corey Hulen2015-07-232-78/+188
|\
| * Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-231-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 ↵JoramWilander2015-07-231-0/+6
| | | | | | | | | | | | in api.login
| | * add check on server to prevent password updating for users who log in ↵JoramWilander2015-07-221-0/+7
| | | | | | | | | | | | through oauth
| | * add changes from team reviewJoramWilander2015-07-221-0/+1
| | |
| | * added error case for login and removed authdata + authservice unique ↵JoramWilander2015-07-221-9/+23
| | | | | | | | | | | | constraint in users table
| | * added signup link verification to oauth signup flowJoramWilander2015-07-221-45/+34
| | |
| | * add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-221-1/+1
| | |
| | * merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-221-6/+6
| | |
| | * made oauth architecture more generalizedJoramWilander2015-07-221-13/+48
| | |
| | * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-221-46/+104
| | |
| * | Minor UI ImprovementsAsaad Mahmood2015-07-231-1/+1
| | |
* | | Merge branch 'master' into mm-1420=Corey Hulen2015-07-227-191/+332
|\| |
| * | Merge pull request #214 from hmhealey/mm1498Joram Wilander2015-07-221-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 ↵hmhealey2015-07-211-1/+7
| | | | | | | | | | | | | | | | notifications
| | * | Added additional check when adding a message to an email notification for a ↵hmhealey2015-07-201-2/+2
| | | | | | | | | | | | | | | | blank post and corrected a comment
| | * | Provide a replacement message for email notifications for posts only ↵hmhealey2015-07-201-4/+29
| | | | | | | | | | | | | | | | containing files
| * | | Changed the subject line for emails sent regarding mentions and other team ↵Reed Garmsen2015-07-211-1/+1
| | |/ | |/| | | | | | | notifications. This is meant to prevent notification emails from different teams from combining into a single email thread
| * | removed unnecessary debug statementsJoramWilander2015-07-212-4/+0
| | |
| * | fixed unit tests to work with team domain changes and update partial url ↵JoramWilander2015-07-214-17/+53
| | | | | | | | | | | | regex for files
| * | added sanitization to filenames to remove the possibility of relative pathsJoramWilander2015-07-212-4/+12
| | |
| * | updated create profile image unit test to clean up images properlyJoramWilander2015-07-211-0/+18
| | |
| * | add proper url encoding for filenamesJoramWilander2015-07-211-1/+4
| | |
| * | update file unit testsJoramWilander2015-07-213-67/+143
| | |
| * | initial implementation of local server storage for filesJoramWilander2015-07-212-103/+109
| | |
| * | Fixing issues with files trasitioning to relative pathsChristopher Speller2015-07-212-34/+1
| | |
| * | Old files are saved with full paths, this changes so that new files are not ↵Christopher Speller2015-07-211-1/+1
| | | | | | | | | | | | saved with absolute paths and detects old files saved and fixes them.
* | | fixing merge conflicts=Corey Hulen2015-07-2139-681/+660
|\| |
| * | Changing the way we mattermost handles URLs. team.domain.com becomes ↵Christopher Speller2015-07-2034-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-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
| | |