summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Collapse)AuthorAgeFilesLines
* 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-201-0/+8
| | | | | | | | | | | | 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-191-2/+2
|\ \ | | | | | | Ui improvements
| * \ Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-191-0/+12
| |\ \ | | | | | | | | | | | | ui-improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-191-2/+2
| | |/ | |/|
* | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-192-0/+59
|\ \ \ | |_|/ |/| | PLT-235 Implement outgoing webhooks.
| * | Implement outgoing webhooks.JoramWilander2015-10-192-0/+59
| |/
* | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-191-0/+12
|\ \ | |/ |/| PLT-554 Small refactor of websocket code on client and server
| * 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
|/
* Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-162-14/+22
|\ | | | | PLT-638: added display tab under account settings. added 24h time option
| * Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-164-2/+28
| |\ | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| * | 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 load
| * | 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
|/ /
* | Multiple UI ImprovementsAsaad Mahmood2015-10-151-0/+4
| |
* | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-151-0/+12
|\ \ | | | | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
| * | 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
|\ | | | | PLT-322 Updated Direct Messages menu
| * 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
| | | | | | | | This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7.
* | Merge pull request #1026 from asaadmahmoodspin/masterJoram Wilander2015-10-131-0/+1
|\ \ | |/ |/| Fixing code block markdown
| * Fixing code block markdownAsaad Mahmood2015-10-131-0/+1
| |
* | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ | |/ |/| PLT-521 Modified markdown lexer to not break up words written in snake_case
| * 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
|\ | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace
| * 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
|\ \ | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * | 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
| * 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 themes
| * | PLT-522 - Adding option for mentionHighlightLink for themesAsaad Mahmood2015-10-072-4/+16
| |/