summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Revert "Modified markdown lexer to not break up words written in snake_case"hmhealey2015-10-132-39/+8
* | Merge pull request #1026 from asaadmahmoodspin/masterJoram Wilander2015-10-131-0/+1
|\ \ | |/ |/|
| * Fixing code block markdownAsaad Mahmood2015-10-131-0/+1
* | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ | |/ |/|
| * Modified markdown lexer to not break up words written in snake_casehmhealey2015-10-092-8/+39
* | Multiple UI ImprovementsAsaad Mahmood2015-10-122-3/+6
|/
* Fixed html used for autolinkinghmhealey2015-10-081-1/+1
* Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\
| * Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| * Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| * Switched :p emoticonhmhealey2015-10-081-1/+1
* | Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-086-6/+6
|\ \
| * | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-086-6/+6
| |/
* | Fixing issue with lastIndexOf=Corey Hulen2015-10-082-2/+2
* | Adding removing blank target for browser links=Corey Hulen2015-10-082-2/+7
* | PLT-567 auto join open channels=Corey Hulen2015-10-071-1/+9
|/
* Merge pull request #951 from mattermost/PLT-500Corey Hulen2015-10-071-1/+11
|\
| * PLT-500 fixing connection msg issues=Corey Hulen2015-10-061-1/+11
* | Merge pull request #953 from asaadmahmoodspin/plt-522Christopher Speller2015-10-072-4/+16
|\ \
| * | PLT-522 - Adding option for mentionHighlightLink for themesAsaad Mahmood2015-10-072-4/+16
| |/
* | Removing sidebar text hover colorAsaad Mahmood2015-10-062-14/+1
* | Changing link colour opacity LHSAsaad Mahmood2015-10-061-3/+3