Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1141 from hmhealey/plt521b | Harrison Healey | 2015-10-22 | 3 | -2/+16 |
|\ | |||||
| * | Changed markdown renderer to only parse emoticons twice | hmhealey | 2015-10-22 | 2 | -1/+15 |
| * | Fixed improperly quoted html attributes for emoticons | hmhealey | 2015-10-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1135 from trashcan/PLT-521 | Harrison Healey | 2015-10-22 | 1 | -2/+4 |
|\ | |||||
| * | Pass eslint tests | Pat Lathem | 2015-10-21 | 1 | -3/+3 |
| * | Missing semicolon | Pat Lathem | 2015-10-21 | 1 | -1/+1 |
| * | Remove stray emoticons.jsx import | Pat Lathem | 2015-10-21 | 1 | -1/+0 |
| * | Add a call to doFormatText inside of the markdown paragraph handler | Pat Lathem | 2015-10-21 | 1 | -0/+3 |
* | | Merge pull request #1094 from trashcan/slash-shrug | Joram Wilander | 2015-10-22 | 1 | -0/+29 |
|\ \ | |||||
| * | | Add a /shrug command | Pat Lathem | 2015-10-16 | 1 | -0/+29 |
* | | | Update Upgrade-Guide.md | it33 | 2015-10-21 | 1 | -1/+1 |
* | | | Update Upgrade-Guide.md | it33 | 2015-10-21 | 1 | -3/+5 |
* | | | Merge pull request #1098 from florianorben/PLT-616 | Harrison Healey | 2015-10-21 | 7 | -21/+293 |
|\ \ \ | |||||
| * | | | Change stop symbol to another one since chrome-win can't display it | Florian Orben | 2015-10-21 | 2 | -2/+2 |
| * | | | apply portrait/landscape/quadrat format to playing gif to always display it i... | Florian Orben | 2015-10-21 | 2 | -4/+23 |
| * | | | always show stop gif button on small screen sizes | Florian Orben | 2015-10-21 | 1 | -0/+4 |
| * | | | Add stop button to stop animated gifs | Florian Orben | 2015-10-21 | 5 | -44/+123 |
| * | | | Horizontally align images if image height > image width | Florian Orben | 2015-10-21 | 2 | -3/+16 |
| * | | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 6 | -4/+161 |
|/ / / | |||||
* | | | Create Search.md | it33 | 2015-10-21 | 1 | -0/+11 |
* | | | Merge pull request #1131 from mattermost/PLT-350 | Christopher Speller | 2015-10-21 | 9 | -24/+64 |
|\ \ \ | |||||
| * | | | Fixing unit tests | =Corey Hulen | 2015-10-20 | 1 | -4/+4 |
| * | | | Fixing unit test | =Corey Hulen | 2015-10-20 | 1 | -4/+4 |
| * | | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 8 | -16/+56 |
| | |/ | |/| | |||||
* | | | Merge pull request #1103 from florianorben/PLT-751 | Harrison Healey | 2015-10-21 | 2 | -3/+34 |
|\ \ \ | |/ / |/| | | |||||
| * | | Allow to update root comment in RHS via arrow up shortcut | Florian Orben | 2015-10-19 | 1 | -1/+1 |
| * | | PLT-751: Enable arrow to edit posts in comment threads | Florian Orben | 2015-10-19 | 2 | -3/+34 |
* | | | Merge pull request #1120 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-20 | 6 | -16/+70 |
|\ \ \ | |||||
| * | | | Updating btn-close size for direct messages on mobile devices. | Asaad Mahmood | 2015-10-20 | 1 | -0/+3 |
| * | | | Removing logo email copy file | Asaad Mahmood | 2015-10-20 | 1 | -0/+0 |
| * | | | Updating custom themes input addon | Asaad Mahmood | 2015-10-20 | 1 | -1/+1 |
| * | | | Adding background transparent for theme inputs | Asaad Mahmood | 2015-10-20 | 1 | -0/+3 |
| * | | | PLT-318 - Updating files overlay design | Asaad Mahmood | 2015-10-20 | 6 | -16/+64 |
* | | | | Merge pull request #1127 from mattermost/formatting-tweaks | Corey Hulen | 2015-10-20 | 1 | -46/+45 |
|\ \ \ \ | |||||
| * | | | | Minor formatting adjustments | it33 | 2015-10-20 | 1 | -46/+45 |
|/ / / / | |||||
* | | | | Merge pull request #1126 from mattermost/upgrade-guide | it33 | 2015-10-20 | 1 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | Create Upgrade-Guide.md | it33 | 2015-10-20 | 1 | -0/+16 |
* | | | | | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-20 | 5 | -9/+189 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge pull request #1125 from mattermost/changelog-update | Christopher Speller | 2015-10-20 | 1 | -4/+169 |
| |\ \ \ \ | |||||
| | * | | | | Update CHANGELOG.md | it33 | 2015-10-20 | 1 | -4/+169 |
| |/ / / / | |||||
| * | | | | Merge pull request #1115 from mattermost/salt-fix | Christopher Speller | 2015-10-20 | 1 | -8/+8 |
| |\ \ \ \ | |||||
| | * | | | | Allowing salts longer than 32 chars | =Corey Hulen | 2015-10-19 | 1 | -8/+8 |
| * | | | | | Merge pull request #1119 from mattermost/fix-db-upgrade | Harrison Healey | 2015-10-20 | 3 | -1/+19 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Hotfix to allow .7 to be upgraded to 1.1 | =Corey Hulen | 2015-10-20 | 3 | -1/+19 |
| |/ / / / | |||||
* | | | | | Merge pull request #1100 from girishso/wink_emoji | Joram Wilander | 2015-10-20 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | translate ;) to wink emoji | Girish S | 2015-10-18 | 1 | -0/+1 |
* | | | | | | Merge pull request #1116 from sharms/master | Joram Wilander | 2015-10-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed missing colon | Steven Harms | 2015-10-19 | 1 | -1/+1 |
* | | | | | | | Merge pull request #1084 from apaatsio/handle-window-resize-properly | Joram Wilander | 2015-10-20 | 6 | -34/+95 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 6 | -34/+95 |