summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* adding arrow notation=Corey Hulen2015-10-261-1/+1
* Merge branch 'master' into PLT-25=Corey Hulen2015-10-2625-127/+457
|\
| * Merge pull request #1194 from mattermost/webhook-requestCorey Hulen2015-10-261-7/+7
| |\
| | * Parse incoming webhook requsets into model instead of string mapJoramWilander2015-10-261-7/+7
| * | 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
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed file upload and profile picture upload error display to work for server...hmhealey2015-10-262-3/+9
| * | | Merge pull request #1191 from mattermost/PLT-564Joram Wilander2015-10-261-12/+0
| |\ \ \
| | * | | PLT-564 removing auto-hide from error bar=Corey Hulen2015-10-261-12/+0
| * | | | Merge pull request #1189 from mattermost/plt-762Joram Wilander2015-10-263-3/+4
| |\ \ \ \
| | * | | | Fix error message on leaving channelJoramWilander2015-10-263-3/+4
| | | |/ / | | |/| |
| * | | | Merge pull request #1173 from florianorben/PLT-642Corey Hulen2015-10-261-13/+51
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | rename methods and varibles to a more meaningful nameFlorian Orben2015-10-261-12/+13
| | * | | PLT-642: Browser tab alertsFlorian Orben2015-10-261-12/+49
| | |/ /
| * | | rename getTypingText to updateTypingText and set component's state in itFlorian Orben2015-10-261-10/+16
| * | | use constant value to check if to send a typing event for commentsFlorian Orben2015-10-261-1/+1
| * | | PLT-703: Support multiple users being shown as typing underneath input boxes.Florian Orben2015-10-263-17/+35
| |/ /
| * | 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-2613-1/+219
| |\ \ \
| | * | | 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-249-2/+111
| | * | | highlight code in markdown blocksFlorian Orben2015-10-246-0/+103
| | | |/ | | |/|
| * | | 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
| | |/ /
| * | | Merge pull request #1181 from girishso/star-search2Christopher Speller2015-10-262-3/+10
| |\ \ \
| | * | | made eslint happyGirish S2015-10-262-6/+8
| | * | | append * to search query if not present and highlight partial matchesGirish S2015-10-262-2/+7
| | |/ /
| * / / Mattermost can not send message start with slashFlorian Orben2015-10-251-51/+64
| |/ /
* | | PLT-25 adding stats to admin console=Corey Hulen2015-10-262-68/+77
* | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2526-141/+564
|\| |
| * | Merge pull request #1168 from rgarmsen2295/plt-816Corey Hulen2015-10-243-16/+13
| |\ \
| | * | Fixed various React warnings during the team signup processReed Garmsen2015-10-233-16/+13
| * | | Fixed react warning in more_direct_channels.jsxReed Garmsen2015-10-231-1/+1
| * | | Fixed react warnings in channel_notifications.jsxReed Garmsen2015-10-231-15/+9
| * | | Fixed react warning for the search bar tooltipReed Garmsen2015-10-231-0/+1
| |/ /
| * | Merge pull request #1133 from hmhealey/plt718Corey Hulen2015-10-235-6/+344
| |\ \
| | * | Added keyboard selection to search autocompletehmhealey2015-10-235-46/+166
| | * | Added styling to search autocompletehmhealey2015-10-232-1/+41
| | * | Added an autocomplete dropdown to the search barhmhealey2015-10-233-0/+178
| * | | Updating indentation for settingsAsaad Mahmood2015-10-231-1/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-233-5/+5
| |\| |
| | * | Merge pull request #1160 from mattermost/force-last-viewedChristopher Speller2015-10-232-3/+3
| | |\ \
| | | * | Force updating last viewed at for new postsJoramWilander2015-10-232-3/+3
| | * | | Fixing issue with saving/getting drafts=Corey Hulen2015-10-231-2/+2
| | |/ /