| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | UI Upgrades to file overlay for uploads | Asaad Mahmood | 2015-08-13 | 5 | -48/+45 |
| | | |||||
| * | Merge pull request #5 from rgarmsen2295/mm-316 | asaadmahmoodspin | 2015-08-13 | 12 | -17/+293 |
| |\ | | | | | MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them | ||||
| | * | Implements better markup for css changes to be made, including an overlay of ↵ | Reed Garmsen | 2015-08-12 | 7 | -43/+73 |
| | | | | | | | | | the dropzones and help pic/text | ||||
| | * | Updated feature to work with new upload cancel logic | Reed Garmsen | 2015-08-12 | 1 | -7/+32 |
| | | | |||||
| | * | Fixed issue with uploading files from RHS when trying to upload after ↵ | Reed Garmsen | 2015-08-12 | 1 | -3/+2 |
| | | | | | | | | | opening the RHS and then switching channels | ||||
| | * | Added check to make sure files are not strings | Reed Garmsen | 2015-08-12 | 5 | -22/+8 |
| | | | |||||
| | * | Switched to using the jquery-dragster library to implement more consistent ↵ | Reed Garmsen | 2015-08-12 | 6 | -26/+172 |
| | | | | | | | | | drag and drop support, rather than using the inconsistent html5 implementation | ||||
| | * | Changed structure to keep code contained to file_upload.jsx | Reed Garmsen | 2015-08-12 | 5 | -28/+28 |
| | | | |||||
| | * | Working on adding overlays for file drag and drop | Reed Garmsen | 2015-08-12 | 5 | -15/+36 |
| | | | |||||
| | * | Users can now drop files into the center pane or the rhs respectively to ↵ | Reed Garmsen | 2015-08-12 | 5 | -54/+79 |
| | | | | | | | | | upload images and other files | ||||
| | * | Added handlers for dragging and dropping files onto the center pane or RHS | Reed Garmsen | 2015-08-12 | 2 | -0/+44 |
| | | | |||||
| * | | Merge pull request #368 from nickago/MM-1911 | Harrison Healey | 2015-08-12 | 3 | -19/+20 |
| |\ \ | |/ |/| | MM 1911 Added support for .jpeg in addition to .jpg | ||||
| | * | Fixed typo | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | |||||
| | * | Cosmetic refactoring | nickago | 2015-08-11 | 1 | -10/+17 |
| | | | |||||
| | * | Added server side validation of jpegs as images | nickago | 2015-08-11 | 2 | -8/+2 |
| | | | |||||
| | * | Added jpeg's to list of image types | nickago | 2015-08-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #373 from nickago/MM-1868 | Joram Wilander | 2015-08-12 | 1 | -1/+1 |
| |\ \ | | | | | | | MM-1868 Changed wording for broader definition of what is previewed | ||||
| | * | | Changed Image to File since we preview files | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #367 from mattermost/mm-1884 | Joram Wilander | 2015-08-12 | 7 | -9/+317 |
| |\ \ \ | | | | | | | | | MM-1184 Updating dockerfiles for latest master and osx | ||||
| | * | | | Updating dockerfiles to allow for previewing of latest master and fixing ↵ | Christopher Speller | 2015-08-11 | 7 | -9/+317 |
| | | | | | | | | | | | | | | | | | local docker build so it works on osx | ||||
| * | | | | Merge pull request #363 from mattermost/travis-s3-deploy | Joram Wilander | 2015-08-12 | 1 | -7/+22 |
| |\ \ \ \ | |_|/ / |/| | | | Adding S3 deployment to travis ci | ||||
| | * | | | Adding S3 deployment to travis ci | Christopher Speller | 2015-08-10 | 1 | -7/+22 |
| | | | | | |||||
| * | | | | Merge pull request #366 from nickago/MM-1914 | Joram Wilander | 2015-08-12 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | MM-1914 Fixed typo | ||||
| | * | | | Fixed typo | nickago | 2015-08-11 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #359 from hmhealey/mm1770 | Christopher Speller | 2015-08-11 | 9 | -288/+405 |
| |\ \ \ | | | | | | | | | MM-1770 Add the ability to cancel in-progress file uploads | ||||
| | * | | | Changed PostStore.getDraft/getCommentDraft to return an empty draft instead ↵ | hmhealey | 2015-08-11 | 3 | -95/+15 |
| | | | | | | | | | | | | | | | | | of null when no draft is found | ||||
| | * | | | Formatted CreateComment, CreatePost, and FileUpload React components to ↵ | hmhealey | 2015-08-10 | 3 | -150/+208 |
| | | | | | | | | | | | | | | | | | match the style guide | ||||
| | * | | | Changed file upload components to properly remove previews for failed uploads | hmhealey | 2015-08-10 | 3 | -6/+36 |
| | | | | | |||||
| | * | | | Changed post drafts to maintain a store a unique id for each file upload to ↵ | hmhealey | 2015-08-10 | 7 | -58/+79 |
| | | | | | | | | | | | | | | | | | fix issues with duplicate file names | ||||
| | * | | | Added the ability to cancel file uploads on comments | hmhealey | 2015-08-10 | 1 | -5/+15 |
| | | | | | |||||
| | * | | | Added the ability to cancel file uploads on posts | hmhealey | 2015-08-10 | 4 | -10/+62 |
| | | | | | |||||
| | * | | | Changed post drafts to maintain a list of the names of uploading files ↵ | hmhealey | 2015-08-10 | 5 | -105/+131 |
| | | | | | | | | | | | | | | | | | instead of just a count | ||||
| * | | | | Merge pull request #354 from nickago/MM-1598 | Christopher Speller | 2015-08-11 | 1 | -99/+124 |
| |\ \ \ \ | | | | | | | | | | | MM-1598 Left and right arrow keys now scroll through pictures/files in preview mode | ||||
| | * | | | | Added event to window scope so react can autobind | nickago | 2015-08-10 | 1 | -10/+11 |
| | | | | | | |||||
| | * | | | | Added cosmetic refactoring | nickago | 2015-08-06 | 1 | -100/+113 |
| | | | | | | |||||
| | * | | | | Left and right arrows now scroll through files | nickago | 2015-08-06 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Merge pull request #353 from hmhealey/mm401 | Christopher Speller | 2015-08-11 | 2 | -80/+159 |
| |\ \ \ \ \ | | | | | | | | | | | | | MM-401 Add indicators to the sidebar for offscreen unread channels | ||||
| | * | | | | | Added handlers for the sidebar to update unread message indicators on page ↵ | hmhealey | 2015-08-07 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | resize | ||||
| | * | | | | | Changed sidebar scroll handler to use React's onScroll | hmhealey | 2015-08-07 | 1 | -5/+1 |
| | | | | | | | |||||
| | * | | | | | Removed ternary statements from sidebar | hmhealey | 2015-08-06 | 1 | -7/+26 |
| | | | | | | | |||||
| | * | | | | | Added indicators for when a channel with unread posts is offscreen | hmhealey | 2015-08-06 | 2 | -4/+34 |
| | | | | | | | |||||
| | * | | | | | Added the ability for the sidebar to determine whether or not there's any ↵ | hmhealey | 2015-08-06 | 1 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | unread channels offscreen | ||||
| | * | | | | | Refactored sidebar in preparation for adding unread indicators | hmhealey | 2015-08-06 | 1 | -78/+67 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #350 from nickago/MM-1684 | Christopher Speller | 2015-08-11 | 6 | -238/+234 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | MM-1684 Refactored code to remove errors on startup | ||||
| | * | | | | Removed unnecessary keys | nickago | 2015-08-10 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | Removed vestigial arguements from refactored code | nickago | 2015-08-07 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Cosmetic refactors, including variable name changes and splitting if statements | nickago | 2015-08-06 | 2 | -39/+53 |
| | | | | | | |||||
| | * | | | | fixed the spacing on UserStore | nickago | 2015-08-06 | 1 | -220/+220 |
| | | | | | | |||||
| | * | | | | Added keys to array-based elements and made getMe asynchronous | nickago | 2015-08-06 | 6 | -34/+16 |
| | |/ / / | |||||
| * | | | | Merge pull request #364 from mattermost/release-0.6.0 | Christopher Speller | 2015-08-11 | 2 | -2/+2 |
| |\ \ \ \ | |_|/ / |/| | | | Merge release back into master. | ||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |