summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #1238 from girishso/webhook-creator-notifsCorey Hulen2015-10-301-1/+1
|\
| * display webhook notifications to the creator of webhookGirish S2015-10-301-1/+1
* | Merge pull request #1236 from girishso/webhook-notificationCorey Hulen2015-10-301-1/+3
|\ \
| * | Show usernames overridden by Incoming Webhooks in notification messages.Girish S2015-10-301-1/+3
| |/
* | Merge pull request #1211 from mattermost/PLT-340Joram Wilander2015-10-3013-57/+495
|\ \
| * | Adding error when enabling team dir without global prop being set.=Corey Hulen2015-10-291-2/+9
| * | Moving single team redirect to backend=Corey Hulen2015-10-281-6/+0
| * | Merge branch 'master' into PLT-340=Corey Hulen2015-10-283-12/+10
| |\ \
| * | | Removing console.log=Corey Hulen2015-10-271-2/+0
| * | | PLT-340=Corey Hulen2015-10-2713-57/+496
* | | | Merge pull request #1220 from florianorben/PLT-395Harrison Healey2015-10-307-2/+213
|\ \ \ \
| * | | | allow code theme to be shareableFlorian Orben2015-10-292-2/+7
| * | | | use XML syntax highlighting if provided language is htmlFlorian Orben2015-10-291-4/+10
| * | | | escape user inputFlorian Orben2015-10-291-2/+2
| * | | | Add java and ini languageFlorian Orben2015-10-292-1/+7
| * | | | fix markup if code is of unknown languageFlorian Orben2015-10-291-1/+1
| * | | | code style theme chooserFlorian Orben2015-10-294-1/+110
| * | | | highlight code in markdown blocksFlorian Orben2015-10-293-0/+85
* | | | | Merge pull request #1233 from hmhealey/plt600Christopher Speller2015-10-302-5/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added help text for the channel header and purpose dialogshmhealey2015-10-292-5/+12
| |/ / /
* | | | simplify check if ctrl+enter was pressedFlorian Orben2015-10-292-75/+4
* | | | fix component unmountFlorian Orben2015-10-292-1/+70
* | | | enable ctrl+enter send for edit msg modalFlorian Orben2015-10-291-4/+25
|/ / /
* | | UI ImprovementsAsaad Mahmood2015-10-292-91/+125
* | | Add team type constants.JoramWilander2015-10-291-0/+2
* | | Update town square intro text.JoramWilander2015-10-291-4/+43
* | | 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 #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-2810-137/+320
|\ \ \ \ \
| * | | | | Added ability to see/edit channel purpose in the clienthmhealey2015-10-277-91/+273
| * | | | | Renamed Channel.Description to Channel.Header on the clienthmhealey2015-10-279-61/+62
* | | | | | Multiple UI changesAsaad Mahmood2015-10-298-12/+35
* | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2912-218/+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
| | | |_|/ / | | |/| | |
| * | | | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-286-201/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2817-153/+641
|\| | | |
| * | | | Merge pull request #1210 from mattermost/PLT-25Christopher Speller2015-10-282-10/+4
| |\ \ \ \
| | * | | | PLT-25 fixing issues with stats page=Corey Hulen2015-10-272-10/+4
| | |/ / /
| * / / / Dont display '1 minute ago' timestamps for post posted < than 1 minute agoFlorian Orben2015-10-281-2/+6
| |/ / /
| * | | Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-276-2/+434
| |\ \ \ | | |/ / | |/| |
| | * | adding arrow notation=Corey Hulen2015-10-261-1/+1