Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-22 | 2 | -41/+52 |
|\ | |||||
| * | 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 merge conflict | =Corey Hulen | 2015-10-22 | 6 | -28/+303 |
|\| | |||||
| * | 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 | 2 | -41/+105 |
| | | |||||
| * | 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 | 2 | -4/+119 |
| | | |||||
| * | 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 | 1 | -0/+24 |
| |\ \ | | |/ | |/| | PLT-751: Enable arrow to edit posts in comment threads | ||||
| | * | PLT-751: Enable arrow to edit posts in comment threads | Florian Orben | 2015-10-19 | 1 | -0/+24 |
| | | | |||||
| * | | 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 | 4 | -2/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 6 | -39/+93 |
|\| | | | |||||
| * | | | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 5 | -34/+87 |
| |/ / | | | | | | | | | | | | | | | | 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 | 1 | -5/+6 |
| |\ \ | | |/ | |/| | 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 | 8 | -153/+54 |
| | |\ | | | | | | | | | | | | | ui-improvements | ||||
| | * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-19 | 1 | -4/+5 |
| | | | | |||||
* | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 17 | -19/+19 |
| | | | | |||||
* | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 5 | -29/+363 |
|\| | | | |||||
| * | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 4 | -28/+361 |
| |\ \ \ | | |_|/ | |/| | | 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 | 3 | -5/+337 |
| | | | | |||||
* | | | | Merging from master | =Corey Hulen | 2015-10-19 | 22 | -304/+261 |
|\| | | | |||||
| * | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 4 | -145/+38 |
| |\ \ \ | | | | | | | | | | | PLT-554 Small refactor of websocket code on client and server | ||||
| | * | | | Fix typing socket constant | JoramWilander | 2015-10-16 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 4 | -143/+36 |
| | | | | | |||||
| * | | | | 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 |
| | |/ / / | |||||
| * | | | | Merge pull request #1101 from stasvovk/admin_console_urls | Harrison Healey | 2015-10-19 | 2 | -3/+10 |
| |\ \ \ \ | | |_|/ / | |/| | | | #962: change url when a user navigates between tabs in admin console | ||||
| | * | | | change url when a user navigates between tabs [#962] | Stas Vovk | 2015-10-18 | 2 | -3/+10 |
| | |/ / | |||||
| * | | | Updating scroll on LHS | Asaad Mahmood | 2015-10-19 | 1 | -1/+3 |
| | | | | |||||
| * | | | Updating userEntries div to tr td | Asaad Mahmood | 2015-10-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-18 | 3 | -10/+15 |
| |\| | | | | | | | | | | | | | | ui-improvements | ||||
| | * | | Merge pull request #1096 from rgarmsen2295/plt-153 | Joram Wilander | 2015-10-17 | 1 | -2/+8 |
| | |\ \ | | | | | | | | | | | PLT-153 Added better recognition of Android devices in the Active Sessions UI | ||||
| | | * | | Added proper recognition of android devices in the Active Sessions UI | Reed Garmsen | 2015-10-16 | 1 | -2/+8 |
| | | | | | |||||
| | * | | | Merge pull request #1097 from rgarmsen2295/plt-693 | Joram Wilander | 2015-10-17 | 1 | -1/+6 |
| | |\ \ \ | | | | | | | | | | | | | PLT-693 Fixes back button on username page during team signup when email is turned off | ||||
| | | * | | | Fixes back button on username page during team signup when email is turned off | Reed Garmsen | 2015-10-16 | 1 | -1/+6 |
| | | |/ / | |||||
| | * / / | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵ | Florian Orben | 2015-10-17 | 1 | -7/+1 |
| | |/ / | | | | | | | | | | | | | much room | ||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 10 | -97/+126 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx |