summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-276-2/+434
|\ | | | | PLT-25 adding stats to admin console
| * 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-822 Refactoring post_store into post_store and search_store
| * | | | | Refactoring post_store into post_store and search_storeChristopher Speller2015-10-269-139/+197
| | | | | |
* | | | | | Merge pull request #1197 from rgarmsen2295/plt-166Christopher Speller2015-10-271-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-166 Fixed issue with missing help text for @all and @channel in mention list
| * | | | | | 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 styling to channel member popover
| * | | | | | | 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
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | this also handles the case where user_name having '_'
* | | | | | Merge pull request #1178 from mattermost/update-web-socket-helpCorey Hulen2015-10-262-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update web socket help
| * | | | | Update helpit332015-10-251-1/+1
| | | | | |
| * | | | | Update websocket errorit332015-10-251-1/+1
| | |_|_|/ | |/| | | | | | | | Getting this error when websockets is properly configured and connection is just slow
* | | | | Merge pull request #1193 from hmhealey/plt798Corey Hulen2015-10-262-3/+9
|\ \ \ \ \ | | | | | | | | | | | | PLT-798 Prevent image files larger than 4k resolution from being uploaded
| * | | | | Fixed file upload and profile picture upload error display to work for ↵hmhealey2015-10-262-3/+9
| | |/ / / | |/| | | | | | | | | | | | | serverside errors
* | | | | Merge pull request #1191 from mattermost/PLT-564Joram Wilander2015-10-261-12/+0
|\ \ \ \ \ | | | | | | | | | | | | PLT-564 removing auto-hide from error bar
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-762 Fix error message on leaving channel
| * | | | | | Fix error message on leaving channelJoramWilander2015-10-263-3/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1173 from florianorben/PLT-642Corey Hulen2015-10-261-13/+51
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | PLT-642: Browser tab alerts
| * | | | | 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 ↵Harrison Healey2015-10-261-14/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | trashcan/github-1130-handle-trailing-characters-after-user Handle trailing characters after user
| * | | | 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-266-1/+201
|\ \ \ \ \ | | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks
| * | | | | Add java and ini languageFlorian Orben2015-10-242-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common
| * | | | | fix markup if code is of unknown languageFlorian Orben2015-10-241-1/+1
| | | | | |
| * | | | | code style theme chooserFlorian Orben2015-10-244-1/+110
| | | | | |
| * | | | | highlight code in markdown blocksFlorian Orben2015-10-243-0/+85
| | |/ / / | |/| | |
* | | | | Merge pull request #1183 from girishso/strip-extra-sHarrison Healey2015-10-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | strip extra hyphens from urls
| * | | | | strips extra hiphens from channel urlGirish S2015-10-261-0/+1
| |/ / / /
* | | | | Merge pull request #1181 from girishso/star-search2Christopher Speller2015-10-262-3/+10
|\ \ \ \ \ | | | | | | | | | | | | PLT-747: Allow search results to match portions of words
| * | | | | 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
|/ / / / | | | | | | | | | | | | resolves #827
* | | | Merge pull request #1168 from rgarmsen2295/plt-816Corey Hulen2015-10-243-16/+13
|\ \ \ \ | | | | | | | | | | PLT-816 Fixed various React warnings during the team signup process
| * | | | Fixed various React warnings during the team signup processReed Garmsen2015-10-233-16/+13
| | | | |