summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Merging from master=Corey Hulen2015-10-1922-304/+261
|\
| * Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-194-145/+38
| |\
| | * Fix typing socket constantJoramWilander2015-10-161-2/+2
| | * Small refactor of websocket code on client and serverJoramWilander2015-10-164-143/+36
| * | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
| |\ \
| | * | Updating scroll on admin consoleAsaad Mahmood2015-10-191-0/+3
| * | | Merge pull request #1104 from florianorben/fix_arrow_left_rightHarrison Healey2015-10-191-3/+4
| |\ \ \
| | * | | No longer try to navigate to next/prev image if image preview modal is not openFlorian Orben2015-10-191-3/+4
| * | | | Merge pull request #1102 from florianorben/fix_email_tooltipHarrison Healey2015-10-191-2/+2
| |\ \ \ \
| | * | | | Fixes wrong tooltip on user profileFlorian Orben2015-10-191-2/+2
| | |/ / /
| * | | | Merge pull request #1101 from stasvovk/admin_console_urlsHarrison Healey2015-10-192-3/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | change url when a user navigates between tabs [#962]Stas Vovk2015-10-182-3/+10
| | |/ /
| * | | Updating scroll on LHSAsaad Mahmood2015-10-191-1/+3
| * | | Updating userEntries div to tr tdAsaad Mahmood2015-10-181-1/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-183-10/+15
| |\| |
| | * | Merge pull request #1096 from rgarmsen2295/plt-153Joram Wilander2015-10-171-2/+8
| | |\ \
| | | * | Added proper recognition of android devices in the Active Sessions UIReed Garmsen2015-10-161-2/+8
| | * | | Merge pull request #1097 from rgarmsen2295/plt-693Joram Wilander2015-10-171-1/+6
| | |\ \ \
| | | * | | Fixes back button on username page during team signup when email is turned offReed Garmsen2015-10-161-1/+6
| | | |/ /
| | * / / PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much...Florian Orben2015-10-171-7/+1
| | |/ /
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1610-97/+126
| |\| |
| | * | Fixing some client warningsChristopher Speller2015-10-1611-103/+132
| | |/
| * | Fixing more direct channel modal scrollingAsaad Mahmood2015-10-161-1/+13
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-167-9/+220
| |\|
| * | Multiple UI ImprovementsAsaad Mahmood2015-10-166-43/+47
* | | Fixing merge=Corey Hulen2015-10-1610-15/+284
|\ \ \ | | |/ | |/|
| * | Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-165-0/+198
| |\ \
| | * | Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-1676-550/+1096
| | |\|
| | * | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| | * | added file with display settingsStas Vovk2015-10-141-0/+168
| | * | added display tab under account settings. added 24h time optionStas Vovk2015-10-143-0/+16
| * | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-161-5/+1
| |\ \ \
| | * | | Added an initial call to get all user preferences on page loadhmhealey2015-10-151-5/+1
| * | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-161-4/+21
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix lintAntti Ahti2015-10-151-5/+4
| | * | | Treat teams as an array instead of objectAntti Ahti2015-10-151-8/+5
| | * | | Sort teams by display nameAntti Ahti2015-10-151-1/+19
| | * | | Use team display name in team switcher menuAntti Ahti2015-10-141-5/+8
| | | |/ | | |/|
| * | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-5/+16
| * | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-153-3/+50
* | | | Inital support for multi-tab loging=Corey Hulen2015-10-1626-66/+62
|/ / /
* | | Adding ReactDOM as a globalChristopher Speller2015-10-151-6/+0
* | | Fixing most deprication warningsChristopher Speller2015-10-1569-332/+378
| |/ |/|
* | Removing my navbar popover changes since Chris has already done the popover c...Asaad Mahmood2015-10-151-15/+16
* | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
* | Multiple UI ImprovementsAsaad Mahmood2015-10-1512-71/+86
* | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-152-131/+288
|\ \
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-142-131/+288
| |/
* | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-151-0/+12
|\ \
| * | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploadingFlorian Orben2015-10-141-0/+12
| |/