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

1113 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
4ae03d3ee7 adding godep restore to travis 2015-07-22 11:26:41 -08:00
Corey Hulen
33c32be69b Merge pull request #229 from rgarmsen2295/mm-1626
MM-1626 Changes the subject line for emails sent regarding notifications
2015-07-22 11:07:13 -08:00
Corey Hulen
3d1920e83e Merge pull request #219 from nickago/scrollBug
Fixes RHS scrolling into whitespace on new comment open
2015-07-22 10:46:12 -08:00
Corey Hulen
beffcc0a3c Merge pull request #201 from hmhealey/mm1539
MM-1539 Added the ability to reply to earlier message threads by starting a post with ^
2015-07-22 10:45:57 -08:00
Corey Hulen
62d7c92651 Merge pull request #236 from mattermost/it33-patch-1
Update to latest community URLs
2015-07-22 10:44:47 -08:00
Corey Hulen
c6a82b8d3f Merge pull request #235 from rgarmsen2295/mm-1596
MM-1596 While in mobile mode notifications are no longer counted for channels set to 'quiet mode' that are not direct mentions
2015-07-22 10:44:06 -08:00
Corey Hulen
3fca3b93f5 Merge pull request #234 from asaadmahmoodspin/master
Profile pic changes in LHS Header
2015-07-22 10:43:16 -08:00
Corey Hulen
36d0e7c8d3 Merge pull request #233 from asaadmahmoodspin/mm-1616
Adding back Access History and Active Devices
2015-07-22 10:42:27 -08:00
it33
dd172319b4 Update to latest community URLs 2015-07-22 11:35:56 -07:00
Asaad Mahmood
06c278328a Improving formatting for Channel Intro 2015-07-22 22:25:27 +05:00
Reed Garmsen
8b158bf2cf While in mobile mode notifications are no longer counted for channels set to 'quiet mode' that are not direct mentions. 2015-07-22 09:13:51 -07:00
Asaad Mahmood
78666f04d0 Adjusting scroll in RHS to not show whitespace 2015-07-22 21:10:00 +05:00
Asaad Mahmood
fe0291a025 Profile pic changes in LHS Header
Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic.
2015-07-22 20:38:40 +05:00
Joram Wilander
9dc1f46d6e Merge pull request #232 from mattermost/post-list-null
Small fix for a null TypeError in post_list updating code
2015-07-22 11:18:39 -04:00
Reed Garmsen
b3b0133930 Adding back Access History and Active Devices 2015-07-22 20:11:40 +05:00
Christopher Speller
03cd1cc7d6 Small patch for a null TypeError in post_list updating code 2015-07-22 09:51:42 -04:00
Christopher Speller
eb7c08ab00 Merge pull request #231 from mattermost/file-fixes
More patches for files
2015-07-22 08:54:54 -04:00
Christopher Speller
495a9d7be5 Merge pull request #230 from mattermost/download-link-fix
fixed download link in image viewer
2015-07-22 08:37:36 -04:00
Christopher Speller
2384951a4c Merge pull request #224 from hmhealey/mm1625
MM-1625 Correct the appearance of the post menu on both desktop and mobile
2015-07-22 08:33:59 -04:00
JoramWilander
2182953be5 fix the ability to remove file previews once uploaded 2015-07-22 08:01:10 -04:00
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
JoramWilander
d58398708e fixed download link in image viewer 2015-07-21 23:34:20 -04:00
Reed Garmsen
aa99a3443a Changed the subject line for emails sent regarding mentions and other team notifications. This is meant to prevent notification emails from different teams from combining into a single email thread 2015-07-21 19:01:07 -07: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
hmhealey
b7d523f97d Changed post menu label to be ... and to make it visible at all times on small screens (ie mobile devices) 2015-07-21 17:38:51 -04:00
hmhealey
bd4fd876a8 Changed post menu label to just be [...] regardless of whether or not the user is hovering over it 2015-07-21 17:35:14 -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
hmhealey
0967a131a1 Prevent users from sending empty ^ reply messages 2015-07-21 16:01:30 -04:00