| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | | | | | Added hardcoded firefox function | nickago | 2015-08-17 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | move browser check functionality into a method | nickago | 2015-08-14 | 2 | -2/+6 |
| | | | | | | | | |||||
| | * | | | | | | Cosmetic refactoring | nickago | 2015-08-13 | 1 | -5/+12 |
| | | | | | | | | |||||
| | * | | | | | | Refactored such that the menu doesn't open for firefox users | nickago | 2015-08-13 | 3 | -30/+23 |
| | | | | | | | | |||||
| | * | | | | | | Added extra uAgent check for weird browser implementations | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Handed control of notification sounds over to browser for firefox | nickago | 2015-08-12 | 2 | -18/+35 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #377 from nickago/MM-1894 | Joram Wilander | 2015-08-18 | 2 | -73/+81 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Mm 1894 Add state listening to the sidebar relative to the team store | ||||
| | * | | | | | | | Cosmetic refactoring | nickago | 2015-08-13 | 1 | -72/+74 |
| | | | | | | | | | |||||
| | * | | | | | | | Added flux-style error protection on team store call in sidebar | nickago | 2015-08-13 | 2 | -5/+11 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #388 from rgarmsen2295/mm-1785 | Corey Hulen | 2015-08-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | MM-1785 Fixed issue with login redirects not working on safari | ||||
| | * | | | | | | Fixed issue with redirects not working on safari | Reed Garmsen | 2015-08-17 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #386 from mattermost/revert-372-MM-1640 | Joram Wilander | 2015-08-17 | 4 | -254/+223 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" | ||||
| | * | | | | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" | Joram Wilander | 2015-08-17 | 4 | -254/+223 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #372 from nickago/MM-1640 | Christopher Speller | 2015-08-17 | 4 | -223/+254 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Mm 1640 Fixed odd scrolling issues on channel refresh | ||||
| | * | | | | | | cosmetic refactoring | nickago | 2015-08-14 | 1 | -153/+198 |
| | | | | | | | | |||||
| | * | | | | | | Changed timeout code to event based | nickago | 2015-08-14 | 1 | -2/+5 |
| | | | | | | | | |||||
| | * | | | | | | Added non-default reliant behavior to initial scroll on mount | nickago | 2015-08-12 | 1 | -1/+5 |
| | | | | | | | | |||||
| | * | | | | | | Removed usused variable | nickago | 2015-08-12 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Changed the default for update to hold your position in the list | nickago | 2015-08-12 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Removed personal debugging code and notes | nickago | 2015-08-12 | 4 | -11/+4 |
| | | | | | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |