summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1150 from hmhealey/plt689Corey Hulen2015-10-221-28/+28
|\
| * Fixed handling of whitespace surrounding emoticonshmhealey2015-10-221-28/+28
* | Fixing group code review issues=Corey Hulen2015-10-221-2/+2
* | Fixing merge conflict=Corey Hulen2015-10-224-3/+20
|\|
| * Changed markdown renderer to only parse emoticons twicehmhealey2015-10-222-1/+15
| * Fixed improperly quoted html attributes for emoticonshmhealey2015-10-221-1/+1
| * Merge pull request #1135 from trashcan/PLT-521Harrison Healey2015-10-221-2/+4
| |\
| | * Pass eslint testsPat Lathem2015-10-211-3/+3
| | * Missing semicolonPat Lathem2015-10-211-1/+1
| | * Remove stray emoticons.jsx importPat Lathem2015-10-211-1/+0
| | * Add a call to doFormatText inside of the markdown paragraph handlerPat Lathem2015-10-211-0/+3
| * | Add stop button to stop animated gifsFlorian Orben2015-10-211-1/+1
| * | PLT-616: Enable playing of animated GIF in thumbnails and previewFlorian Orben2015-10-211-0/+1
| |/
* | Merge branch 'master' into PLT-44=Corey Hulen2015-10-202-2/+11
|\|
| * Merge pull request #1100 from girishso/wink_emojiJoram Wilander2015-10-201-0/+1
| |\
| | * translate ;) to wink emojiGirish S2015-10-181-0/+1
| * | Handle window resize events in React wayAntti Ahti2015-10-201-0/+8
| * | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-2/+2
| |\ \
| | * \ Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-191-0/+12
| | |\ \
| | * | | Multiple UI ImprovementsAsaad Mahmood2015-10-191-2/+2
| | | |/ | | |/|
* | | | Multi-session login=Corey Hulen2015-10-202-9/+17
* | | | Adding multi-session cookie=Corey Hulen2015-10-201-8/+8
* | | | Fixing merge conflicts=Corey Hulen2015-10-192-0/+59
|\| | |
| * | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-192-0/+59
| |\ \ \ | | |_|/ | |/| |
| | * | Implement outgoing webhooks.JoramWilander2015-10-192-0/+59
| | |/
* | | Merging from master=Corey Hulen2015-10-192-1/+14
|\| |
| * | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-191-0/+12
| |\ \ | | |/ | |/|
| | * Fix typing socket constantJoramWilander2015-10-161-1/+1
| | * Small refactor of websocket code on client and serverJoramWilander2015-10-161-0/+12
| * | Updated Email Check Regex to RFC5322 StandardJoel Vasallo2015-10-161-1/+2
| |/
* | Fixing merge=Corey Hulen2015-10-164-22/+52
|\|
| * Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-162-14/+22
| |\
| | * Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-164-2/+28
| | |\
| | * | fixed style guide errorStas Vovk2015-10-151-1/+1
| | * | added display tab under account settings. added 24h time optionStas Vovk2015-10-142-14/+22
| * | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-162-8/+20
| |\ \ \ | | |_|/ | |/| |
| | * | Added an initial call to get all user preferences on page loadhmhealey2015-10-152-8/+20
| * | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-151-0/+10
| |/ /
* / / Inital support for multi-tab loging=Corey Hulen2015-10-163-13/+13
|/ /
* | Multiple UI ImprovementsAsaad Mahmood2015-10-151-0/+4
* | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-151-0/+12
|\ \
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-141-0/+12
| |/
* / Don't auto-add http:// to mailto: and ftp: markdown linksFlorian Orben2015-10-142-2/+2
|/
* Multiple UI ImprovementsAsaad Mahmood2015-10-141-0/+6
* Merge pull request #968 from hmhealey/plt322Harrison Healey2015-10-133-1/+85
|\
| * Removed Preference.AltIdhmhealey2015-10-133-20/+18
| * Fixed edge cases with leaving a direct channel while viewing that channelhmhealey2015-10-131-0/+1
| * Renamed show_hide preference to showhmhealey2015-10-132-3/+7
| * Changed direct messages channels so users can show/hide themhmhealey2015-10-132-0/+37
| * Changed direct channels in the sidebar to be displayed based on user preferenceshmhealey2015-10-133-0/+44
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 15:30:23 +0000