summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * | | | | 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-266-1/+201
| |\ \ \ \ \
| | * | | | | Add java and ini languageFlorian Orben2015-10-242-1/+7