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

1506 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
596e76d404 Fixed issue with uploading files from RHS when trying to upload after opening the RHS and then switching channels 2015-08-12 12:34:08 -07:00
Reed Garmsen
6f091f0f6d Added check to make sure files are not strings 2015-08-12 12:29:57 -07:00
Reed Garmsen
9f9d93e613 Switched to using the jquery-dragster library to implement more consistent drag and drop support, rather than using the inconsistent html5 implementation 2015-08-12 12:29:57 -07:00
Reed Garmsen
9baafdb372 Changed structure to keep code contained to file_upload.jsx 2015-08-12 12:29:57 -07:00
Reed Garmsen
81d7599f75 Working on adding overlays for file drag and drop 2015-08-12 12:29:57 -07:00
Reed Garmsen
1fa436b4f9 Users can now drop files into the center pane or the rhs respectively to upload images and other files 2015-08-12 12:29:57 -07:00
Reed Garmsen
9bbeef208f Added handlers for dragging and dropping files onto the center pane or RHS 2015-08-12 12:24:22 -07:00
Joram Wilander
eb3ca46982 Merge pull request #373 from nickago/MM-1868
MM-1868 Changed wording for broader definition of what is previewed
2015-08-12 15:21:58 -04:00
nickago
d7c07d07d0 Changed Image to File since we preview files 2015-08-12 10:57:16 -07:00
Joram Wilander
95e6626f9f Merge pull request #367 from mattermost/mm-1884
MM-1184 Updating dockerfiles for latest master and osx
2015-08-12 13:31:29 -04:00
Joram Wilander
af17764561 Merge pull request #363 from mattermost/travis-s3-deploy
Adding S3 deployment to travis ci
2015-08-12 13:31:11 -04:00
Joram Wilander
b50ba05626 Merge pull request #366 from nickago/MM-1914
MM-1914 Fixed typo
2015-08-12 11:19:35 -04:00
Christopher Speller
083433dc0f Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx 2015-08-11 14:07:35 -04:00
nickago
8633c477c8 Fixed typo 2015-08-11 10:54:29 -07:00
Christopher Speller
4c7cdb20f0 Merge pull request #359 from hmhealey/mm1770
MM-1770 Add the ability to cancel in-progress file uploads
2015-08-11 12:08:08 -04:00
Christopher Speller
d72d356cbc Merge pull request #354 from nickago/MM-1598
MM-1598 Left and right arrow keys now scroll through pictures/files in preview mode
2015-08-11 12:06:28 -04:00
Christopher Speller
a386bb9293 Merge pull request #353 from hmhealey/mm401
MM-401 Add indicators to the sidebar for offscreen unread channels
2015-08-11 12:05:46 -04:00
Christopher Speller
bffc37be13 Merge pull request #350 from nickago/MM-1684
MM-1684 Refactored code to remove errors on startup
2015-08-11 12:05:20 -04:00
hmhealey
17b05f705f Changed PostStore.getDraft/getCommentDraft to return an empty draft instead of null when no draft is found 2015-08-11 09:41:18 -04:00
Christopher Speller
6a333f2018 Merge pull request #364 from mattermost/release-0.6.0
Merge release back into master.
2015-08-11 09:29:32 -04:00
nickago
66056ad36d Added event to window scope so react can autobind 2015-08-10 11:24:32 -07:00
hmhealey
6ec1b7a8b3 Formatted CreateComment, CreatePost, and FileUpload React components to match the style guide 2015-08-10 14:04:23 -04:00
hmhealey
96ad8cb114 Changed file upload components to properly remove previews for failed uploads 2015-08-10 14:04:23 -04:00
hmhealey
c9a1bf2d33 Changed post drafts to maintain a store a unique id for each file upload to fix issues with duplicate file names 2015-08-10 14:04:23 -04:00
hmhealey
4b74c873cc Added the ability to cancel file uploads on comments 2015-08-10 14:04:23 -04:00
hmhealey
4e8af44370 Added the ability to cancel file uploads on posts 2015-08-10 14:04:23 -04:00
hmhealey
20d755f3dd Changed post drafts to maintain a list of the names of uploading files instead of just a count 2015-08-10 14:04:22 -04:00
nickago
8297f99209 Removed unnecessary keys 2015-08-10 10:52:51 -07:00
Christopher Speller
e1009fa7fb Merge pull request #348 from nickago/MM-1550
Mm 1550 Mentions are no longer removed from auto complete once used
2015-08-10 12:31:51 -04:00
nickago
96fc2a4552 further cosmetic refactoring 2015-08-10 09:07:44 -07:00
nickago
1e40abbdea Removed vetigial argument and properly aligned post_store 2015-08-10 08:31:55 -07:00
Christopher Speller
e03864f03c Adding S3 deployment to travis ci 2015-08-10 11:05:14 -04:00
Christopher Speller
6eb76a7cc3 Merge pull request #356 from nickago/MM-1646
MM-1646 Fixed typo in channel/group naming
2015-08-10 09:38:46 -04:00
Christopher Speller
c5944c9648 Merge pull request #351 from rgarmsen2295/mm-1759
MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10
2015-08-10 09:12:22 -04:00
nickago
fe674339dc Fixed typo in channel/group naming 2015-08-07 08:38:57 -07:00
Harrison Healey
51174ac92f Merge pull request #349 from mattermost/makefile-redis-remove
Removing redis from makefile
2015-08-07 11:07:10 -04:00
Harrison Healey
bf1537ac13 Merge pull request #347 from mattermost/it33-patch-1
MM-1898 Updates to Mac OSX instructions
2015-08-07 11:06:39 -04:00
Harrison Healey
b71e1ccf45 Merge pull request #341 from rgarmsen2295/mm-1643
MM-1643 Errors displayed on the "change password" screen are now cleared when the user hits cancel
2015-08-07 11:05:06 -04:00
hmhealey
72e5d441ff Added handlers for the sidebar to update unread message indicators on page resize 2015-08-07 10:58:03 -04:00
nickago
ae744dcb53 Removed vestigial arguements from refactored code 2015-08-07 07:54:53 -07:00
hmhealey
5b831e78a7 Changed sidebar scroll handler to use React's onScroll 2015-08-07 10:54:13 -04:00
nickago
b398819198 Added cosmetic refactoring 2015-08-06 16:28:29 -07:00
hmhealey
02eabee792 Removed ternary statements from sidebar 2015-08-06 19:07:51 -04:00
hmhealey
34f7451c4a Added indicators for when a channel with unread posts is offscreen 2015-08-06 18:57:57 -04:00
nickago
29e405aad6 Left and right arrows now scroll through files 2015-08-06 15:50:37 -07:00
Reed Garmsen
dd39a53208 Cosmetic refactoring 2015-08-06 14:14:10 -07:00
hmhealey
38e2b69dba Added the ability for the sidebar to determine whether or not there's any unread channels offscreen 2015-08-06 16:28:43 -04:00
nickago
e72d6e6d24 Cosmetic refactors, including variable name changes and splitting if statements 2015-08-06 11:47:52 -07:00
nickago
24b6c6587c fixed the spacing on UserStore 2015-08-06 11:44:13 -07:00
nickago
3815ab8065 Added keys to array-based elements and made getMe asynchronous 2015-08-06 11:44:13 -07:00