summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Reed Garmsen2015-08-126-26/+172
| | | | drag and drop support, rather than using the inconsistent html5 implementation
* 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 ↵Reed Garmsen2015-08-125-54/+79
| | | | upload images and other files
* Added handlers for dragging and dropping files onto the center pane or RHSReed Garmsen2015-08-122-0/+44
|
* Merge pull request #373 from nickago/MM-1868Joram Wilander2015-08-121-1/+1
|\ | | | | MM-1868 Changed wording for broader definition of what is previewed
| * 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
|\ \ | | | | | | MM-1184 Updating dockerfiles for latest master and osx
| * | Updating dockerfiles to allow for previewing of latest master and fixing ↵Christopher Speller2015-08-117-9/+317
| | | | | | | | | | | | local docker build so it works on osx
* | | Merge pull request #363 from mattermost/travis-s3-deployJoram Wilander2015-08-121-7/+22
|\ \ \ | |_|/ |/| | Adding S3 deployment to travis ci
| * | Adding S3 deployment to travis ciChristopher Speller2015-08-101-7/+22
| | |
* | | Merge pull request #366 from nickago/MM-1914Joram Wilander2015-08-121-1/+1
|\ \ \ | | | | | | | | MM-1914 Fixed typo
| * | | Fixed typonickago2015-08-111-1/+1
|/ / /
* | | Merge pull request #359 from hmhealey/mm1770Christopher Speller2015-08-119-288/+405
|\ \ \ | | | | | | | | MM-1770 Add the ability to cancel in-progress file uploads
| * | | Changed PostStore.getDraft/getCommentDraft to return an empty draft instead ↵hmhealey2015-08-113-95/+15
| | | | | | | | | | | | | | | | of null when no draft is found
| * | | Formatted CreateComment, CreatePost, and FileUpload React components to ↵hmhealey2015-08-103-150/+208
| | | | | | | | | | | | | | | | match the style guide
| * | | 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 ↵hmhealey2015-08-107-58/+79
| | | | | | | | | | | | | | | | fix issues with duplicate file names
| * | | 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 ↵hmhealey2015-08-105-105/+131
| | | | | | | | | | | | | | | | instead of just a count
* | | | Merge pull request #354 from nickago/MM-1598Christopher Speller2015-08-111-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 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
|\ \ \ \ \ | | | | | | | | | | | | MM-401 Add indicators to the sidebar for offscreen unread channels
| * | | | | Added handlers for the sidebar to update unread message indicators on page ↵hmhealey2015-08-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | resize
| * | | | | Changed sidebar scroll handler to use React's onScrollhmhealey2015-08-071-5/+1
| | | | | |
| * | | | | Removed ternary statements from sidebarhmhealey2015-08-061-7/+26
| | | | | |
| * | | | | Added indicators for when a channel with unread posts is offscreenhmhealey2015-08-062-4/+34
| | | | | |
| * | | | | Added the ability for the sidebar to determine whether or not there's any ↵hmhealey2015-08-061-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | unread channels offscreen
| * | | | | Refactored sidebar in preparation for adding unread indicatorshmhealey2015-08-061-78/+67
| |/ / / /
* | | | | Merge pull request #350 from nickago/MM-1684Christopher Speller2015-08-116-238/+234
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM-1684 Refactored code to remove errors on startup
| * | | | Removed unnecessary keysnickago2015-08-101-7/+7
| | | | |
| * | | | Removed vestigial arguements from refactored codenickago2015-08-071-2/+2
| | | | |
| * | | | Cosmetic refactors, including variable name changes and splitting if statementsnickago2015-08-062-39/+53
| | | | |
| * | | | fixed the spacing on UserStorenickago2015-08-061-220/+220
| | | | |
| * | | | Added keys to array-based elements and made getMe asynchronousnickago2015-08-066-34/+16
| |/ / /
* | | | Merge pull request #364 from mattermost/release-0.6.0Christopher Speller2015-08-112-2/+2
|\ \ \ \ | |_|/ / |/| | | Merge release back into master.
| * | | Updating Dockerfile and Dockerrun.aws.json to point at releaseChristopher Speller2015-08-052-2/+2
| | | |
* | | | Merge pull request #348 from nickago/MM-1550Christopher Speller2015-08-103-299/+233
|\ \ \ \ | |_|_|/ |/| | | Mm 1550 Mentions are no longer removed from auto complete once used
| * | | further cosmetic refactoringnickago2015-08-101-67/+65
| | | |
| * | | Removed vetigial argument and properly aligned post_storenickago2015-08-101-176/+176
| | | |
| * | | Added cosmetic refactoringnickago2015-08-051-46/+49
| | | |
| * | | Removed all functionality required for removing used mentions from auto-completenickago2015-08-053-76/+9
| | | |
* | | | Merge pull request #356 from nickago/MM-1646Christopher Speller2015-08-101-1/+1
|\ \ \ \ | | | | | | | | | | MM-1646 Fixed typo in channel/group naming
| * | | | Fixed typo in channel/group namingnickago2015-08-071-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #351 from rgarmsen2295/mm-1759Christopher Speller2015-08-102-32/+45
|\ \ \ \ | | | | | | | | | | MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10
| * | | | Cosmetic refactoringReed Garmsen2015-08-061-31/+43
| | | | |