summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2015-10-221-1/+1
|
* Merge branch 'master' into PLT-44=Corey Hulen2015-10-223-41/+87
|\
| * Create API.mdit332015-10-221-0/+35
| |
| * Merge pull request #1138 from rgarmsen2295/plt-777Harrison Healey2015-10-222-41/+52
| |\ | | | | | | PLT-777 Convert window resizing in post_list.jsx to React based implementation
| | * 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 code review issues=Corey Hulen2015-10-223-6/+5
| | |
* | | Fixing group code review issues=Corey Hulen2015-10-223-4/+5
| | |
* | | Addressing issues from group code review=Corey Hulen2015-10-223-28/+29
| | |
* | | Fixing merge conflict=Corey Hulen2015-10-2231-119/+577
|\| |
| * | Update Troubleshooting.mdit332015-10-221-3/+7
| | |
| * | Merge pull request #1141 from hmhealey/plt521bHarrison Healey2015-10-223-2/+16
| |\ \ | | | | | | | | PLT-521 Changed markdown renderer to only parse emoticons twice
| | * | 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
| | | |
| * | | Merge pull request #1094 from trashcan/slash-shrugJoram Wilander2015-10-221-0/+29
| |\ \ \ | | | | | | | | | | Add a /shrug command
| | * | | Add a /shrug commandPat Lathem2015-10-161-0/+29
| | | | |
| * | | | Update Upgrade-Guide.mdit332015-10-211-1/+1
| | | | |
| * | | | Update Upgrade-Guide.mdit332015-10-211-3/+5
| | |_|/ | |/| |
| * | | Merge pull request #1098 from florianorben/PLT-616Harrison Healey2015-10-217-21/+293
| |\ \ \ | | | | | | | | | | PLT-616: Enable playing of animated GIF in thumbnails and preview
| | * | | 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 ↵Florian Orben2015-10-212-4/+23
| | | | | | | | | | | | | | | | | | | | in best possible way
| | * | | 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-216-4/+161
| |/ / /
| * | | Create Search.mdit332015-10-211-0/+11
| | | |
| * | | Merge pull request #1131 from mattermost/PLT-350Christopher Speller2015-10-219-24/+64
| |\ \ \ | | | | | | | | | | PLT-350 allow ability to disable restricted team names
| | * | | Fixing unit tests=Corey Hulen2015-10-201-4/+4
| | | | |
| | * | | Fixing unit test=Corey Hulen2015-10-201-4/+4
| | | | |
| | * | | PLT-350 allow ability to disable restricted team names=Corey Hulen2015-10-208-16/+56
| | | |/ | | |/|
| * | | Merge pull request #1103 from florianorben/PLT-751Harrison Healey2015-10-212-3/+34
| |\ \ \ | | |/ / | |/| | PLT-751: Enable arrow to edit posts in comment threads
| | * | 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
| |\ \ \ | | | | | | | | | | PLT-318 - Updating files overlay design
| | * | | 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
| | | | |
| * | | | Merge pull request #1127 from mattermost/formatting-tweaksCorey Hulen2015-10-201-46/+45
| |\ \ \ \ | | | | | | | | | | | | Minor formatting adjustments
| | * | | | Minor formatting adjustmentsit332015-10-201-46/+45
| |/ / / /
* | | | | 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-2032-156/+777
|\| | | |
| * | | | Merge pull request #1126 from mattermost/upgrade-guideit332015-10-201-0/+16
| |\ \ \ \ | | | | | | | | | | | | Create Upgrade-Guide.md