Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 |
| * | | Merge pull request #1114 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 2 | -7/+8 |
| |\ \ | |||||
| | * | | Updating direct messages title | Asaad Mahmood | 2015-10-19 | 1 | -1/+1 |
| | * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-19 | 11 | -162/+251 |
| | |\ \ | |||||
| | * | | | 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 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | 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 |
| |\ \ \ | |||||
| | * | | | 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 | 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 | 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 | Florian Orben | 2015-10-19 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #1101 from stasvovk/admin_console_urls | Harrison Healey | 2015-10-19 | 3 | -5/+15 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | change url when a user navigates between tabs [#962] | Stas Vovk | 2015-10-18 | 3 | -5/+15 |
| | |/ / | |||||
| * | | | 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 ui-impro... | Asaad Mahmood | 2015-10-18 | 4 | -11/+17 |
| |\| | | |||||
| | * | | Merge pull request #1090 from jvasallo/master | Joram Wilander | 2015-10-17 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | Updated Email Check Regex to RFC5322 Standard | Joel Vasallo | 2015-10-16 | 1 | -1/+2 |
| | * | | | Merge pull request #1096 from rgarmsen2295/plt-153 | Joram Wilander | 2015-10-17 | 1 | -2/+8 |
| | |\ \ \ | |||||
| | | * | | | 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 |
| | |\ \ \ | |||||
| | | * | | | 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 much... | Florian Orben | 2015-10-17 | 1 | -7/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-16 | 10 | -97/+126 |
| |\| | | |||||
| | * | | Fixing some client warnings | Christopher Speller | 2015-10-16 | 11 | -103/+132 |
| | |/ | |||||
| * | | Fixing more direct channel modal scrolling | Asaad Mahmood | 2015-10-16 | 1 | -1/+13 |
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-16 | 13 | -31/+266 |
| |\| | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 6 | -43/+47 |
* | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 1 | -3/+4 |
* | | | Fixing merge | =Corey Hulen | 2015-10-16 | 17 | -37/+377 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1054 from stasvovk/PLT-637 | Christopher Speller | 2015-10-16 | 7 | -14/+220 |
| |\ \ | |||||
| | * | | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 92 | -603/+1207 |
| | |\| | |||||
| | * | | update posts time in the right sidebar when user changes time format | Stas Vovk | 2015-10-15 | 1 | -0/+14 |