summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added SSOSettings to docker config fileJoramWilander2015-07-221-0/+10
* add check on server to prevent password updating for users who log in through...JoramWilander2015-07-221-0/+7
* only show gitlab signup/login links if gitlab oauth is turned onJoramWilander2015-07-229-14/+46
* add changes from team reviewJoramWilander2015-07-225-12/+13
* added error case for login and removed authdata + authservice unique constrai...JoramWilander2015-07-222-10/+23
* added signup link verification to oauth signup flowJoramWilander2015-07-223-49/+88
* add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-222-1/+6
* added error message when trying to sign up with gitlab using an email already...JoramWilander2015-07-221-0/+5
* merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-229-36/+50
* made oauth architecture more generalizedJoramWilander2015-07-225-58/+141
* removed change password UI for oauth accountsJoramWilander2015-07-223-30/+49
* inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-2211-58/+463
* Merge pull request #222 from rgarmsen2295/mm-1574Joram Wilander2015-07-221-1/+1
|\
| * Fixed typo in the 'Sign up Complete' page: you email -> your emailReed Garmsen2015-07-211-1/+1
* | Merge pull request #205 from mattermost/mm-1351Corey Hulen2015-07-2116-206/+383
|\ \
| * | removed unnecessary debug statementsJoramWilander2015-07-212-4/+0
| * | fix click through on the image viewer modal to work with new team domain changesJoramWilander2015-07-211-1/+1
| * | fixed unit tests to work with team domain changes and update partial url rege...JoramWilander2015-07-216-19/+55
| * | 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
| * | remove data dirs in make clean and updated gitignore with api/dataJoramWilander2015-07-212-0/+3
| * | change docker default storage directory to /mattermost/dataJoramWilander2015-07-211-1/+1
| * | added relative data directory as default for storage and added it to gitignoreJoramWilander2015-07-212-2/+5
| * | add proper url encoding for filenamesJoramWilander2015-07-212-1/+23
| * | create default storage directory in Dockerfile, turn on server storage by def...JoramWilander2015-07-212-6/+9
| * | turned off local server storage by defaultJoramWilander2015-07-212-4/+4
| * | update file unit testsJoramWilander2015-07-213-67/+143
| * | initial implementation of local server storage for filesJoramWilander2015-07-215-115/+127
|/ /
* | Merge pull request #227 from mattermost/files-patchChristopher Speller2015-07-211-0/+5
|\ \
| * | Fixing image previewsChristopher Speller2015-07-211-0/+5
* | | Merge pull request #225 from mattermost/files-patchCorey Hulen2015-07-213-34/+5
|\| |
| * | Fixing issues with files trasitioning to relative pathsChristopher Speller2015-07-213-34/+5
* | | Merge pull request #223 from mattermost/files-patchCorey Hulen2015-07-213-2/+8
|\| |
| * | Fixing file uploads and previews for new /team/ URL structureChristopher Speller2015-07-213-2/+8
* | | Merge pull request #221 from mattermost/files-patchCorey Hulen2015-07-212-1/+13
|\| |
| * | Old files are saved with full paths, this changes so that new files are not s...Christopher Speller2015-07-212-1/+13
|/ /
* | Merge pull request #200 from mattermost/mm-1356Corey Hulen2015-07-2186-1216/+893
|\ \
| * | Changing the way we mattermost handles URLs. team.domain.com becomes domain.c...Christopher Speller2015-07-2086-1216/+893
* | | Merge pull request #210 from hmhealey/makefileCorey Hulen2015-07-211-2/+8
|\ \ \ | |_|/ |/| |
| * | Changed Makefile to restart existing mysql/redis containers if they've been s...hmhealey2015-07-201-2/+8
| |/
* | Merge pull request #217 from mattermost/quick-manage-fixJoram Wilander2015-07-211-0/+1
|\ \
| * | quick fix to get manage team modal working againJoramWilander2015-07-211-0/+1
|/ /
* | Merge pull request #216 from asaadmahmoodspin/mm-1631Joram Wilander2015-07-213-4/+13
|\ \
| * | mm-1631 - Fixing image previewer bugAsaad Mahmood2015-07-213-4/+13
|/ /
* | Merge pull request #211 from rgarmsen2295/mm-1186Christopher Speller2015-07-203-2/+13
|\ \
| * | Added channel name to RHS comment threads; minor css changes to compensate fo...Reed Garmsen2015-07-193-2/+13
* | | Merge pull request #207 from hmhealey/mm825Joram Wilander2015-07-201-1/+2
|\ \ \
| * | | Fixed the labels on the mention list for users without their first/last name ...hmhealey2015-07-181-1/+2
| |/ /
* | | Merge pull request #204 from nickago/MM-1519Joram Wilander2015-07-201-1/+2
|\ \ \
| * | | Even on error, submission stop, updated to relect thatnickago2015-07-171-1/+2