Граф коммитов

1080 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
29dd714d82 fixed thumbnails and files in RHS 2015-07-22 07:53:54 -04:00
Joram Wilander
2fef71da69 Merge pull request #222 from rgarmsen2295/mm-1574
MM-1574 Fixed typo in the 'Sign up Complete' page: you email -> your email
2015-07-22 07:36:33 -04:00
Corey Hulen
269185fb0e Merge pull request #205 from mattermost/mm-1351
fixes mm-1351 adds local server storage
2015-07-21 15:46:12 -08:00
JoramWilander
237920e314 removed unnecessary debug statements 2015-07-21 19:39:59 -04:00
JoramWilander
5886e695e4 fix click through on the image viewer modal to work with new team domain changes 2015-07-21 19:29:40 -04:00
JoramWilander
b821d23ed7 fixed unit tests to work with team domain changes and update partial url regex for files 2015-07-21 19:23:00 -04:00
JoramWilander
39abf24708 added sanitization to filenames to remove the possibility of relative paths 2015-07-21 19:22:04 -04:00
JoramWilander
04408eea37 updated create profile image unit test to clean up images properly 2015-07-21 19:22:04 -04:00
JoramWilander
25cfe548e6 remove data dirs in make clean and updated gitignore with api/data 2015-07-21 19:22:04 -04:00
JoramWilander
3fd5891a1a change docker default storage directory to /mattermost/data 2015-07-21 19:22:04 -04:00
JoramWilander
83ef05328f added relative data directory as default for storage and added it to gitignore 2015-07-21 19:22:04 -04:00
JoramWilander
c63fbd4ccc add proper url encoding for filenames 2015-07-21 19:22:04 -04:00
JoramWilander
edf26b4bc6 create default storage directory in Dockerfile, turn on server storage by default for docker config 2015-07-21 19:22:04 -04:00
JoramWilander
1e7fe834e9 turned off local server storage by default 2015-07-21 19:22:04 -04:00
JoramWilander
a6fc129a01 update file unit tests 2015-07-21 19:22:04 -04:00
JoramWilander
ada84835ee initial implementation of local server storage for files 2015-07-21 19:22:04 -04:00
Christopher Speller
06bac01e88 Merge pull request #227 from mattermost/files-patch
Fixing image previews.
2015-07-21 18:50:01 -04:00
Christopher Speller
2d51e93d8e Fixing image previews 2015-07-21 18:44:03 -04:00
Corey Hulen
26010e2690 Merge pull request #225 from mattermost/files-patch
Fixing issues with files trasitioning to relative paths
2015-07-21 14:21:53 -08:00
Christopher Speller
73ee387319 Fixing issues with files trasitioning to relative paths 2015-07-21 18:06:30 -04:00
Corey Hulen
384223a3e7 Merge pull request #223 from mattermost/files-patch
Fixing file uploads and previews for new /team/ URL structure
2015-07-21 13:00:35 -08:00
Christopher Speller
1c08a33b92 Fixing file uploads and previews for new /team/ URL structure 2015-07-21 16:54:24 -04:00
Corey Hulen
1de50f0e4f Merge pull request #221 from mattermost/files-patch
Patch for issue with old uploaded files.
2015-07-21 12:31:32 -08:00
Reed Garmsen
21520f00f3 Fixed typo in the 'Sign up Complete' page: you email -> your email 2015-07-21 13:28:13 -07:00
Christopher Speller
f5837c1b64 Old files are saved with full paths, this changes so that new files are not saved with absolute paths and detects old files saved and fixes them. 2015-07-21 16:25:49 -04:00
Corey Hulen
bee26e3f26 Merge pull request #200 from mattermost/mm-1356
MM-1356 Changing team URLs from team.domain.com to domain.com/team
2015-07-21 10:47:46 -08:00
Corey Hulen
dc250d7731 Merge pull request #210 from hmhealey/makefile
Changed Makefile to restart existing mysql/redis containers if they've been stopped
2015-07-21 10:29:29 -08:00
Joram Wilander
7a8ed5cf05 Merge pull request #217 from mattermost/quick-manage-fix
quick fix to get manage team modal working again
2015-07-21 10:50:00 -04:00
JoramWilander
cf3bfd24fd quick fix to get manage team modal working again 2015-07-21 10:49:37 -04:00
Joram Wilander
c4b92424d5 Merge pull request #216 from asaadmahmoodspin/mm-1631
mm-1631 - Fixing image previewer bug
2015-07-21 07:50:49 -04:00
Asaad Mahmood
4b7fda14ba mm-1631 - Fixing image previewer bug 2015-07-21 16:47:08 +05:00
Christopher Speller
a820b67468 Merge pull request #211 from rgarmsen2295/mm-1186
MM-1186 Adds channel name to RHS comment threads
2015-07-20 18:06:01 -04:00
Christopher Speller
c6fb95912b Changing the way we mattermost handles URLs. team.domain.com becomes 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
2015-07-20 17:45:23 -04:00
Joram Wilander
4eb061d29c Merge pull request #207 from hmhealey/mm825
MM-825 Fixed the labels on the mention list for users without their first/last name configured
2015-07-20 12:18:40 -04:00
Joram Wilander
6a229964c7 Merge pull request #204 from nickago/MM-1519
MM-1519 Even on error, submission stops, updated to relect that
2015-07-20 12:17:48 -04:00
Joram Wilander
1c06c3fa09 Merge pull request #209 from mattermost/mm-831
fixes mm-831 post timestamps now update
2015-07-20 11:53:30 -04:00
hmhealey
74ff46bb98 Changed Makefile to restart existing mysql/redis containers if they've been stopped 2015-07-20 09:52:25 -04:00
JoramWilander
5e27bb3e61 fixes mm-831 post timestamps now update 2015-07-20 08:58:18 -04:00
Joram Wilander
a1876cf6cc Merge pull request #208 from nickago/MM-1079
MM-1079 Removed remenant of non-hover system
2015-07-20 07:51:36 -04:00
Reed Garmsen
12c19e3390 Added channel name to RHS comment threads; minor css changes to compensate for addition 2015-07-19 20:31:37 -07:00
nickago
196ae3227e Removed remenant of non-hover system 2015-07-18 16:51:24 -07:00
hmhealey
d0e4d71ac3 Fixed the labels on the mention list for users without their first/last name configured 2015-07-18 16:32:22 -04:00
=Corey Hulen
876ad10f6f Fixes javascript console errors 2015-07-17 15:41:55 -08:00
Corey Hulen
d65f199e12 Merge pull request #185 from mattermost/mm-1348
fixes mm-1348 removing dependency on redis
2015-07-17 14:45:50 -08:00
Corey Hulen
f132978735 Merge pull request #192 from nickago/MM-1079
MM-1079 Changed hover effect for menu
2015-07-17 14:09:59 -08:00
Corey Hulen
b306ec8437 Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
2015-07-17 14:01:01 -08:00
it33
66c22d342f Merge pull request #202 from mattermost/readme-update-mm-1356
Modifications to readme for mm-1356
2015-07-17 13:28:52 -07:00
hmhealey
1dba330146 Use a user's full name as their display name if a nickname hasn't been specified 2015-07-17 15:22:57 -04:00
hmhealey
098cbcdc21 Unify all locations where we determine a user's display named based off of their nickname/username into a helper function 2015-07-17 15:22:57 -04:00
hmhealey
abcb44089c Add tests to check if a User's first/last name are valid 2015-07-17 15:22:57 -04:00