summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into PLT-25=Corey Hulen2015-10-235-57/+61
|\
| * Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-235-44/+52
| |\ | | | | | | | | | ui-improvements
| | * Merge pull request #1150 from hmhealey/plt689Corey Hulen2015-10-221-28/+28
| | |\ | | | | | | | | PLT-689 Fixed handling of whitespace surrounding emoticons
| | | * 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
| | |\|
| | * | Merge branch 'master' into PLT-44=Corey Hulen2015-10-202-2/+11
| | |\ \
| | * | | 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
| | |\ \ \
| | * \ \ \ Merging from master=Corey Hulen2015-10-192-1/+14
| | |\ \ \ \
| | * \ \ \ \ Fixing merge=Corey Hulen2015-10-164-22/+52
| | |\ \ \ \ \
| | * | | | | | Inital support for multi-tab loging=Corey Hulen2015-10-163-13/+13
| | | | | | | |
| * | | | | | | Updating mattermost logoAsaad Mahmood2015-10-221-1/+1
| | | | | | | |
| * | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-222-12/+8
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector
* / | | | | | Adding analytics tab=Corey Hulen2015-10-221-0/+14
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-521: Fix emoji with underscores
| * | | | | | 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 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 19:29:08 +0000