summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* code style theme chooserFlorian Orben2015-10-294-1/+110
* highlight code in markdown blocksFlorian Orben2015-10-293-0/+85
* 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
| | * | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2617-120/+432
| | |\ \
| | * | | PLT-25 adding stats to admin console=Corey Hulen2015-10-262-68/+77
| | * | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2520-124/+437
| | |\ \ \
| | * | | | PLT-25 adding analytics panel=Corey Hulen2015-10-233-13/+230
| | * | | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2359-394/+601
| | |\ \ \ \
| | * | | | | Adding post counts by days=Corey Hulen2015-10-221-3/+37
| | * | | | | Adding analytics tab=Corey Hulen2015-10-224-1/+173
| * | | | | | Merge pull request #1195 from mattermost/plt-822Corey Hulen2015-10-279-139/+197
| |\ \ \ \ \ \
| | * | | | | | Refactoring post_store into post_store and search_storeChristopher Speller2015-10-269-139/+197
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2726-229/+962
|\| | | | | |
| * | | | | | Merge pull request #1197 from rgarmsen2295/plt-166Christopher Speller2015-10-271-1/+6
| |\ \ \ \ \ \
| | * | | | | | Fixed issue with missing help text for @all and @channel in mention listReed Garmsen2015-10-261-1/+6
| * | | | | | | Merge pull request #1174 from florianorben/member-popoverChristopher Speller2015-10-273-67/+182
| |\ \ \ \ \ \ \
| | * | | | | | | add helper method to initiate a direct channel chatFlorian Orben2015-10-263-87/+66
| | * | | | | | | use 'Overlay' instead if 'OverlayTrigger'Florian Orben2015-10-261-22/+28
| | * | | | | | | Add some to channel member popoverFlorian Orben2015-10-261-2/+132
| | |/ / / / / /
| * | | | | | / auto-link mentions with user names having symbolsGirish S2015-10-272-4/+15
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #1178 from mattermost/update-web-socket-helpCorey Hulen2015-10-262-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update helpit332015-10-251-1/+1
| | * | | | | Update websocket errorit332015-10-251-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #1193 from hmhealey/plt798Corey Hulen2015-10-262-3/+9
| |\ \ \ \ \