summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
* | | Allow users to download file attachments with names that don't include a file...hmhealey2015-07-281-1/+1
|/ /
* | Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-281-0/+6
|\ \
| * | Limited the added headers to only non-api callsnickago2015-07-271-2/+6
| * | Centralized header additions and removed duplicate codenickago2015-07-271-0/+2
| |/
* | Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-281-0/+5
|\ \
| * | When user is removed, a modal appears, which on closing redirects thenickago2015-07-271-0/+1
| * | When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+4
| |/
* / Change image rescaling algorithm back to Lanczos3 now that it works correctly...hmhealey2015-07-241-2/+2
|/
* 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
| |\
| | * added store unit test for user.GetByAuth and added password length checking i...JoramWilander2015-07-231-0/+6
| | * add check on server to prevent password updating for users who log in through...JoramWilander2015-07-221-0/+7
| | * add changes from team reviewJoramWilander2015-07-221-0/+1
| | * added error case for login and removed authdata + authservice unique constrai...JoramWilander2015-07-221-9/+23
| | * 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
| |\ \
| | * | Use QueryUnescape function to convert to a human readable filename in email n...hmhealey2015-07-211-1/+7
| | * | Added additional check when adding a message to an email notification for a b...hmhealey2015-07-201-2/+2
| | * | Provide a replacement message for email notifications for posts only containi...hmhealey2015-07-201-4/+29
| * | | Changed the subject line for emails sent regarding mentions and other team no...Reed Garmsen2015-07-211-1/+1
| | |/ | |/|
| * | removed unnecessary debug statementsJoramWilander2015-07-212-4/+0
| * | fixed unit tests to work with team domain changes and update partial url rege...JoramWilander2015-07-214-17/+53
| * | 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 s...Christopher Speller2015-07-211-1/+1
* | | fixing merge conflicts=Corey Hulen2015-07-2139-681/+660
|\| |
| * | Changing the way we mattermost handles URLs. team.domain.com becomes domain.c...Christopher Speller2015-07-2034-490/+473
| |/
| * Merge pull request #185 from mattermost/mm-1348Corey Hulen2015-07-179-68/+35
| |\
| | * 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 th...hmhealey2015-07-171-6/+1
| * | Allow Users to be notified using @all, @channel, and their first name when ot...hmhealey2015-07-171-4/+4
| * | Use User.FirstName instead of trying to infer a user's first name from their ...hmhealey2015-07-172-9/+4
| * | Renamed FullName column in database to Nickname. Renamed all serverside refer...hmhealey2015-07-1713-112/+112
| * | Merge pull request #203 from nickago/MM-1601Christopher Speller2015-07-171-1/+1
| |\ \
| | * | Fixed typonickago2015-07-171-1/+1
| * | | 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