summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Further cosmetic refactoringnickago2015-08-181-153/+176
* Cosmetic refactoringnickago2015-08-181-5/+11
* Clear state info on section changenickago2015-08-182-9/+13
* Split up user settings filesnickago2015-08-185-1182/+1207
* Merge pull request #392 from hmhealey/typingfixJoram Wilander2015-08-181-1/+1
|\
| * Fixed 'X is typing...' messages being malformed when sent to the serverhmhealey2015-08-181-1/+1
|/
* Merge pull request #380 from mattermost/mm-319Christopher Speller2015-08-1815-521/+941
|\
| * 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-183-20/+17
| * 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 immediate...JoramWilander2015-08-1813-270/+374
| * update formatting in post_storeJoramWilander2015-08-181-28/+40
| * added client predictive commentingJoramWilander2015-08-184-17/+97
| * adds predictive posting on the clientJoramWilander2015-08-188-36/+190
|/
* Merge pull request #391 from asaadmahmoodspin/masterChristopher Speller2015-08-1810-14/+41
|\
| * Multiple UI changesAsaad Mahmood2015-08-1810-14/+41
* | Merge pull request #385 from mattermost/mm-1623Christopher Speller2015-08-184-5/+57
|\ \
| * | when user roles are updated, the relevant session roles are updated as wellJoramWilander2015-08-174-5/+57
* | | Merge pull request #381 from mattermost/mm-1705Christopher Speller2015-08-1817-170/+335
|\ \ \
| * | | merge async_client getMe changesJoramWilander2015-08-141-6/+6
| * | | reformat login.jsx to meet style guideJoramWilander2015-08-141-48/+54
| * | | turn off google SSO by default and remove test google oauth credentialsJoramWilander2015-08-141-3/+3
| * | | incorporate asaad's UI updates for google sign-upJoramWilander2015-08-143-1/+18
| * | | added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-1411-81/+136
| * | | initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-147-59/+146
* | | | Merge pull request #378 from rgarmsen2295/mm-316cChristopher Speller2015-08-1816-31/+325
|\ \ \ \
| * | | | Small changes to css to clean up codeReed Garmsen2015-08-145-21/+9
| * | | | 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-134-13/+28
| * | | | Merge pull request #7 from asaadmahmoodspin/mm-316Reed Garmsen2015-08-1314-36/+327
| |\ \ \ \
| | * | | | Updating UI to cover RHS and the centre channel separatelyAsaad Mahmood2015-08-134-5/+6
| | * | | | 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-135-48/+45
| | * | | | | Merge pull request #5 from rgarmsen2295/mm-316asaadmahmoodspin2015-08-1312-17/+293
| |/| | | | |
| | * | | | | Implements better markup for css changes to be made, including an overlay of ...Reed Garmsen2015-08-127-43/+73
| | * | | | | 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-125-22/+8
| | * | | | | Switched to using the jquery-dragster library to implement more consistent dr...Reed Garmsen2015-08-126-26/+172
| | * | | | | Changed structure to keep code contained to file_upload.jsxReed Garmsen2015-08-125-28/+28
| | * | | | | Working on adding overlays for file drag and dropReed Garmsen2015-08-125-15/+36
| | * | | | | Users can now drop files into the center pane or the rhs respectively to uplo...Reed Garmsen2015-08-125-54/+79