summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-23100-623/+1159
|\
| * Merge pull request #1153 from mattermost/fixing-eslintCorey Hulen2015-10-221-0/+1
| |\
| | * Fixing merge=Corey Hulen2015-10-221-0/+1
| |/
| * Merge pull request #1150 from hmhealey/plt689Corey Hulen2015-10-221-28/+28
| |\
| | * Fixed handling of whitespace surrounding emoticonshmhealey2015-10-221-28/+28
| * | Merge pull request #1147 from hmhealey/plt721Corey Hulen2015-10-221-1/+1
| |\ \
| | * | Changed Direct Channel modal to only show active usershmhealey2015-10-221-1/+1
| | |/
| * | Merge pull request #1146 from hmhealey/plt759Corey Hulen2015-10-221-5/+7
| |\ \
| | * | Made searching case insensitive in Direct Messages modalhmhealey2015-10-221-5/+7
| | |/
| * | Merge pull request #1145 from hmhealey/plt719Corey Hulen2015-10-222-1/+51
| |\ \
| | * | Added help popover to search boxhmhealey2015-10-222-1/+51
| * | | Merge pull request #1143 from mattermost/plt-803Corey Hulen2015-10-223-1/+36
| |\ \ \
| | * | | Prevent users from resetting their password when the user is using SSOJoramWilander2015-10-223-1/+36
| * | | | Merge pull request #1142 from mattermost/plt-414Corey Hulen2015-10-224-63/+255
| |\ \ \ \
| | * | | | Refactoring direct channel creation to use transaction to avaoid state where ...Christopher Speller2015-10-224-63/+255
| * | | | | Merge pull request #1137 from mattermost/email-troubleCorey Hulen2015-10-221-6/+49
| |\ \ \ \ \
| | * | | | | tweaking formatting=Corey Hulen2015-10-211-1/+1
| | * | | | | tweaking formatting=Corey Hulen2015-10-211-3/+3
| | * | | | | Removing old dock=Corey Hulen2015-10-211-49/+0
| | * | | | | Updating email guide=Corey Hulen2015-10-212-14/+85
| | * | | | | WIP=Corey Hulen2015-10-211-0/+21
| * | | | | | Merge pull request #1129 from mattermost/PLT-44Corey Hulen2015-10-2288-477/+644
| |\ \ \ \ \ \
| | * | | | | | Fixing merge=Corey Hulen2015-10-221-1/+1
| | * | | | | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-223-41/+87
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Create API.mdit332015-10-221-0/+35
| * | | | | | | Merge pull request #1138 from rgarmsen2295/plt-777Harrison Healey2015-10-222-41/+52
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fixed typos in create_post.jsx resizing codeReed Garmsen2015-10-212-13/+11
| | * | | | | | Changed post list resize code to use react state; fixed various eslint warningsReed Garmsen2015-10-211-38/+51
| | | |/ / / / | | |/| | | |
| | | * | | | Fixing code review issues=Corey Hulen2015-10-223-6/+5
| | | * | | | Fixing group code review issues=Corey Hulen2015-10-223-4/+5
| | | * | | | Addressing issues from group code review=Corey Hulen2015-10-223-28/+29
| | | * | | | Fixing merge conflict=Corey Hulen2015-10-2231-119/+577
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | * | | | Fixing admin console=Corey Hulen2015-10-202-2/+2
| | | * | | | fixing eslint errors=Corey Hulen2015-10-205-3/+5
| | | * | | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-2032-156/+777
| | | |\| | |
| | | * | | | Multi-session login=Corey Hulen2015-10-2026-108/+143
| | | * | | | Adding multi-session cookie=Corey Hulen2015-10-208-94/+78
| | | * | | | Fixing merge conflicts=Corey Hulen2015-10-1928-115/+1623
| | | |\ \ \ \
| | | * | | | | Fixing merge issue=Corey Hulen2015-10-191-8/+3
| | | * | | | | Merging from master=Corey Hulen2015-10-1942-403/+602
| | | |\ \ \ \ \
| | | * | | | | | Refactoring web classes to use multi-session=Corey Hulen2015-10-164-94/+138
| | | * | | | | | Fixing merge=Corey Hulen2015-10-1637-165/+642
| | | |\ \ \ \ \ \
| | | * | | | | | | Inital support for multi-tab loging=Corey Hulen2015-10-1664-300/+396
* | | | | | | | | | Updating lattermost icon sizeAsaad Mahmood2015-10-223-0/+0
* | | | | | | | | | Updating mattermost logoAsaad Mahmood2015-10-227-2/+2
* | | | | | | | | | Updating disabled form controlAsaad Mahmood2015-10-221-0/+1
* | | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-227-28/+87
|/ / / / / / / / /
* | | | | | | | | Update Troubleshooting.mdit332015-10-221-3/+7
* | | | | | | | | Merge pull request #1141 from hmhealey/plt521bHarrison Healey2015-10-223-2/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Changed markdown renderer to only parse emoticons twicehmhealey2015-10-222-1/+15