summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-311-2/+5
|\ \ \ \ \
| * | | | | Changed file API to not write response data on a HEAD requesthmhealey2015-07-291-1/+4
| * | | | | Allow file access apis to respond to HEAD requestshmhealey2015-07-291-1/+1
| |/ / / /
* | | | | Merge pull request #283 from mattermost/mm-1787Christopher Speller2015-07-311-5/+4
|\ \ \ \ \
| * | | | | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-301-3/+2
| * | | | | Fixing links for signup from team invite link. Enter now advances signup_user...Christopher Speller2015-07-301-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #285 from hmhealey/mm1738Joram Wilander2015-07-301-4/+17
|\ \ \ \ \
| * | | | | Fixed team API to properly provide team names for the Find My Team emailhmhealey2015-07-291-4/+17
| |/ / / /
* | | | | Merge pull request #272 from rgarmsen2295/mm-1463Christopher Speller2015-07-301-4/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Made font type a field in the config fileReed Garmsen2015-07-291-1/+1
| * | | | Changed text initial size and positioning to better handle different image si...Reed Garmsen2015-07-291-3/+5
| * | | | Added godeps and the source for the go freetype libraryReed Garmsen2015-07-291-29/+5
| * | | | Added back username initials being included in default profile pictureReed Garmsen2015-07-281-5/+38
| * | | | Initial changes to putting initials on default profile picsReed Garmsen2015-07-281-0/+18
* | | | | updated channel error messages to reflect proper namingJoramWilander2015-07-291-2/+2
| |/ / / |/| | |
* | | | Merge pull request #265 from mattermost/mm-1711Joram Wilander2015-07-291-7/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-281-7/+0
| |/ /
* | | Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-289-18/+18
|\ \ \ | |/ / |/| |
| * | MM-1730 - Updating logo in emailsAsaad Mahmood2015-07-289-9/+9
| * | mm-1732 - Decrease font size for footer in emailsAsaad Mahmood2015-07-289-9/+9
* | | 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