summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* 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-221-7/+20
* | | Fixing merge conflict=Corey Hulen2015-10-2211-34/+333
|\| |
| * | 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-211-3/+17
| * | Add stop button to stop animated gifsFlorian Orben2015-10-213-42/+106
| * | Horizontally align images if image height > image widthFlorian Orben2015-10-211-3/+15
| * | PLT-616: Enable playing of animated GIF in thumbnails and previewFlorian Orben2015-10-213-4/+120
| * | 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-201-3/+13
| |\ \
| | * | PLT-318 - Updating files overlay designAsaad Mahmood2015-10-201-3/+13
* | | | 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-208-41/+104
|\| | |
| * | | 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-206-34/+95
| | |/ / | |/| |
| * | | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-192-7/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Updating direct messages titleAsaad Mahmood2015-10-191-1/+1
| | * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1911-162/+251
| | |\ \
| | * | | Multiple UI ImprovementsAsaad Mahmood2015-10-192-6/+7
* | | | | Multi-session login=Corey Hulen2015-10-2020-29/+43
* | | | | Adding multi-session cookie=Corey Hulen2015-10-201-8/+8
* | | | | Fixing merge conflicts=Corey Hulen2015-10-197-29/+422
|\| | | |
| * | | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-196-28/+420
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| | * | | Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-192-9/+6
| | * | | Implement outgoing webhooks.JoramWilander2015-10-195-5/+396
| | | |/ | | |/|
* | | | Merging from master=Corey Hulen2015-10-1926-314/+460
|\| | |
| * | | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-196-152/+230
| |\ \ \
| | * | | Remove unnecessary bindJoramWilander2015-10-161-1/+0
| | * | | Fix typing socket constantJoramWilander2015-10-162-3/+3
| | * | | Small refactor of websocket code on client and serverJoramWilander2015-10-166-150/+229
| * | | | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updating scroll on admin consoleAsaad Mahmood2015-10-191-0/+3