Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Better logic for checking if channel has loaded | Reed Garmsen | 2015-07-10 | 2 | -2/+7 |
| | | |||||
| * | 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 | ||||
* | | UI Improvements for RHS | Asaad Mahmood | 2015-07-10 | 1 | -1/+1 |
| | | |||||
* | | MM-1304 - Quick fix for error on welcome sign up page | Asaad Mahmood | 2015-07-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-10 | 6 | -8/+29 |
|\ \ | |||||
| * \ | 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 | 5 | -25/+49 |
| | |\| | | | | | | | | | | | | | merge | ||||
| | * | | Time change ping riding on the status interupt for timestamp update | nickago | 2015-07-09 | 1 | -0/+9 |
| | | | | |||||
| * | | | fix bugs for pr #150 MM-895 | ralder | 2015-07-10 | 3 | -8/+14 |
| | | | | |||||
| * | | | Merge pull request #155 from nickago/MM-1296 | Joram Wilander | 2015-07-09 | 1 | -0/+4 |
| |\ \ \ | | |_|/ | |/| | | MM-1296 Server now notifies users they have been added to a new channel | ||||
| | * | | 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 | 1 | -0/+3 |
| | |/ | |||||
* | / | Improving mentions list and other UI improvements | Asaad Mahmood | 2015-07-10 | 2 | -9/+15 |
|/ / | |||||
* | | Updating Ui for posts | Asaad Mahmood | 2015-07-09 | 1 | -1/+12 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 19 | -232/+332 |
|\| | |||||
| * | 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 | 1 | -1/+6 |
| |\ \ | | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup | ||||
| | * | | Small tweaks and cleanup | Reed Garmsen | 2015-07-07 | 1 | -10/+1 |
| | | | | |||||
| | * | | Added a server side check to see if members who are trying to be invited ↵ | Reed Garmsen | 2015-07-07 | 1 | -2/+16 |
| | |/ | | | | | | | | | | have already been invited by checking the email. Client handles it as if it was an email error. | ||||
| * | | Merge pull request #150 from mattermost/mm-895 | Joram Wilander | 2015-07-08 | 15 | -124/+233 |
| |\ \ | | | | | | | | | MM-895 Reorganization of browser storage. | ||||
| | * | | Adding comments to change versions in sync | Christopher Speller | 2015-07-08 | 1 | -0/+2 |
| | | | | |||||
| | * | | Finishing centralization of BrowserStore | Christopher Speller | 2015-07-08 | 6 | -31/+46 |
| | | | | |||||
| | * | | Modifying all storage to use session storage. Also adding an abstraction ↵ | Christopher Speller | 2015-07-08 | 11 | -100/+192 |
| | |/ | | | | | | | | | | layer to add current user id as a prefix to most keys. | ||||
| * | | Semicolons and a bug fix | nickago | 2015-07-08 | 1 | -5/+5 |
| | | | |||||
| * | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-08 | 2 | -12/+25 |
| | | | |||||
* | | | MM-1444 - Fixing text selection issue | Asaad Mahmood | 2015-07-09 | 1 | -2/+1 |
| | | | |||||
* | | | MM-1469 - Loading message in more channel modal | Asaad Mahmood | 2015-07-08 | 1 | -3/+4 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/asaadmahmoodspin/platform | Asaad Mahmood | 2015-07-08 | 3 | -21/+34 |
|\ \ \ | |/ / |/| | | |||||
| * | | Small changes and code clean-up | Reed Garmsen | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | Changed loading logic for retrieving more channels to allow for loading ↵ | Reed Garmsen | 2015-07-07 | 3 | -22/+35 |
| |/ | | | | | | | animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load | ||||
* | | Merge pull request #148 from hmhealey/mm1488 | Christopher Speller | 2015-07-08 | 1 | -2/+3 |
|\ \ | | | | | | | MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself | ||||
| * | | Changed code to dismiss mention list to not trigger when you click on the ↵ | hmhealey | 2015-07-07 | 1 | -2/+3 |
| |/ | | | | | | | list itself | ||||
* / | Changed textarea resizeability from being a blanket statement to everything ↵ | Reed Garmsen | 2015-07-07 | 3 | -3/+3 |
|/ | | | | to only the ones with issues | ||||
* | Merge pull request #134 from nickago/MM-1313 | Christopher Speller | 2015-07-07 | 1 | -0/+8 |
|\ | | | | | Mm 1313 Made the typing notification more responsive/accurate | ||||
| * | Changed socket event to a props based change | nickago | 2015-07-06 | 2 | -20/+9 |
| | | |||||
| * | Typing notification disappears when message is sent | nickago | 2015-07-06 | 2 | -3/+4 |
| | | |||||
| * | Typing notifier resets on channel change | nickago | 2015-07-06 | 2 | -4/+22 |
| | | |||||
* | | Merge pull request #135 from asaadmahmoodspin/master | Corey Hulen | 2015-07-06 | 2 | -2/+2 |
|\ \ | | | | | | | MM-1461 - Updating Mattermost UI | ||||
| * | | MM-1461 - Updating Mattermost UI | Asaad Mahmood | 2015-07-06 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #133 from nickago/MM-794 | Corey Hulen | 2015-07-06 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | MM-794 Force the extra info to update asych on user creation | ||||
| * | | | Force the extra info to update asych | nickago | 2015-07-06 | 1 | -0/+7 |
| | |/ | |/| | |||||
* | | | Merge pull request #132 from mattermost/mm-1250 | Corey Hulen | 2015-07-06 | 2 | -2/+6 |
|\ \ \ | |_|/ |/| | | fixes mm-1250 mention highlights should now align in textbox | ||||
| * | | fixes mm-1250 mention highlights should now align in textbox | JoramWilander | 2015-06-17 | 2 | -2/+6 |
| | | |