summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Moved logic for searching for posts by multiple users/channels into the sql q...hmhealey2015-10-263-49/+73
* Changed post searching to allow searching by multiple users/channelshmhealey2015-10-236-75/+159
* 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
* | Update Troubleshooting.mdit332015-10-221-3/+7
* | Merge pull request #1141 from hmhealey/plt521bHarrison Healey2015-10-223-2/+16
|\ \
| * | 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
* | | Merge pull request #1094 from trashcan/slash-shrugJoram Wilander2015-10-221-0/+29
|\ \ \
| * | | 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
|\ \ \
| * | | 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-216-4/+161
|/ / /
* | | Create Search.mdit332015-10-211-0/+11
* | | Merge pull request #1131 from mattermost/PLT-350Christopher Speller2015-10-219-24/+64
|\ \ \
| * | | 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
|\ \ \ | |/ / |/| |
| * | 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
* | | | Merge pull request #1127 from mattermost/formatting-tweaksCorey Hulen2015-10-201-46/+45
|\ \ \ \
| * | | | Minor formatting adjustmentsit332015-10-201-46/+45
|/ / / /
* | | | Merge pull request #1126 from mattermost/upgrade-guideit332015-10-201-0/+16
|\ \ \ \
| * | | | Create Upgrade-Guide.mdit332015-10-201-0/+16
* | | | | Merge branch 'release-1.1.0'Christopher Speller2015-10-205-9/+189
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #1125 from mattermost/changelog-updateChristopher Speller2015-10-201-4/+169
| |\ \ \ \
| | * | | | Update CHANGELOG.mdit332015-10-201-4/+169
| |/ / / /
| * | | | Merge pull request #1115 from mattermost/salt-fixChristopher Speller2015-10-201-8/+8
| |\ \ \ \
| | * | | | Allowing salts longer than 32 chars=Corey Hulen2015-10-191-8/+8
| * | | | | Merge pull request #1119 from mattermost/fix-db-upgradeHarrison Healey2015-10-203-1/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Hotfix to allow .7 to be upgraded to 1.1=Corey Hulen2015-10-203-1/+19
| |/ / / /