summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #1224 from rgarmsen2295/plt-763Joram Wilander2015-10-294-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with refocusing not working after editing a post in the RHSReed Garmsen2015-10-284-2/+4
* | | | | | | | | Merge pull request #1221 from florianorben/disallow_edit_bot_msg_arrow_upJoram Wilander2015-10-291-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat in...Florian Orben2015-10-281-4/+5
* | | | | | | | | | Merge pull request #1218 from hmhealey/underscoresJoram Wilander2015-10-292-37/+77
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated markdown regexes to better handle underscores and linkshmhealey2015-10-282-33/+42
| * | | | | | | | | | Modified markdown lexer to not break up words written in snake_casehmhealey2015-10-282-8/+39
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1226 from mattermost/bug-fixCorey Hulen2015-10-292-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing 200 error bug=Corey Hulen2015-10-292-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1206 from florianorben/post_styleCorey Hulen2015-10-281-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change post paragraphs' line heights and margins for better readabilityFlorian Orben2015-10-281-1/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #1214 from mattermost/outgoing-hook-fixCorey Hulen2015-10-281-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass in iter vars to closure properlyJoramWilander2015-10-281-4/+4
* | | | | | | | | | Merge pull request #1213 from mattermost/plt-836Corey Hulen2015-10-282-27/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent markdown styled links from embedding gifsJoramWilander2015-10-282-27/+43
* | | | | | | | | | | Merge pull request #1199 from hmhealey/plt600Corey Hulen2015-10-2820-200/+534
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added ability to see/edit channel purpose in the clienthmhealey2015-10-278-92/+274
| * | | | | | | | | | | Added Channel.Purpose on the serverhmhealey2015-10-277-7/+155
| * | | | | | | | | | | Renamed Channel.Description to Channel.Header on the clienthmhealey2015-10-2710-62/+63
| * | | | | | | | | | | Renamed Channel.Description to Channel.Header on the serverhmhealey2015-10-278-61/+64
* | | | | | | | | | | | Merge pull request #1219 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-2818-155/+188
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Multiple UI changesAsaad Mahmood2015-10-2914-59/+86
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2919-236/+236
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1196 from florianorben/send-on-ctrlJoram Wilander2015-10-287-17/+235
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add new user-setting section 'advanced' and remove ctrl-send setting from gen...Florian Orben2015-10-287-101/+202
| * | | | | | | | | | | | allow messages to be send on ctrl+enterFlorian Orben2015-10-283-17/+134
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1216 from mattermost/revert-1170-PLT-395Christopher Speller2015-10-2813-219/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-2813-219/+1
|/ / / / / / / / / / /
| | * | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2836-207/+1437
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1210 from mattermost/PLT-25Christopher Speller2015-10-284-11/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | PLT-25 fixing issues with stats page=Corey Hulen2015-10-274-11/+10
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1187 from mattermost/code-contribution-guidelines-updateChristopher Speller2015-10-282-47/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-271-1/+1
| * | | | | | | | | | | Fixing linkit332015-10-261-1/+1
| * | | | | | | | | | | Update CONTRIBUTING.mdit332015-10-261-1/+1
| * | | | | | | | | | | Update CONTRIBUTING.mdit332015-10-261-16/+12
| * | | | | | | | | | | Update CONTRIBUTING.mdit332015-10-261-1/+1
| * | | | | | | | | | | Update CONTRIBUTING.mdit332015-10-261-1/+4
| * | | | | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-261-44/+1
| * | | | | | | | | | | Update CONTRIBUTING.mdit332015-10-261-3/+49
* | | | | | | | | | | | Merge pull request #1205 from florianorben/fix-relative-timeJoram Wilander2015-10-281-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Dont display '1 minute ago' timestamps for post posted < than 1 minute agoFlorian Orben2015-10-281-2/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Typo fixit332015-10-271-1/+1
* | | | | | | | | | | Adding "Solution" sections to guideit332015-10-271-2/+5
* | | | | | | | | | | Update Troubleshooting.mdit332015-10-271-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Update Administration.mdit332015-10-271-0/+7
* | | | | | | | | | Update Troubleshooting.mdit332015-10-271-5/+0
* | | | | | | | | | Update Outgoing-Webhooks.mdit332015-10-271-1/+1
* | | | | | | | | | Update Outgoing-Webhooks.mdit332015-10-271-0/+2
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-2719-3/+1144
|\ \ \ \ \ \ \ \ \