summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merging from master=Corey Hulen2015-10-1926-314/+460
|\
| * Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-196-152/+230
| |\ | | | | | | PLT-554 Small refactor of websocket code on client and server
| | * Remove unnecessary bindJoramWilander2015-10-161-1/+0
| | |
| | * Fix typing socket constantJoramWilander2015-10-162-3/+3
| | |
| | * Small refactor of websocket code on client and serverJoramWilander2015-10-166-150/+229
| | |
| * | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
| |\ \ | | | | | | | | Updating scroll on admin console
| | * | 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 open
| | * | | 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 profile
| | * | | | Fixes wrong tooltip on user profileFlorian Orben2015-10-191-2/+2
| | |/ / /
| * | | | Merge pull request #1101 from stasvovk/admin_console_urlsHarrison Healey2015-10-193-5/+15
| |\ \ \ \ | | |_|/ / | |/| | | #962: change url when a user navigates between tabs in admin console
| | * | | change url when a user navigates between tabs [#962]Stas Vovk2015-10-183-5/+15
| | |/ /
| * | | 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 ↵Asaad Mahmood2015-10-184-11/+17
| |\| | | | | | | | | | | | | | ui-improvements
| | * | Merge pull request #1090 from jvasallo/masterJoram Wilander2015-10-171-1/+2
| | |\ \ | | | | | | | | | | Updated Email Check Regex to handle some extra cases
| | | * | Updated Email Check Regex to RFC5322 StandardJoel Vasallo2015-10-161-1/+2
| | | | |
| | * | | Merge pull request #1096 from rgarmsen2295/plt-153Joram Wilander2015-10-171-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 UIReed Garmsen2015-10-161-2/+8
| | | |/ /
| | * | | Merge pull request #1097 from rgarmsen2295/plt-693Joram Wilander2015-10-171-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 offReed Garmsen2015-10-161-1/+6
| | | |/ /
| | * / / PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵Florian Orben2015-10-171-7/+1
| | |/ / | | | | | | | | | | | | much room
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1610-97/+126
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx
| | * | 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 ↵Asaad Mahmood2015-10-1613-31/+266
| |\| | | | | | | | | | ui-improvements
| * | Multiple UI ImprovementsAsaad Mahmood2015-10-166-43/+47
| | |
* | | Refactoring web classes to use multi-session=Corey Hulen2015-10-161-3/+4
| | |
* | | Fixing merge=Corey Hulen2015-10-1617-37/+377
|\ \ \ | | |/ | |/|
| * | Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-167-14/+220
| |\ \ | | | | | | | | PLT-638: added display tab under account settings. added 24h time option
| | * | Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-1692-603/+1207
| | |\| | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| | * | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| | | |
| | * | fixed style guide errorStas Vovk2015-10-151-1/+1
| | | |
| | * | added file with display settingsStas Vovk2015-10-141-0/+168
| | | |
| | * | added display tab under account settings. added 24h time optionStas Vovk2015-10-145-14/+38
| | | |
| * | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-165-13/+25
| |\ \ \ | | | | | | | | | | Added an initial call to get all user preferences on page load
| | * | | Added an initial call to get all user preferences on page loadhmhealey2015-10-155-13/+25
| | | | |
| * | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-161-4/+21
| |\ \ \ \ | | |_|_|/ | |/| | | Use display name instead of name in team switcher menu
| | * | | 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
| | | | | | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted.
| | * | | Use team display name in team switcher menuAntti Ahti2015-10-141-5/+8
| | | |/ | | |/| | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu
| * | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix bug where channel_id was not set if update_post ajax was "too fast" - fix bug js error if there is no last post, i.e. empty channel - renamed lastPostId to postId so it has a nicer api to be triggered from everywhere - fix a typo - automatically focus textarea on modal open
| * | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-155-3/+97
| | | |
* | | | Inital support for multi-tab loging=Corey Hulen2015-10-1635-229/+259
|/ / /
* | | Adding ReactDOM as a globalChristopher Speller2015-10-152-6/+1
| | |
* | | Fixing most deprication warningsChristopher Speller2015-10-1579-377/+423
| |/ |/|
* | Removing my navbar popover changes since Chris has already done the popover ↵Asaad Mahmood2015-10-151-15/+16
| | | | | | | | changes in his PR
* | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-17 07:23:08 +0000