Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | 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 | |
| |/| | | | | | | ||||||
| | * | | | | | | Implements better markup for css changes to be made, including an overlay of ... | Reed Garmsen | 2015-08-12 | 7 | -43/+73 | |
| | * | | | | | | 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 opening... | Reed Garmsen | 2015-08-12 | 1 | -3/+2 | |
| | * | | | | | | 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 dr... | Reed Garmsen | 2015-08-12 | 6 | -26/+172 | |
| | * | | | | | | 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 uplo... | Reed Garmsen | 2015-08-12 | 5 | -54/+79 | |
| | * | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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" | Joram Wilander | 2015-08-17 | 4 | -254/+223 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #372 from nickago/MM-1640 | Christopher Speller | 2015-08-17 | 4 | -223/+254 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
| * | | | | | | | Added case for window resize and cleaned up function | nickago | 2015-08-12 | 2 | -9/+23 | |
| * | | | | | | | Completely rehauled scrolling system, finished base implementation | nickago | 2015-08-12 | 5 | -94/+42 | |
| * | | | | | | | Filled out comments for post list | nickago | 2015-08-12 | 1 | -1/+1 | |
| * | | | | | | | Further added comments and split up if statments to make it more readable | nickago | 2015-08-12 | 1 | -6/+20 | |
| * | | | | | | | Added more comments and did cosmetic refactoring to understand code easier | nickago | 2015-08-12 | 1 | -10/+14 | |
| * | | | | | | | Added comments to confusing post list method | nickago | 2015-08-12 | 1 | -1/+8 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #369 from nickago/MM-1703 | Joram Wilander | 2015-08-17 | 8 | -102/+115 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Changed user_settings1 to user_settings and removed vestigial css | nickago | 2015-08-14 | 8 | -25/+15 | |
| * | | | | | | | cosmetic refactoring | nickago | 2015-08-14 | 2 | -64/+74 | |
| * | | | | | | | Fixed camelCase typos | nickago | 2015-08-11 | 1 | -2/+2 | |
| * | | | | | | | Cosmetic refactoring and removing no-op condition of set state | nickago | 2015-08-11 | 2 | -15/+20 | |
| * | | | | | | | access history and activity log closing re-opens user settings in correct state | nickago | 2015-08-11 | 3 | -5/+13 | |
* | | | | | | | | Merge pull request #379 from asaadmahmoodspin/mm-1854 | Joram Wilander | 2015-08-17 | 2 | -6/+13 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Fixing style guide issues | Asaad Mahmood | 2015-08-15 | 1 | -3/+2 | |
| * | | | | | | | Using variables efficiently | Asaad Mahmood | 2015-08-15 | 1 | -3/+3 |