Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge | =Corey Hulen | 2015-10-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-22 | 2 | -41/+52 |
|\ | |||||
| * | Merge pull request #1138 from rgarmsen2295/plt-777 | Harrison Healey | 2015-10-22 | 2 | -41/+52 |
| |\ | | | | | | | PLT-777 Convert window resizing in post_list.jsx to React based implementation | ||||
| | * | Fixed typos in create_post.jsx resizing code | Reed Garmsen | 2015-10-21 | 2 | -13/+11 |
| | | | |||||
| | * | Changed post list resize code to use react state; fixed various eslint warnings | Reed Garmsen | 2015-10-21 | 1 | -38/+51 |
| | | | |||||
* | | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 1 | -2/+2 |
| | | | |||||
* | | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 2 | -8/+20 |
| | | | |||||
* | | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 18 | -47/+446 |
|\| | | |||||
| * | | 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 | 2 | -4/+23 |
| | | | | | | | | | | | | in best possible way | ||||
| * | | always show stop gif button on small screen sizes | Florian Orben | 2015-10-21 | 1 | -0/+4 |
| | | | |||||
| * | | Add stop button to stop animated gifs | Florian Orben | 2015-10-21 | 5 | -44/+123 |
| | | | |||||
| * | | Horizontally align images if image height > image width | Florian Orben | 2015-10-21 | 2 | -3/+16 |
| | | | |||||
| * | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 5 | -4/+151 |
| | | | |||||
| * | | 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 | 6 | -16/+70 |
| |\ \ | | | | | | | | | PLT-318 - Updating files overlay design | ||||
| | * | | Updating btn-close size for direct messages on mobile devices. | Asaad Mahmood | 2015-10-20 | 1 | -0/+3 |
| | | | | |||||
| | * | | Removing logo email copy file | Asaad Mahmood | 2015-10-20 | 1 | -0/+0 |
| | | | | |||||
| | * | | Updating custom themes input addon | Asaad Mahmood | 2015-10-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Adding background transparent for theme inputs | Asaad Mahmood | 2015-10-20 | 1 | -0/+3 |
| | | | | |||||
| | * | | PLT-318 - Updating files overlay design | Asaad Mahmood | 2015-10-20 | 6 | -16/+64 |
| | | | | |||||
* | | | | 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 | 11 | -46/+110 |
|\| | | | |||||
| * | | | 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 |
| | | | | | |||||
| * | | | | Merge pull request #1084 from apaatsio/handle-window-resize-properly | Joram Wilander | 2015-10-20 | 6 | -34/+95 |
| |\ \ \ \ | | |_|/ / | |/| | | | Handle window resize in React way | ||||
| | * | | | 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 | ||||
| * | | | | Changed all goroutine functions to use '...AndForget' as the standard naming ↵ | Reed Garmsen | 2015-10-19 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | system | ||||
| * | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 4 | -10/+12 |
| |\ \ \ | | |_|/ | |/| | | 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 | 13 | -163/+262 |
| | |\ \ | | | | | | | | | | | | | | | | ui-improvements | ||||
| | * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-19 | 4 | -9/+11 |
| | | | | | |||||
* | | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 22 | -39/+55 |
| | | | | | |||||
* | | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 3 | -45/+24 |
| | | | | | |||||
* | | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 9 | -61/+435 |
|\| | | | | |||||
| * | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 8 | -61/+430 |
| |\ \ \ \ | | |_|/ / | |/| | | | PLT-235 Implement outgoing webhooks. | ||||
| | * | | | Generalized webhook post code and added it to outgoing webhooks | JoramWilander | 2015-10-19 | 1 | -33/+6 |
| | | | | | |||||
| | * | | | Show/hide integrations properly based off config settings. | JoramWilander | 2015-10-19 | 2 | -51/+55 |
| | | | | |