Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #392 from hmhealey/typingfix | Joram Wilander | 2015-08-18 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Fixed 'X is typing...' messages being malformed when sent to the server | |||||
| * | | Fixed 'X is typing...' messages being malformed when sent to the server | hmhealey | 2015-08-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #380 from mattermost/mm-319 | Christopher Speller | 2015-08-18 | 15 | -521/+941 | |
|\ \ | | | | | | | MM-319 adding pending post functionality to the client | |||||
| * | | reformat post_list.jsx to match style guide more closely | JoramWilander | 2015-08-18 | 1 | -185/+227 | |
| | | | ||||||
| * | | reformatted post_right to match style guide more closely | JoramWilander | 2015-08-18 | 1 | -55/+61 | |
| | | | ||||||
| * | | reformat post_body.jsx to match style guide more closely | JoramWilander | 2015-08-18 | 1 | -18/+18 | |
| | | | ||||||
| * | | fix minor issues caused by rebase | JoramWilander | 2015-08-18 | 1 | -7/+11 | |
| | | | ||||||
| * | | reformatting and minor refactoring of post_*.jsx to match style guide | JoramWilander | 2015-08-18 | 3 | -38/+62 | |
| | | | ||||||
| * | | removed unused post store function | JoramWilander | 2015-08-18 | 1 | -14/+0 | |
| | | | ||||||
| * | | MM-319 - Minor ui changes | Asaad Mahmood | 2015-08-18 | 3 | -20/+17 | |
| | | | ||||||
| * | | add received post action on successful post/comment retry | JoramWilander | 2015-08-18 | 2 | -0/+10 | |
| | | | ||||||
| * | | minor bug fixes to pending posts | JoramWilander | 2015-08-18 | 2 | -1/+2 | |
| | | | ||||||
| * | | finalize implenetation of predictive client posts so that users get ↵ | JoramWilander | 2015-08-18 | 13 | -270/+374 | |
| | | | | | | | | | | | | immediate feedback after posting | |||||
| * | | update formatting in post_store | JoramWilander | 2015-08-18 | 1 | -28/+40 | |
| | | | ||||||
| * | | added client predictive commenting | JoramWilander | 2015-08-18 | 4 | -17/+97 | |
| | | | ||||||
| * | | adds predictive posting on the client | JoramWilander | 2015-08-18 | 8 | -36/+190 | |
|/ / | ||||||
* | | Merge pull request #391 from asaadmahmoodspin/master | Christopher Speller | 2015-08-18 | 10 | -14/+41 | |
|\ \ | | | | | | | Multiple UI changes | |||||
| * | | Multiple UI changes | Asaad Mahmood | 2015-08-18 | 10 | -14/+41 | |
| | | | ||||||
* | | | Merge pull request #385 from mattermost/mm-1623 | Christopher Speller | 2015-08-18 | 4 | -5/+57 | |
|\ \ \ | | | | | | | | | MM-1623 when user roles are updated, the relevant session roles are updated as well | |||||
| * | | | when user roles are updated, the relevant session roles are updated as well | JoramWilander | 2015-08-17 | 4 | -5/+57 | |
| | | | | ||||||
* | | | | Merge pull request #381 from mattermost/mm-1705 | Christopher Speller | 2015-08-18 | 17 | -170/+335 | |
|\ \ \ \ | | | | | | | | | | | MM-1705 add google as an oauth single-sign-on service | |||||
| * | | | | merge async_client getMe changes | JoramWilander | 2015-08-14 | 1 | -6/+6 | |
| | | | | | ||||||
| * | | | | reformat login.jsx to meet style guide | JoramWilander | 2015-08-14 | 1 | -48/+54 | |
| | | | | | ||||||
| * | | | | turn off google SSO by default and remove test google oauth credentials | JoramWilander | 2015-08-14 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | incorporate asaad's UI updates for google sign-up | JoramWilander | 2015-08-14 | 3 | -1/+18 | |
| | | | | | ||||||
| * | | | | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 11 | -81/+136 | |
| | | | | | ||||||
| * | | | | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 7 | -59/+146 | |
| | | | | | ||||||
* | | | | | Merge pull request #378 from rgarmsen2295/mm-316c | Christopher Speller | 2015-08-18 | 16 | -31/+325 | |
|\ \ \ \ \ | | | | | | | | | | | | | 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 code | Reed Garmsen | 2015-08-14 | 5 | -21/+9 | |
| | | | | | | ||||||
| * | | | | | Minor cosmetic refactoring of file_upload.jsx | Reed Garmsen | 2015-08-13 | 1 | -12/+14 | |
| | | | | | | ||||||
| * | | | | | Minor refactoring for better maintainibility | Reed Garmsen | 2015-08-13 | 3 | -8/+16 | |
| | | | | | | ||||||
| * | | | | | Better error checking along with other fixes | Reed Garmsen | 2015-08-13 | 4 | -29/+36 | |
| | | | | | | ||||||
| * | | | | | Changed location of file upload overlay | Reed Garmsen | 2015-08-13 | 4 | -13/+28 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #7 from asaadmahmoodspin/mm-316 | Reed Garmsen | 2015-08-13 | 14 | -36/+327 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | MM-316 | |||||
| | * | | | | | Updating UI to cover RHS and the centre channel separately | Asaad Mahmood | 2015-08-13 | 4 | -5/+6 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-316 | Asaad Mahmood | 2015-08-13 | 1 | -19/+36 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | 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 #352 from nickago/MM-1092 | Joram Wilander | 2015-08-18 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Mm 1092 Renders scrolling in firefox every time for the more channels modal | |||||
| * | | | | | | | | Moved controlling CSS into post list so it always shows up | nickago | 2015-08-17 | 2 | -6/+7 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #374 from nickago/MM-1299 | Joram Wilander | 2015-08-18 | 3 | -9/+30 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MM-1299 Fixes problem of two notification sounds in firefox |