summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1103 from florianorben/PLT-751Harrison Healey2015-10-212-3/+34
|\ | | | | PLT-751: Enable arrow to edit posts in comment threads
| * Allow to update root comment in RHS via arrow up shortcutFlorian Orben2015-10-191-1/+1
| |
| * PLT-751: Enable arrow to edit posts in comment threadsFlorian Orben2015-10-192-3/+34
| |
* | Merge pull request #1120 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-201-3/+13
|\ \ | | | | | | PLT-318 - Updating files overlay design
| * | PLT-318 - Updating files overlay designAsaad Mahmood2015-10-201-3/+13
| | |
* | | Merge pull request #1100 from girishso/wink_emojiJoram Wilander2015-10-201-0/+1
|\ \ \ | | | | | | | | PLT-699: translate ;) to wink emoji
| * | | translate ;) to wink emojiGirish S2015-10-181-0/+1
| | | |
* | | | Handle window resize events in React wayAntti Ahti2015-10-206-34/+95
| |/ / |/| | | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html
* | | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-192-7/+8
|\ \ \ | |_|/ |/| | Ui improvements
| * | Updating direct messages titleAsaad Mahmood2015-10-191-1/+1
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1911-162/+251
| |\ \ | | | | | | | | | | | | ui-improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-192-6/+7
| | | |
* | | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-196-28/+420
|\ \ \ \ | |_|/ / |/| | | PLT-235 Implement outgoing webhooks.
| * | | Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| | | |
| * | | Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-192-9/+6
| | | |
| * | | Implement outgoing webhooks.JoramWilander2015-10-195-5/+396
| | |/ | |/|
* | | 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
| * 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
| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 08:41:57 +0000