summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor cosmetic refactoring of file_upload.jsxReed Garmsen2015-08-131-12/+14
* Minor refactoring for better maintainibilityReed Garmsen2015-08-133-8/+16
* Better error checking along with other fixesReed Garmsen2015-08-134-29/+36
* Changed location of file upload overlayReed Garmsen2015-08-134-13/+28
* Merge pull request #7 from asaadmahmoodspin/mm-316Reed Garmsen2015-08-1314-36/+327
|\
| * Updating UI to cover RHS and the centre channel separatelyAsaad Mahmood2015-08-134-5/+6
| * Merge branch 'master' of https://github.com/mattermost/platform into mm-316Asaad Mahmood2015-08-131-19/+36
| |\
| | * Merge pull request #371 from nickago/MM-1229Joram Wilander2015-08-131-19/+36
| |/| |/| |
| | * Added cosmetic refactoringnickago2015-08-131-17/+23
| | * get public link now displays in the same window pane on mobile, but in a new ...nickago2015-08-111-3/+14
| * | UI Upgrades to file overlay for uploadsAsaad Mahmood2015-08-135-48/+45
| * | Merge pull request #5 from rgarmsen2295/mm-316asaadmahmoodspin2015-08-1312-17/+293
|/| |
| * | Implements better markup for css changes to be made, including an overlay of ...Reed Garmsen2015-08-127-43/+73
| * | Updated feature to work with new upload cancel logicReed Garmsen2015-08-121-7/+32
| * | Fixed issue with uploading files from RHS when trying to upload after opening...Reed Garmsen2015-08-121-3/+2
| * | Added check to make sure files are not stringsReed Garmsen2015-08-125-22/+8
| * | Switched to using the jquery-dragster library to implement more consistent dr...Reed Garmsen2015-08-126-26/+172
| * | Changed structure to keep code contained to file_upload.jsxReed Garmsen2015-08-125-28/+28
| * | Working on adding overlays for file drag and dropReed Garmsen2015-08-125-15/+36
| * | Users can now drop files into the center pane or the rhs respectively to uplo...Reed Garmsen2015-08-125-54/+79
| * | Added handlers for dragging and dropping files onto the center pane or RHSReed Garmsen2015-08-122-0/+44
* | | Merge pull request #368 from nickago/MM-1911Harrison Healey2015-08-123-19/+20
|\ \ \ | |/ / |/| |
| * | Fixed typonickago2015-08-121-1/+1
| * | Cosmetic refactoringnickago2015-08-111-10/+17
| * | Added server side validation of jpegs as imagesnickago2015-08-112-8/+2
| * | Added jpeg's to list of image typesnickago2015-08-111-1/+1
| |/
* | Merge pull request #373 from nickago/MM-1868Joram Wilander2015-08-121-1/+1
|\ \
| * | Changed Image to File since we preview filesnickago2015-08-121-1/+1
* | | Merge pull request #367 from mattermost/mm-1884Joram Wilander2015-08-127-9/+317
|\ \ \
| * | | Updating dockerfiles to allow for previewing of latest master and fixing loca...Christopher Speller2015-08-117-9/+317
* | | | Merge pull request #363 from mattermost/travis-s3-deployJoram Wilander2015-08-121-7/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Adding S3 deployment to travis ciChristopher Speller2015-08-101-7/+22
* | | | Merge pull request #366 from nickago/MM-1914Joram Wilander2015-08-121-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed typonickago2015-08-111-1/+1
|/ / /
* | | Merge pull request #359 from hmhealey/mm1770Christopher Speller2015-08-119-288/+405
|\ \ \
| * | | Changed PostStore.getDraft/getCommentDraft to return an empty draft instead o...hmhealey2015-08-113-95/+15
| * | | Formatted CreateComment, CreatePost, and FileUpload React components to match...hmhealey2015-08-103-150/+208
| * | | Changed file upload components to properly remove previews for failed uploadshmhealey2015-08-103-6/+36
| * | | Changed post drafts to maintain a store a unique id for each file upload to f...hmhealey2015-08-107-58/+79
| * | | Added the ability to cancel file uploads on commentshmhealey2015-08-101-5/+15
| * | | Added the ability to cancel file uploads on postshmhealey2015-08-104-10/+62
| * | | Changed post drafts to maintain a list of the names of uploading files instea...hmhealey2015-08-105-105/+131
* | | | Merge pull request #354 from nickago/MM-1598Christopher Speller2015-08-111-99/+124
|\ \ \ \
| * | | | Added event to window scope so react can autobindnickago2015-08-101-10/+11
| * | | | Added cosmetic refactoringnickago2015-08-061-100/+113
| * | | | Left and right arrows now scroll through filesnickago2015-08-061-0/+11
* | | | | Merge pull request #353 from hmhealey/mm401Christopher Speller2015-08-112-80/+159
|\ \ \ \ \
| * | | | | Added handlers for the sidebar to update unread message indicators on page re...hmhealey2015-08-071-0/+7
| * | | | | Changed sidebar scroll handler to use React's onScrollhmhealey2015-08-071-5/+1
| * | | | | Removed ternary statements from sidebarhmhealey2015-08-061-7/+26