summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2015-10-221-1/+1
* Merge branch 'master' into PLT-44=Corey Hulen2015-10-222-41/+52
|\
| * Merge pull request #1138 from rgarmsen2295/plt-777Harrison Healey2015-10-222-41/+52
| |\
| | * Fixed typos in create_post.jsx resizing codeReed Garmsen2015-10-212-13/+11
| | * Changed post list resize code to use react state; fixed various eslint warningsReed Garmsen2015-10-211-38/+51
* | | Fixing group code review issues=Corey Hulen2015-10-221-2/+2
* | | Addressing issues from group code review=Corey Hulen2015-10-222-8/+20
* | | Fixing merge conflict=Corey Hulen2015-10-2218-47/+446
|\| |
| * | 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
| * | Change stop symbol to another one since chrome-win can't display itFlorian Orben2015-10-212-2/+2
| * | apply portrait/landscape/quadrat format to playing gif to always display it i...Florian Orben2015-10-212-4/+23
| * | always show stop gif button on small screen sizesFlorian Orben2015-10-211-0/+4
| * | Add stop button to stop animated gifsFlorian Orben2015-10-215-44/+123
| * | Horizontally align images if image height > image widthFlorian Orben2015-10-212-3/+16
| * | PLT-616: Enable playing of animated GIF in thumbnails and previewFlorian Orben2015-10-215-4/+151
| * | Merge pull request #1131 from mattermost/PLT-350Christopher Speller2015-10-212-4/+40
| |\ \
| | * | PLT-350 allow ability to disable restricted team names=Corey Hulen2015-10-202-4/+40
| | |/
| * | Merge pull request #1103 from florianorben/PLT-751Harrison Healey2015-10-212-3/+34
| |\ \ | | |/ | |/|
| | * 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-206-16/+70
| |\ \
| | * | Updating btn-close size for direct messages on mobile devices.Asaad Mahmood2015-10-201-0/+3
| | * | Removing logo email copy fileAsaad Mahmood2015-10-201-0/+0
| | * | Updating custom themes input addonAsaad Mahmood2015-10-201-1/+1
| | * | Adding background transparent for theme inputsAsaad Mahmood2015-10-201-0/+3
| | * | PLT-318 - Updating files overlay designAsaad Mahmood2015-10-206-16/+64
* | | | Fixing admin console=Corey Hulen2015-10-202-2/+2
* | | | fixing eslint errors=Corey Hulen2015-10-205-3/+5
* | | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-2011-46/+110
|\| | |
| * | | Merge pull request #1100 from girishso/wink_emojiJoram Wilander2015-10-201-0/+1
| |\ \ \
| | * | | translate ;) to wink emojiGirish S2015-10-181-0/+1
| * | | | Merge pull request #1084 from apaatsio/handle-window-resize-properlyJoram Wilander2015-10-206-34/+95
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Handle window resize events in React wayAntti Ahti2015-10-206-34/+95
| * | | | Changed all goroutine functions to use '...AndForget' as the standard naming ...Reed Garmsen2015-10-191-2/+2
| |/ / /
| * | | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-194-10/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Updating direct messages titleAsaad Mahmood2015-10-191-1/+1
| | * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1913-163/+262
| | |\ \
| | * | | Multiple UI ImprovementsAsaad Mahmood2015-10-194-9/+11
* | | | | Multi-session login=Corey Hulen2015-10-2022-39/+55
* | | | | Adding multi-session cookie=Corey Hulen2015-10-203-45/+24
* | | | | Fixing merge conflicts=Corey Hulen2015-10-199-61/+435
|\| | | |
| * | | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-198-61/+430
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Generalized webhook post code and added it to outgoing webhooksJoramWilander2015-10-191-33/+6
| | * | | Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55