Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #205 from mattermost/mm-1351 | Corey Hulen | 2015-07-21 | 16 | -206/+383 |
|\ | | | | | fixes mm-1351 adds local server storage | ||||
| * | removed unnecessary debug statements | JoramWilander | 2015-07-21 | 2 | -4/+0 |
| | | |||||
| * | fix click through on the image viewer modal to work with new team domain changes | JoramWilander | 2015-07-21 | 1 | -1/+1 |
| | | |||||
| * | fixed unit tests to work with team domain changes and update partial url ↵ | JoramWilander | 2015-07-21 | 6 | -19/+55 |
| | | | | | | | | regex for files | ||||
| * | added sanitization to filenames to remove the possibility of relative paths | JoramWilander | 2015-07-21 | 2 | -4/+12 |
| | | |||||
| * | updated create profile image unit test to clean up images properly | JoramWilander | 2015-07-21 | 1 | -0/+18 |
| | | |||||
| * | remove data dirs in make clean and updated gitignore with api/data | JoramWilander | 2015-07-21 | 2 | -0/+3 |
| | | |||||
| * | change docker default storage directory to /mattermost/data | JoramWilander | 2015-07-21 | 1 | -1/+1 |
| | | |||||
| * | added relative data directory as default for storage and added it to gitignore | JoramWilander | 2015-07-21 | 2 | -2/+5 |
| | | |||||
| * | add proper url encoding for filenames | JoramWilander | 2015-07-21 | 2 | -1/+23 |
| | | |||||
| * | create default storage directory in Dockerfile, turn on server storage by ↵ | JoramWilander | 2015-07-21 | 2 | -6/+9 |
| | | | | | | | | default for docker config | ||||
| * | turned off local server storage by default | JoramWilander | 2015-07-21 | 2 | -4/+4 |
| | | |||||
| * | update file unit tests | JoramWilander | 2015-07-21 | 3 | -67/+143 |
| | | |||||
| * | initial implementation of local server storage for files | JoramWilander | 2015-07-21 | 5 | -115/+127 |
|/ | |||||
* | Merge pull request #227 from mattermost/files-patch | Christopher Speller | 2015-07-21 | 1 | -0/+5 |
|\ | | | | | Fixing image previews. | ||||
| * | Fixing image previews | Christopher Speller | 2015-07-21 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #225 from mattermost/files-patch | Corey Hulen | 2015-07-21 | 3 | -34/+5 |
|\| | | | | | Fixing issues with files trasitioning to relative paths | ||||
| * | Fixing issues with files trasitioning to relative paths | Christopher Speller | 2015-07-21 | 3 | -34/+5 |
| | | |||||
* | | Merge pull request #223 from mattermost/files-patch | Corey Hulen | 2015-07-21 | 3 | -2/+8 |
|\| | | | | | Fixing file uploads and previews for new /team/ URL structure | ||||
| * | Fixing file uploads and previews for new /team/ URL structure | Christopher Speller | 2015-07-21 | 3 | -2/+8 |
| | | |||||
* | | Merge pull request #221 from mattermost/files-patch | Corey Hulen | 2015-07-21 | 2 | -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 Speller | 2015-07-21 | 2 | -1/+13 |
|/ | | | | saved with absolute paths and detects old files saved and fixes them. | ||||
* | Merge pull request #200 from mattermost/mm-1356 | Corey Hulen | 2015-07-21 | 86 | -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 Speller | 2015-07-20 | 86 | -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/makefile | Corey Hulen | 2015-07-21 | 1 | -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 ↵ | hmhealey | 2015-07-20 | 1 | -2/+8 |
| |/ | | | | | | | stopped | ||||
* | | Merge pull request #217 from mattermost/quick-manage-fix | Joram Wilander | 2015-07-21 | 1 | -0/+1 |
|\ \ | | | | | | | quick fix to get manage team modal working again | ||||
| * | | quick fix to get manage team modal working again | JoramWilander | 2015-07-21 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #216 from asaadmahmoodspin/mm-1631 | Joram Wilander | 2015-07-21 | 3 | -4/+13 |
|\ \ | | | | | | | mm-1631 - Fixing image previewer bug | ||||
| * | | mm-1631 - Fixing image previewer bug | Asaad Mahmood | 2015-07-21 | 3 | -4/+13 |
|/ / | |||||
* | | Merge pull request #211 from rgarmsen2295/mm-1186 | Christopher Speller | 2015-07-20 | 3 | -2/+13 |
|\ \ | | | | | | | MM-1186 Adds channel name to RHS comment threads | ||||
| * | | Added channel name to RHS comment threads; minor css changes to compensate ↵ | Reed Garmsen | 2015-07-19 | 3 | -2/+13 |
| | | | | | | | | | | | | for addition | ||||
* | | | Merge pull request #207 from hmhealey/mm825 | Joram Wilander | 2015-07-20 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | MM-825 Fixed the labels on the mention list for users without their first/last name configured | ||||
| * | | | Fixed the labels on the mention list for users without their first/last name ↵ | hmhealey | 2015-07-18 | 1 | -1/+2 |
| |/ / | | | | | | | | | | configured | ||||
* | | | Merge pull request #204 from nickago/MM-1519 | Joram Wilander | 2015-07-20 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | MM-1519 Even on error, submission stops, updated to relect that | ||||
| * | | | Even on error, submission stop, updated to relect that | nickago | 2015-07-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #209 from mattermost/mm-831 | Joram Wilander | 2015-07-20 | 3 | -10/+25 |
|\ \ \ \ | |_|_|/ |/| | | | fixes mm-831 post timestamps now update | ||||
| * | | | fixes mm-831 post timestamps now update | JoramWilander | 2015-07-20 | 3 | -10/+25 |
|/ / / | |||||
* | | | Merge pull request #208 from nickago/MM-1079 | Joram Wilander | 2015-07-20 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | MM-1079 Removed remenant of non-hover system | ||||
| * | | Removed remenant of non-hover system | nickago | 2015-07-18 | 1 | -3/+1 |
| | | | |||||
* | | | Fixes javascript console errors | =Corey Hulen | 2015-07-17 | 2 | -4/+5 |
| | | | |||||
* | | | Merge pull request #185 from mattermost/mm-1348 | Corey Hulen | 2015-07-17 | 14 | -216/+35 |
|\ \ \ | | | | | | | | | fixes mm-1348 removing dependency on redis | ||||
| * | | | fixes mm-1348 removing dependency on redis | =Corey Hulen | 2015-07-14 | 14 | -216/+35 |
| | | | | |||||
* | | | | Merge pull request #192 from nickago/MM-1079 | Corey Hulen | 2015-07-17 | 3 | -6/+8 |
|\ \ \ \ | | |/ / | |/| | | MM-1079 Changed hover effect for menu | ||||
| * | | | Changed javascript to CSS method | nickago | 2015-07-17 | 3 | -6/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #177 from hmhealey/mm825 | Corey Hulen | 2015-07-17 | 31 | -230/+395 |
|\ \ \ | | | | | | | | | MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname | ||||
| * | | | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 3 | -2/+64 |
| | | | | |||||
| * | | | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 6 | -11/+33 |
| | | | | | | | | | | | | | | | | their nickname/username into a helper function | ||||
| * | | | Add tests to check if a User's first/last name are valid | hmhealey | 2015-07-17 | 1 | -0/+17 |
| | | | | |||||
| * | | | Allow Users to be notified using @all, @channel, and their first name when ↵ | hmhealey | 2015-07-17 | 2 | -13/+11 |
| | | | | | | | | | | | | | | | | other notifications are disabled |