summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Expand)AuthorAgeFilesLines
* Multiple UI changesAsaad Mahmood2015-10-291-0/+2
* Merge pull request #1196 from florianorben/send-on-ctrlJoram Wilander2015-10-281-1/+2
|\
| * add new user-setting section 'advanced' and remove ctrl-send setting from gen...Florian Orben2015-10-281-1/+2
* | Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-283-123/+0
* | 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-271-0/+14
|\
| * adding arrow notation=Corey Hulen2015-10-261-1/+1
| * Merge branch 'master' into PLT-25=Corey Hulen2015-10-266-19/+179
| |\
| * \ Merge branch 'master' into PLT-25=Corey Hulen2015-10-253-6/+8
| |\ \
| * \ \ Merge branch 'master' into PLT-25=Corey Hulen2015-10-235-57/+61
| |\ \ \
| * | | | Adding analytics tab=Corey Hulen2015-10-221-0/+14
* | | | | Merge pull request #1174 from florianorben/member-popoverChristopher Speller2015-10-271-0/+42
|\ \ \ \ \
| * | | | | add helper method to initiate a direct channel chatFlorian Orben2015-10-261-0/+42
* | | | | | 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-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update websocket errorit332015-10-251-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1189 from mattermost/plt-762Joram Wilander2015-10-262-2/+3
|\ \ \ \
| * | | | Fix error message on leaving channelJoramWilander2015-10-262-2/+3
* | | | | PLT-703: Support multiple users being shown as typing underneath input boxes.Florian Orben2015-10-261-0/+1
|/ / / /
* | | | Merge pull request #1171 from trashcan/github-1130-handle-trailing-characters...Harrison Healey2015-10-261-14/+48
|\ \ \ \
| * | | | Fix highlighting of trailing punctuation for own usernamePat Lathem2015-10-251-4/+4
| * | | | Fix off by one errorPat Lathem2015-10-241-7/+7
| * | | | Remove trailing punctuation when parsing @username referencesPat Lathem2015-10-241-13/+47
* | | | | Merge pull request #1170 from florianorben/PLT-395Harrison Healey2015-10-263-0/+123
|\ \ \ \ \
| * | | | | Add java and ini languageFlorian Orben2015-10-242-1/+7
| * | | | | fix markup if code is of unknown languageFlorian Orben2015-10-241-1/+1
| * | | | | code style theme chooserFlorian Orben2015-10-242-0/+33
| * | | | | highlight code in markdown blocksFlorian Orben2015-10-242-0/+84
| | |/ / / | |/| | |
* | | | | Merge pull request #1183 from girishso/strip-extra-sHarrison Healey2015-10-261-0/+1
|\ \ \ \ \
| * | | | | strips extra hiphens from channel urlGirish S2015-10-261-0/+1
| |/ / / /
* | | | | made eslint happyGirish S2015-10-261-3/+2
* | | | | append * to search query if not present and highlight partial matchesGirish S2015-10-261-2/+3
|/ / / /
* | | | Merge pull request #1133 from hmhealey/plt718Corey Hulen2015-10-231-1/+2
|\ \ \ \
| * | | | Added keyboard selection to search autocompletehmhealey2015-10-231-1/+2
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-231-2/+2
|\| | | |
| * | | | Force updating last viewed at for new postsJoramWilander2015-10-231-2/+2
| | |_|/ | |/| |
* | | | Updating nav active bg and Send invitation buttonAsaad Mahmood2015-10-231-0/+1
* | | | Updating bot stylingAsaad Mahmood2015-10-231-1/+1
* | | | Multiple UI ImprovementsAsaad Mahmood2015-10-231-2/+2
|/ / /
* | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-235-44/+52
|\ \ \
| * \ \ Merge pull request #1150 from hmhealey/plt689Corey Hulen2015-10-221-28/+28
| |\ \ \
| | * | | Fixed handling of whitespace surrounding emoticonshmhealey2015-10-221-28/+28
| | | |/ | | |/|
| * | | Fixing group code review issues=Corey Hulen2015-10-221-2/+2
| * | | Fixing merge conflict=Corey Hulen2015-10-224-3/+20
| |\| |
| * | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-202-2/+11
| |\ \ \
| * | | | Multi-session login=Corey Hulen2015-10-202-9/+17
| * | | | Adding multi-session cookie=Corey Hulen2015-10-201-8/+8
| * | | | Fixing merge conflicts=Corey Hulen2015-10-192-0/+59
| |\ \ \ \
| * \ \ \ \ Merging from master=Corey Hulen2015-10-192-1/+14
| |\ \ \ \ \
| * \ \ \ \ \ Fixing merge=Corey Hulen2015-10-164-22/+52
| |\ \ \ \ \ \