Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [webui] fix incorrect height for mentions list for reply textbox | ralder | 2015-07-10 | 2 | -15/+23 |
| | |||||
* | 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 |
| | | | | |||||
| * | | | Added a server side check to see if members who are trying to be invited ↵ | Reed Garmsen | 2015-07-07 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | 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 | 16 | -124/+234 |
|\ \ \ \ | | | | | | | | | | | MM-895 Reorganization of browser storage. | ||||
| * | | | | Adding comments to change versions in sync | Christopher Speller | 2015-07-08 | 2 | -0/+3 |
| | | | | | |||||
| * | | | | 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. | ||||
* | | | | Merge pull request #146 from nickago/MM-1284 | Joram Wilander | 2015-07-08 | 2 | -14/+27 |
|\ \ \ \ | | | | | | | | | | | MM-1284 Fixed auto-linking (for good hopefully) | ||||
| * \ \ \ | Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284 | nickago | 2015-07-08 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | merge conflics | ||||
| | * | | | | Add ALL the semicolons | nickago | 2015-07-08 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-07 | 2 | -12/+25 |
| | |/ / / | |||||
| * | | | | 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 | 4 | -63/+12 |
| | | | | | |||||
| | | | * | Merge branch 'master' of https://github.com/asaadmahmoodspin/platform | Asaad Mahmood | 2015-07-08 | 4 | -21/+91 |
| |_|_|/| |/| | | | | |||||
| | | | * | Merge pull request #1 from rgarmsen2295/mm-1469 | asaadmahmoodspin | 2015-07-08 | 5 | -22/+92 |
| | | | |\ | | | | | | | | | | | | | MM-1469 Added loading animation logic to the "Get More Channels Menu" ("More...") | ||||
| | | | | * | Small changes and code clean-up | Reed Garmsen | 2015-07-07 | 2 | -4/+2 |
| | | | | | | |||||
| | | | | * | Changed loading logic for retrieving more channels to allow for loading ↵ | Reed Garmsen | 2015-07-07 | 5 | -22/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #130 from hmhealey/staticjs | Corey Hulen | 2015-07-08 | 17 | -6/+42313 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | MM-1427 Copied required Javascript libraries and resources into repository | ||||
| * | | | | | Use correctly minified and unminified js libraries for JQuery, Bootstrap, ↵ | hmhealey | 2015-07-08 | 5 | -4/+1473 |
| | | | | | | | | | | | | | | | | | | | | | | | | and Perfect Scrollbar | ||||
| * | | | | | Copied Bootstrap, jQuery and React libraries and resources into repository | hmhealey | 2015-07-08 | 13 | -4/+40842 |
| | | | | | |