summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-298-93/+234
|\
| * Merge pull request #1196 from florianorben/send-on-ctrlJoram Wilander2015-10-286-16/+233
| |\
| | * add new user-setting section 'advanced' and remove ctrl-send setting from gen...Florian Orben2015-10-286-100/+200
| | * 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-282-77/+1
* | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2812-39/+451
|\| |
| * | PLT-25 fixing issues with stats page=Corey Hulen2015-10-272-10/+4
| |/
| * Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-274-1/+418
| |\
| | * Merge branch 'master' into PLT-25=Corey Hulen2015-10-269-99/+250
| | |\
| | * | PLT-25 adding stats to admin console=Corey Hulen2015-10-262-68/+77
| | * | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2514-115/+412
| | |\ \
| | * | | PLT-25 adding analytics panel=Corey Hulen2015-10-232-12/+228
| | * | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2346-183/+332
| | |\ \ \
| | * | | | Adding post counts by days=Corey Hulen2015-10-221-3/+37
| | * | | | Adding analytics tab=Corey Hulen2015-10-223-1/+159
| * | | | | Merge pull request #1195 from mattermost/plt-822Corey Hulen2015-10-277-28/+29
| |\ \ \ \ \
| | * | | | | Refactoring post_store into post_store and search_storeChristopher Speller2015-10-267-28/+29
* | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2717-204/+708
|\| | | | | |
| * | | | | | 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
| | | |_|_|_|/ | | |/| | | |
| * | | | | | add helper method to initiate a direct channel chatFlorian Orben2015-10-262-87/+24
| * | | | | | use 'Overlay' instead if 'OverlayTrigger'Florian Orben2015-10-261-22/+28
| * | | | | | Add some to channel member popoverFlorian Orben2015-10-261-2/+132
| |/ / / / /
| * | | | | 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 #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-262-17/+34
| |/ / / /
| * | | | Merge pull request #1170 from florianorben/PLT-395Harrison Healey2015-10-262-1/+77
| |\ \ \ \
| | * | | | code style theme chooserFlorian Orben2015-10-242-1/+77
| | | |_|/ | | |/| |
| * | | | Merge pull request #1181 from girishso/star-search2Christopher Speller2015-10-261-1/+8
| |\ \ \ \
| | * | | | made eslint happyGirish S2015-10-261-3/+6
| | * | | | append * to search query if not present and highlight partial matchesGirish S2015-10-261-0/+4
| | |/ / /
| * / / / Mattermost can not send message start with slashFlorian Orben2015-10-251-51/+64
| |/ / /
| * | | 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-232-5/+288
| |\ \ \
| | * | | Added keyboard selection to search autocompletehmhealey2015-10-232-44/+151
| | * | | Added styling to search autocompletehmhealey2015-10-231-1/+11
| | * | | Added an autocomplete dropdown to the search barhmhealey2015-10-232-0/+166
| | | |/ | | |/|
* | / | Oauth UI Improvements and settings improvementAsaad Mahmood2015-10-234-69/+75
|/ / /
* | | Updating indentation for settingsAsaad Mahmood2015-10-231-1/+1