summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #272 from rgarmsen2295/mm-1463Christopher Speller2015-07-301-4/+33
|\ | | | | MM-1463 Adds back username initials being included in user's default profile picture
| * 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 ↵Reed Garmsen2015-07-291-3/+5
| | | | | | | | sizes and removed dead code
| * 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
|\ \ | | | | | | MM-1711 update sign-up and login UI
| * | 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-1732 - Decreasing font size for footer in emails
| * 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 ↵hmhealey2015-07-281-1/+1
|/ | | | file extension
* Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-281-0/+6
|\ | | | | MM-1654 Anti-clickjacking measures
| * 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
|\ \ | | | | | | MM-1295 Removal from a channel occurs in real time
| * | When user is removed, a modal appears, which on closing redirects thenickago2015-07-271-0/+1
| | | | | | | | | | | | user to town square.
| * | When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+4
| |/ | | | | | | channel is removed from their sidebar
* / Change image rescaling algorithm back to Lanczos3 now that it works ↵hmhealey2015-07-241-2/+2
|/ | | | correctly in all cases
* 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