summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #381 from mattermost/mm-1705Christopher Speller2015-08-188-60/+116
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
| |\ \ \ \ \
| | * | | | | Implements better markup for css changes to be made, including an overlay of ...Reed Garmsen2015-08-123-11/+27
| | * | | | | 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 opening...Reed Garmsen2015-08-121-3/+2
| | * | | | | 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 dr...Reed Garmsen2015-08-121-26/+22
| | * | | | | 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 uplo...Reed Garmsen2015-08-124-47/+72
| | * | | | | Added handlers for dragging and dropping files onto the center pane or RHSReed Garmsen2015-08-122-0/+44
* | | | | | | Merge pull request #352 from nickago/MM-1092Joram Wilander2015-08-182-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Moved controlling CSS into post list so it always shows upnickago2015-08-172-6/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #374 from nickago/MM-1299Joram Wilander2015-08-183-9/+30
|\ \ \ \ \ \ \
| * | | | | | | Added hardcoded firefox functionnickago2015-08-172-4/+4
| * | | | | | | move browser check functionality into a methodnickago2015-08-142-2/+6
| * | | | | | | Cosmetic refactoringnickago2015-08-131-5/+12
| * | | | | | | Refactored such that the menu doesn't open for firefox usersnickago2015-08-133-30/+23
| * | | | | | | Added extra uAgent check for weird browser implementationsnickago2015-08-121-1/+1
| * | | | | | | Handed control of notification sounds over to browser for firefoxnickago2015-08-122-18/+35
* | | | | | | | Merge pull request #377 from nickago/MM-1894Joram Wilander2015-08-182-73/+81
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Cosmetic refactoringnickago2015-08-131-72/+74
| * | | | | | | Added flux-style error protection on team store call in sidebarnickago2015-08-132-5/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Fixed issue with redirects not working on safariReed Garmsen2015-08-171-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh"Joram Wilander2015-08-174-254/+223
* | | | | | Merge pull request #372 from nickago/MM-1640Christopher Speller2015-08-174-223/+254
|\ \ \ \ \ \
| * | | | | | cosmetic refactoringnickago2015-08-141-153/+198
| * | | | | | Changed timeout code to event basednickago2015-08-141-2/+5
| * | | | | | Added non-default reliant behavior to initial scroll on mountnickago2015-08-121-1/+5
| * | | | | | Removed usused variablenickago2015-08-121-1/+0
| * | | | | | Changed the default for update to hold your position in the listnickago2015-08-121-2/+2
| * | | | | | Removed personal debugging code and notesnickago2015-08-124-11/+4
| * | | | | | Added case for window resize and cleaned up functionnickago2015-08-122-9/+23
| * | | | | | Completely rehauled scrolling system, finished base implementationnickago2015-08-125-94/+42
| * | | | | | Filled out comments for post listnickago2015-08-121-1/+1
| * | | | | | Further added comments and split up if statments to make it more readablenickago2015-08-121-6/+20
| * | | | | | Added more comments and did cosmetic refactoring to understand code easiernickago2015-08-121-10/+14