Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebar | Joram Wilander | 2015-07-13 | 2 | -15/+23 |
|\ | | | | | [webui] fix incorrect height for mentions list for reply and edit textbox | ||||
| * | [webui] fix incorrect height for mentions list for reply textbox | ralder | 2015-07-10 | 2 | -15/+23 |
| | | |||||
* | | Merge pull request #165 from mattermost/revert-154-MM-831 | Joram Wilander | 2015-07-10 | 2 | -11/+0 |
|\ \ | | | | | | | Revert "MM-831 Post timestamp now updates in real time" | ||||
| * | | Revert "MM-831 Post timestamp now updates in real time" | Joram Wilander | 2015-07-10 | 2 | -11/+0 |
|/ / | |||||
* | | Merge pull request #159 from rgarmsen2295/mm-1269b | Corey Hulen | 2015-07-10 | 5 | -6/+54 |
|\ \ | | | | | | | MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted | ||||
| * | | Removed extraneous setState | Reed Garmsen | 2015-07-10 | 1 | -2/+1 |
| | | | |||||
| * | | Changed spacing model of connection flag & removed unnecessary duplication ↵ | Reed Garmsen | 2015-07-10 | 1 | -9/+6 |
| | | | | | | | | | | | | of logic | ||||
| * | | Moved check for existing timer interrupt outside of if-else block for sanity | Reed Garmsen | 2015-07-09 | 1 | -4/+5 |
| | | | |||||
| * | | Removed newline | Reed Garmsen | 2015-07-09 | 1 | -1/+0 |
| | | | |||||
| * | | Changed method again this time to a timer based system so that when inet ↵ | Reed Garmsen | 2015-07-09 | 1 | -16/+27 |
| | | | | | | | | | | | | does come back the yellow tinge goes away automatically not on user input | ||||
| * | | Added performance comment | Reed Garmsen | 2015-07-09 | 1 | -0/+2 |
| | | | |||||
| * | | Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet ↵ | Reed Garmsen | 2015-07-09 | 2 | -10/+16 |
| | | | | | | | | | | | | connectivity immediately after clearning yellow bar after user has typed 5 characters | ||||
| * | | Added errorchange listener to textbox that detects if inet is not connected. ↵ | Reed Garmsen | 2015-07-09 | 4 | -10/+38 |
| | | | | | | | | | | | | Still do not have reliable way of checking if inet has reconnected | ||||
| * | | Notes to myself | Reed Garmsen | 2015-07-09 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #157 from rgarmsen2295/mm-1265 | Corey Hulen | 2015-07-10 | 4 | -10/+11 |
|\ \ \ | |_|/ |/| | | MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels | ||||
| * | | Final change to code affected by change to loading more channels logic | Reed Garmsen | 2015-07-10 | 1 | -1/+1 |
| | | | |||||
| * | | Removed test code | Reed Garmsen | 2015-07-10 | 1 | -2/+0 |
| | | | |||||
| * | | Better logic for checking if channel has loaded | Reed Garmsen | 2015-07-10 | 3 | -2/+9 |
| | | | |||||
| * | | Removed extraneous console.log functions | Reed Garmsen | 2015-07-09 | 1 | -5/+0 |
| | | | |||||
| * | | Leave result of _getMoreChannels unitialized if it does not yet exist in ↵ | Reed Garmsen | 2015-07-09 | 2 | -4/+5 |
| | | | | | | | | | | | | browser storage to know when list of more channels is loading vs when its empty | ||||
| * | | The options to change member roles are now links so that they have the ↵ | Reed Garmsen | 2015-07-09 | 1 | -4/+4 |
| |/ | | | | | | | 'click' mouse hand when hovered over | ||||
* | | Merge pull request #162 from asaadmahmoodspin/master | Joram Wilander | 2015-07-10 | 3 | -8/+13 |
|\ \ | | | | | | | UI Improvements for RHS | ||||
| * | | UI Improvements for RHS | Asaad Mahmood | 2015-07-10 | 3 | -8/+13 |
|/ / | |||||
* | | Merge pull request #156 from asaadmahmoodspin/master | Joram Wilander | 2015-07-10 | 9 | -41/+72 |
|\ \ | | | | | | | Improving mentions list and other UI improvements | ||||
| * | | MM-1304 - Quick fix for error on welcome sign up page | Asaad Mahmood | 2015-07-10 | 2 | -4/+6 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-10 | 10 | -8/+60 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #154 from nickago/MM-831 | Joram Wilander | 2015-07-10 | 2 | -0/+11 |
|\ \ \ | | | | | | | | | MM-831 Post timestamp now updates in real time | ||||
| * | | | Added comments for the force update functions | nickago | 2015-07-09 | 2 | -0/+2 |
| | | | | |||||
| * | | | Placed event listeners on higher level components to avoid app dispatcher vomit | nickago | 2015-07-09 | 3 | -9/+9 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into MM-831 | nickago | 2015-07-09 | 9 | -94/+138 |
| |\ \ \ | | | |/ | | |/| | | | | | merge | ||||
| * | | | Time change ping riding on the status interupt for timestamp update | nickago | 2015-07-09 | 1 | -0/+9 |
| | | | | |||||
* | | | | Merge pull request #160 from ralder/fix-pr-150-MM-895 | Christopher Speller | 2015-07-10 | 3 | -8/+14 |
|\ \ \ \ | | | | | | | | | | | [webui] fix bugs for pr #150 MM-895 | ||||
| * | | | | fix bugs for pr #150 MM-895 | ralder | 2015-07-10 | 3 | -8/+14 |
| | | | | | |||||
* | | | | | Merge pull request #152 from faebser/manifest-for-mobile | Christopher Speller | 2015-07-10 | 2 | -0/+26 |
|\ \ \ \ \ | |/ / / / |/| | | | | Manifest for mobile | ||||
| * | | | | remove newline | Fabian Frei | 2015-07-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | added link to manifest.json and ios metatags | Fabian Frei | 2015-07-09 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | added manifest.json | Fabian Frei | 2015-07-09 | 1 | -0/+13 |
| | | | | | |||||
* | | | | | Merge pull request #155 from nickago/MM-1296 | Joram Wilander | 2015-07-09 | 3 | -0/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1296 Server now notifies users they have been added to a new channel | ||||
| * | | | | Minor formatting change | nickago | 2015-07-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added curly brace | nickago | 2015-07-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Server now notifies users they have been added to a new channel | nickago | 2015-07-09 | 3 | -0/+8 |
| | |/ / | |/| | | |||||
| | | * | Improving mentions list and other UI improvements | Asaad Mahmood | 2015-07-10 | 7 | -37/+66 |
| |_|/ |/| | | |||||
* | | | Merge pull request #151 from asaadmahmoodspin/master | Joram Wilander | 2015-07-09 | 9 | -94/+138 |
|\ \ \ | |/ / |/| | | MM-1469 - Loading message in more channel modal | ||||
| * | | Updating font size and margins for loading animation | Asaad Mahmood | 2015-07-09 | 1 | -1/+2 |
| | | | |||||
| * | | Updating Ui for posts | Asaad Mahmood | 2015-07-09 | 3 | -67/+92 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 21 | -232/+342 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modal | Joram Wilander | 2015-07-09 | 2 | -93/+66 |
|\ \ \ | |_|/ |/| | | [webui] add missing tabIndex for channel members modal | ||||
| * | | add missing tabIndex for channel members modal | ralder | 2015-07-07 | 2 | -93/+66 |
| | | | |||||
* | | | Merge pull request #149 from rgarmsen2295/mm-1260 | Christopher Speller | 2015-07-08 | 2 | -1/+15 |
|\ \ \ | | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup | ||||
| * | | | Small tweaks and cleanup | Reed Garmsen | 2015-07-07 | 2 | -12/+3 |
| | | | |