Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 1 | -2/+2 |
| | |||||
* | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 1 | -7/+20 |
| | |||||
* | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 11 | -34/+333 |
|\ | |||||
| * | Changed markdown renderer to only parse emoticons twice | hmhealey | 2015-10-22 | 2 | -1/+15 |
| | | |||||
| * | Fixed improperly quoted html attributes for emoticons | hmhealey | 2015-10-22 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1135 from trashcan/PLT-521 | Harrison Healey | 2015-10-22 | 1 | -2/+4 |
| |\ | | | | | | | PLT-521: Fix emoji with underscores | ||||
| | * | Pass eslint tests | Pat Lathem | 2015-10-21 | 1 | -3/+3 |
| | | | |||||
| | * | Missing semicolon | Pat Lathem | 2015-10-21 | 1 | -1/+1 |
| | | | |||||
| | * | Remove stray emoticons.jsx import | Pat Lathem | 2015-10-21 | 1 | -1/+0 |
| | | | |||||
| | * | Add a call to doFormatText inside of the markdown paragraph handler | Pat Lathem | 2015-10-21 | 1 | -0/+3 |
| | | | |||||
| * | | Change stop symbol to another one since chrome-win can't display it | Florian Orben | 2015-10-21 | 2 | -2/+2 |
| | | | |||||
| * | | apply portrait/landscape/quadrat format to playing gif to always display it ↵ | Florian Orben | 2015-10-21 | 1 | -3/+17 |
| | | | | | | | | | | | | in best possible way | ||||
| * | | Add stop button to stop animated gifs | Florian Orben | 2015-10-21 | 3 | -42/+106 |
| | | | |||||
| * | | Horizontally align images if image height > image width | Florian Orben | 2015-10-21 | 1 | -3/+15 |
| | | | |||||
| * | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 3 | -4/+120 |
| | | | |||||
| * | | Merge pull request #1131 from mattermost/PLT-350 | Christopher Speller | 2015-10-21 | 2 | -4/+40 |
| |\ \ | | | | | | | | | PLT-350 allow ability to disable restricted team names | ||||
| | * | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 2 | -4/+40 |
| | |/ | |||||
| * | | Merge pull request #1103 from florianorben/PLT-751 | Harrison Healey | 2015-10-21 | 2 | -3/+34 |
| |\ \ | | |/ | |/| | PLT-751: Enable arrow to edit posts in comment threads | ||||
| | * | Allow to update root comment in RHS via arrow up shortcut | Florian Orben | 2015-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | PLT-751: Enable arrow to edit posts in comment threads | Florian Orben | 2015-10-19 | 2 | -3/+34 |
| | | | |||||
| * | | Merge pull request #1120 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-20 | 1 | -3/+13 |
| |\ \ | | | | | | | | | PLT-318 - Updating files overlay design | ||||
| | * | | PLT-318 - Updating files overlay design | Asaad Mahmood | 2015-10-20 | 1 | -3/+13 |
| | | | | |||||
* | | | | Fixing admin console | =Corey Hulen | 2015-10-20 | 2 | -2/+2 |
| | | | | |||||
* | | | | fixing eslint errors | =Corey Hulen | 2015-10-20 | 5 | -3/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 8 | -41/+104 |
|\| | | | |||||
| * | | | Merge pull request #1100 from girishso/wink_emoji | Joram Wilander | 2015-10-20 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | PLT-699: translate ;) to wink emoji | ||||
| | * | | | translate ;) to wink emoji | Girish S | 2015-10-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 6 | -34/+95 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html | ||||
| * | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 2 | -7/+8 |
| |\ \ \ | | |_|/ | |/| | | Ui improvements | ||||
| | * | | Updating direct messages title | Asaad Mahmood | 2015-10-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-19 | 11 | -162/+251 |
| | |\ \ | | | | | | | | | | | | | | | | ui-improvements | ||||
| | * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-19 | 2 | -6/+7 |
| | | | | | |||||
* | | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 20 | -29/+43 |
| | | | | | |||||
* | | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 1 | -8/+8 |
| | | | | | |||||
* | | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 7 | -29/+422 |
|\| | | | | |||||
| * | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 6 | -28/+420 |
| |\ \ \ \ | | |_|/ / | |/| | | | PLT-235 Implement outgoing webhooks. | ||||
| | * | | | Show/hide integrations properly based off config settings. | JoramWilander | 2015-10-19 | 2 | -51/+55 |
| | | | | | |||||
| | * | | | Fix postgres query and minor UI updates for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -9/+6 |
| | | | | | |||||
| | * | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 5 | -5/+396 |
| | | |/ | | |/| | |||||
* | | | | Merging from master | =Corey Hulen | 2015-10-19 | 26 | -314/+460 |
|\| | | | |||||
| * | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 6 | -152/+230 |
| |\ \ \ | | | | | | | | | | | PLT-554 Small refactor of websocket code on client and server | ||||
| | * | | | Remove unnecessary bind | JoramWilander | 2015-10-16 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Fix typing socket constant | JoramWilander | 2015-10-16 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 6 | -150/+229 |
| | | | | | |||||
| * | | | | Merge pull request #1107 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 1 | -0/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | Updating scroll on admin console | ||||
| | * | | | Updating scroll on admin console | Asaad Mahmood | 2015-10-19 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge pull request #1104 from florianorben/fix_arrow_left_right | Harrison Healey | 2015-10-19 | 1 | -3/+4 |
| |\ \ \ \ | | | | | | | | | | | | | No longer try to navigate to next/prev image if image preview modal is not open | ||||
| | * | | | | No longer try to navigate to next/prev image if image preview modal is not open | Florian Orben | 2015-10-19 | 1 | -3/+4 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #1102 from florianorben/fix_email_tooltip | Harrison Healey | 2015-10-19 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fixes wrong tooltip on user profile | ||||
| | * | | | | Fixes wrong tooltip on user profile | Florian Orben | 2015-10-19 | 1 | -2/+2 |
| | |/ / / |