summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge pull request #234 from asaadmahmoodspin/masterCorey Hulen2015-07-225-12/+29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Profile pic changes in LHS Header
| | * | | | | | | | Improving formatting for Channel IntroAsaad Mahmood2015-07-223-11/+23
| | | | | | | | | |
| | * | | | | | | | Adjusting scroll in RHS to not show whitespaceAsaad Mahmood2015-07-221-0/+1
| | | | | | | | | |
| | * | | | | | | | Profile pic changes in LHS HeaderAsaad Mahmood2015-07-222-1/+5
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic.
| * | | | | | | | Merge pull request #233 from asaadmahmoodspin/mm-1616Corey Hulen2015-07-2210-168/+350
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Adding back Access History and Active Devices
| | * | | | | | | Adding back Access History and Active DevicesReed Garmsen2015-07-2210-168/+350
| | | | | | | | |
| * | | | | | | | Merge pull request #232 from mattermost/post-list-nullJoram Wilander2015-07-221-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Small fix for a null TypeError in post_list updating code
| | * | | | | | | Small patch for a null TypeError in post_list updating codeChristopher Speller2015-07-221-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #231 from mattermost/file-fixesChristopher Speller2015-07-222-27/+27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | More patches for files
| | * | | | | | | fix the ability to remove file previews once uploadedJoramWilander2015-07-221-2/+3
| | | | | | | | |
| | * | | | | | | fixed thumbnails and files in RHSJoramWilander2015-07-221-25/+24
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #230 from mattermost/download-link-fixChristopher Speller2015-07-221-3/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fixed download link in image viewer
| | * | | | | | | fixed download link in image viewerJoramWilander2015-07-211-3/+10
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #224 from hmhealey/mm1625Christopher Speller2015-07-222-4/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | MM-1625 Correct the appearance of the post menu on both desktop and mobile
| | * | | | | | Changed post menu label to be ... and to make it visible at all times on ↵hmhealey2015-07-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small screens (ie mobile devices)
| | * | | | | | Changed post menu label to just be [...] regardless of whether or not the ↵hmhealey2015-07-211-4/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | user is hovering over it
| * | | | | | Merge pull request #222 from rgarmsen2295/mm-1574Joram Wilander2015-07-221-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | MM-1574 Fixed typo in the 'Sign up Complete' page: you email -> your email
| | * | | | | 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
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | fixes mm-1351 adds local server storage
| | * | | | 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 ↵JoramWilander2015-07-216-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | * | | | 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 ↵JoramWilander2015-07-212-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | default for docker config
| | * | | | 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 previews.
| | * | | | 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 paths
| | * | | | 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 structure
| | * | | | 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
| |\| | | | | | | | | | | | | | | | Patch for issue with old uploaded files.
| | * | | | Old files are saved with full paths, this changes so that new files are not ↵Christopher Speller2015-07-212-1/+13
| |/ / / / | | | | | | | | | | | | | | | saved with absolute paths and detects old files saved and fixes them.
* | | | | Fixing merge=Corey Hulen2015-07-211-1/+2
| | | | |
* | | | | fixing merge conflicts=Corey Hulen2015-07-21149-2589/+2303
|\| | | |
| * | | | Merge pull request #200 from mattermost/mm-1356Corey Hulen2015-07-2186-1216/+893
| |\ \ \ \ | | | | | | | | | | | | MM-1356 Changing team URLs from team.domain.com to domain.com/team
| | * | | | Changing the way we mattermost handles URLs. team.domain.com becomes ↵Christopher Speller2015-07-2086-1216/+893
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #210 from hmhealey/makefileCorey Hulen2015-07-211-2/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Changed Makefile to restart existing mysql/redis containers if they've been stopped
| | * | | | Changed Makefile to restart existing mysql/redis containers if they've been ↵hmhealey2015-07-201-2/+8
| | |/ / / | | | | | | | | | | | | | | | stopped
| * | | | Merge pull request #217 from mattermost/quick-manage-fixJoram Wilander2015-07-211-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | quick fix to get manage team modal working again
| | * | | 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 bug
| | * | | mm-1631 - Fixing image previewer bugAsaad Mahmood2015-07-213-4/+13
| |/ / /