summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge conflictsnickago2015-07-132-2/+16
|\
| * should fix scrolling on forceupdateJoramWilander2015-07-132-2/+13
* | Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebarJoram Wilander2015-07-132-15/+23
|\ \
| * | [webui] fix incorrect height for mentions list for reply textboxralder2015-07-102-15/+23
* | | Merge pull request #165 from mattermost/revert-154-MM-831Joram Wilander2015-07-102-11/+0
|\ \ \ | |_|/ |/| |
| * | Revert "MM-831 Post timestamp now updates in real time"Joram Wilander2015-07-102-11/+0
|/ /
* | Merge pull request #159 from rgarmsen2295/mm-1269bCorey Hulen2015-07-105-6/+54
|\ \
| * | Removed extraneous setStateReed Garmsen2015-07-101-2/+1
| * | Changed spacing model of connection flag & removed unnecessary duplication of...Reed Garmsen2015-07-101-9/+6
| * | Moved check for existing timer interrupt outside of if-else block for sanityReed Garmsen2015-07-091-4/+5
| * | Removed newlineReed Garmsen2015-07-091-1/+0
| * | Changed method again this time to a timer based system so that when inet does...Reed Garmsen2015-07-091-16/+27
| * | Added performance commentReed Garmsen2015-07-091-0/+2
| * | Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet c...Reed Garmsen2015-07-092-10/+16
| * | Added errorchange listener to textbox that detects if inet is not connected. ...Reed Garmsen2015-07-094-10/+38
| * | Notes to myselfReed Garmsen2015-07-091-1/+6
* | | Merge pull request #157 from rgarmsen2295/mm-1265Corey Hulen2015-07-104-10/+11
|\ \ \ | |_|/ |/| |
| * | Final change to code affected by change to loading more channels logicReed Garmsen2015-07-101-1/+1
| * | Removed test codeReed Garmsen2015-07-101-2/+0
| * | Better logic for checking if channel has loadedReed Garmsen2015-07-103-2/+9
| * | Removed extraneous console.log functionsReed Garmsen2015-07-091-5/+0
| * | Leave result of _getMoreChannels unitialized if it does not yet exist in brow...Reed Garmsen2015-07-092-4/+5
| * | The options to change member roles are now links so that they have the 'click...Reed Garmsen2015-07-091-4/+4
| |/
* | Merge pull request #162 from asaadmahmoodspin/masterJoram Wilander2015-07-103-8/+13
|\ \
| * | UI Improvements for RHSAsaad Mahmood2015-07-103-8/+13
|/ /
* | Merge pull request #156 from asaadmahmoodspin/masterJoram Wilander2015-07-109-41/+72
|\ \
| * | MM-1304 - Quick fix for error on welcome sign up pageAsaad Mahmood2015-07-102-4/+6
| * | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-1010-8/+60
| |\ \ | |/ / |/| |
* | | Merge pull request #154 from nickago/MM-831Joram Wilander2015-07-102-0/+11
|\ \ \
| * | | Added comments for the force update functionsnickago2015-07-092-0/+2
| * | | Placed event listeners on higher level components to avoid app dispatcher vomitnickago2015-07-093-9/+9
| * | | Merge branch 'master' of https://github.com/mattermost/platform into MM-831nickago2015-07-099-94/+138
| |\ \ \ | | | |/ | | |/|
| * | | Time change ping riding on the status interupt for timestamp updatenickago2015-07-091-0/+9
* | | | Merge pull request #160 from ralder/fix-pr-150-MM-895Christopher Speller2015-07-103-8/+14
|\ \ \ \
| * | | | fix bugs for pr #150 MM-895ralder2015-07-103-8/+14
* | | | | Merge pull request #152 from faebser/manifest-for-mobileChristopher Speller2015-07-102-0/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove newlineFabian Frei2015-07-091-1/+1
| * | | | added link to manifest.json and ios metatagsFabian Frei2015-07-091-0/+13
| * | | | added manifest.jsonFabian Frei2015-07-091-0/+13
* | | | | Merge pull request #155 from nickago/MM-1296Joram Wilander2015-07-093-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Minor formatting changenickago2015-07-091-1/+1
| * | | | Added curly bracenickago2015-07-091-1/+2
| * | | | Server now notifies users they have been added to a new channelnickago2015-07-093-0/+8
| | |/ / | |/| |
| | | * Improving mentions list and other UI improvementsAsaad Mahmood2015-07-107-37/+66
| |_|/ |/| |
* | | Merge pull request #151 from asaadmahmoodspin/masterJoram Wilander2015-07-099-94/+138
|\ \ \ | |/ / |/| |
| * | Updating font size and margins for loading animationAsaad Mahmood2015-07-091-1/+2
| * | Updating Ui for postsAsaad Mahmood2015-07-093-67/+92
| * | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-0921-232/+342
| |\ \ | |/ / |/| |
* | | Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modalJoram Wilander2015-07-092-93/+66
|\ \ \ | |_|/ |/| |
| * | add missing tabIndex for channel members modalralder2015-07-072-93/+66