summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #395 from mattermost/merge-fixJoram Wilander2015-08-181-6/+0
|\ | | | | Fix a bad merge that had edited posts being handled sloppily.
| * Fix a bad merge that had edited posts being handled sloppily.JoramWilander2015-08-181-6/+0
| |
* | Merge pull request #375 from nickago/MM-1777Christopher Speller2015-08-182-2/+6
|\ \ | | | | | | MM-1777 Formatted comments' time in RHS similar to root
| * | Formatted comments' time in RHS similar to rootnickago2015-08-182-2/+6
| | |
* | | Merge pull request #390 from rgarmsen2295/mm-1802Corey Hulen2015-08-182-152/+169
|\ \ \ | | | | | | | | MM-1802 Clicking on a PM channel name in mobile view now opens the channel menu
| * | | Clicking on a PM channel name in mobile view now opens the channel menu ↵Reed Garmsen2015-08-171-16/+14
| | | | | | | | | | | | | | | | (like desktop mode)
| * | | Refactored the NotifyCounts component out of the navbar.jsx file into its ↵Reed Garmsen2015-08-172-44/+50
| | | | | | | | | | | | | | | | own file
| * | | Initial prepatory cosmetic reformatting of navbar.jsxReed Garmsen2015-08-171-116/+129
| | | |
* | | | Merge pull request #389 from nickago/MM-1799Joram Wilander2015-08-181-1/+5
|\ \ \ \ | |_|/ / |/| | | MM-1799 Changed wording of get link modal
| * | | Changed wording of get link modalnickago2015-08-171-1/+5
| |/ /
* | / Fixed 'X is typing...' messages being malformed when sent to the serverhmhealey2015-08-181-1/+1
| |/ |/|
* | reformat post_list.jsx to match style guide more closelyJoramWilander2015-08-181-185/+227
| |
* | reformatted post_right to match style guide more closelyJoramWilander2015-08-181-55/+61
| |
* | reformat post_body.jsx to match style guide more closelyJoramWilander2015-08-181-18/+18
| |
* | fix minor issues caused by rebaseJoramWilander2015-08-181-7/+11
| |
* | reformatting and minor refactoring of post_*.jsx to match style guideJoramWilander2015-08-183-38/+62
| |
* | removed unused post store functionJoramWilander2015-08-181-14/+0
| |
* | MM-319 - Minor ui changesAsaad Mahmood2015-08-182-2/+2
| |
* | add received post action on successful post/comment retryJoramWilander2015-08-182-0/+10
| |
* | minor bug fixes to pending postsJoramWilander2015-08-182-1/+2
| |
* | finalize implenetation of predictive client posts so that users get ↵JoramWilander2015-08-1813-270/+374
| | | | | | | | immediate feedback after posting
* | update formatting in post_storeJoramWilander2015-08-181-28/+40
| |
* | added client predictive commentingJoramWilander2015-08-184-17/+97
| |
* | adds predictive posting on the clientJoramWilander2015-08-186-21/+156
| |
* | Merge pull request #391 from asaadmahmoodspin/masterChristopher Speller2015-08-184-2/+19
|\ \ | | | | | | Multiple UI changes
| * | Multiple UI changesAsaad Mahmood2015-08-184-2/+19
| | |
* | | Merge pull request #381 from mattermost/mm-1705Christopher Speller2015-08-188-60/+116
|\ \ \ | | | | | | | | MM-1705 add google as an oauth single-sign-on service
| * | | merge async_client getMe changesJoramWilander2015-08-141-6/+6
| | | |
| * | | reformat login.jsx to meet style guideJoramWilander2015-08-141-48/+54
| | | |
| * | | incorporate asaad's UI updates for google sign-upJoramWilander2015-08-141-1/+1
| | | |
| * | | added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-148-25/+75
| | | |
* | | | Merge pull request #378 from rgarmsen2295/mm-316cChristopher Speller2015-08-186-24/+157
|\ \ \ \ | | | | | | | | | | MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
| * | | | Small changes to css to clean up codeReed Garmsen2015-08-143-14/+8
| | | | |
| * | | | 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-133-13/+27
| | | | |
| * | | | Updating UI to cover RHS and the centre channel separatelyAsaad Mahmood2015-08-132-2/+2
| | | | |
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-316Asaad Mahmood2015-08-131-19/+36
| |\ \ \ \
| * | | | | UI Upgrades to file overlay for uploadsAsaad Mahmood2015-08-132-5/+9
| | | | | |
| * | | | | Merge pull request #5 from rgarmsen2295/mm-316asaadmahmoodspin2015-08-135-10/+114
| |\ \ \ \ \ | | | | | | | | | | | | | | 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 Garmsen2015-08-123-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the dropzones and help pic/text
| | * | | | | 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 ↵Reed Garmsen2015-08-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | opening the RHS and then switching channels
| | * | | | | Added check to make sure files are not stringsReed Garmsen2015-08-123-13/+8
| | | | | | |
| | * | | | | Switched to using the jquery-dragster library to implement more consistent ↵Reed Garmsen2015-08-121-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | drag and drop support, rather than using the inconsistent html5 implementation
| | * | | | | Changed structure to keep code contained to file_upload.jsxReed Garmsen2015-08-123-22/+16
| | | | | | |
| | * | | | | Working on adding overlays for file drag and dropReed Garmsen2015-08-123-15/+25
| | | | | | |
| | * | | | | Users can now drop files into the center pane or the rhs respectively to ↵Reed Garmsen2015-08-124-47/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | upload images and other files
| | * | | | | Added handlers for dragging and dropping files onto the center pane or RHSReed Garmsen2015-08-122-0/+44
| | | | | | |