Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge issue | =Corey Hulen | 2015-10-19 | 1 | -8/+3 |
* | Merging from master | =Corey Hulen | 2015-10-19 | 42 | -403/+602 |
|\ | |||||
| * | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 10 | -184/+277 |
| |\ | |||||
| | * | 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 | 10 | -182/+276 |
| * | | Merge pull request #1067 from layzerar/fix_email_encoding | Corey Hulen | 2015-10-19 | 1 | -3/+11 |
| |\ \ | |||||
| | * | | Fix email encoding issue | Melvi Ts | 2015-10-16 | 1 | -3/+11 |
| * | | | 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 |
| * | | | | Clarifying creds aren't real in docs | it33 | 2015-10-19 | 1 | -1/+2 |
| * | | | | 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 | 5 | -6/+26 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | change url when a user navigates between tabs [#962] | Stas Vovk | 2015-10-18 | 5 | -6/+26 |
| * | | | | | Merge pull request #1087 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-19 | 6 | -83/+101 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 | 6 | -17/+19 |
| | |\| | | | | |||||
| | * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-16 | 15 | -102/+152 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fixing more direct channel modal scrolling | Asaad Mahmood | 2015-10-16 | 3 | -1/+23 |
| | * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-16 | 24 | -149/+488 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 8 | -88/+82 |
| * | | | | | | | | Update Troubleshooting.md | it33 | 2015-10-18 | 1 | -0/+5 |
| * | | | | | | | | Update README.md | it33 | 2015-10-18 | 1 | -1/+1 |
| * | | | | | | | | IE 10 support deprecated | it33 | 2015-10-18 | 1 | -0/+6 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Emphasize self-hosting | it33 | 2015-10-18 | 1 | -1/+1 |
| * | | | | | | | Add Enterprise Support, link to releases | it33 | 2015-10-18 | 1 | -1/+9 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1099 from florianorben/PLT-463 | Joram Wilander | 2015-10-17 | 2 | -13/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much... | Florian Orben | 2015-10-17 | 2 | -13/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1092 from trashcan/fix-autocomplete-transparency | Joram Wilander | 2015-10-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Add semi-colon | Pat Lathem | 2015-10-16 | 1 | -1/+1 |
| | * | | | | | Add z-index to command-box so that elements behind it do not show through aut... | Pat Lathem | 2015-10-16 | 1 | -0/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1089 from mattermost/client-warning-fixes | Corey Hulen | 2015-10-16 | 11 | -103/+132 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixing some client warnings | Christopher Speller | 2015-10-16 | 11 | -103/+132 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 4 | -94/+138 |
* | | | | | | Fixing merge | =Corey Hulen | 2015-10-16 | 37 | -165/+642 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1085 from mattermost/plt-633 | Harrison Healey | 2015-10-16 | 3 | -4/+17 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 3 | -4/+17 |
| * | | | | | Adding single-line Docker install | it33 | 2015-10-16 | 1 | -0/+7 |
| * | | | | | Merge pull request #1088 from hmhealey/initprefs | Harrison Healey | 2015-10-16 | 1 | -1/+2 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fixed preference test that was failing | hmhealey | 2015-10-16 | 1 | -1/+2 |
| |/ / / / |