summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into PLT-340=Corey Hulen2015-10-273-8/+18
|\
| * Typo fixit332015-10-271-1/+1
| |
| * Adding "Solution" sections to guideit332015-10-271-2/+5
| |
| * Update Troubleshooting.mdit332015-10-271-0/+3
| |
| * Update Administration.mdit332015-10-271-0/+7
| |
| * Update Troubleshooting.mdit332015-10-271-5/+0
| |
| * Update Outgoing-Webhooks.mdit332015-10-271-1/+1
| |
| * Update Outgoing-Webhooks.mdit332015-10-271-0/+2
| |
* | Removing console.log=Corey Hulen2015-10-271-2/+0
| |
* | PLT-340=Corey Hulen2015-10-2728-139/+757
| |
* | Adding upgrade calls for db=Corey Hulen2015-10-271-0/+3
| |
* | Merge branch 'master' into PLT-340=Corey Hulen2015-10-2758-345/+1895
|\|
| * Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-2719-3/+1144
| |\ | | | | | | PLT-25 adding stats to admin console
| | * PLT-25 fixing stats for postgres=Corey Hulen2015-10-272-39/+42
| | |
| | * Fixing postgres=Corey Hulen2015-10-261-8/+49
| | |
| | * adding arrow notation=Corey Hulen2015-10-261-1/+1
| | |
| | * Merge branch 'master' into PLT-25=Corey Hulen2015-10-2649-280/+1250
| | |\
| | * | Fixing unit test=Corey Hulen2015-10-261-18/+25
| | | |
| | * | PLT-25 adding stats to admin console=Corey Hulen2015-10-262-68/+77
| | | |
| | * | Merge branch 'master' into PLT-25=Corey Hulen2015-10-2530-146/+583
| | |\ \
| | * | | PLT-25 adding analytics panel=Corey Hulen2015-10-236-13/+268
| | | | |
| | * | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-23122-689/+1497
| | |\ \ \
| | * | | | Adding post counts by days=Corey Hulen2015-10-222-3/+52
| | | | | |
| | * | | | Adding analytics tab=Corey Hulen2015-10-2215-2/+779
| | | | | |
| * | | | | Update Troubleshooting.mdit332015-10-271-1/+1
| | | | | |
| * | | | | Create Administration.mdit332015-10-271-0/+12
| | | | | |
| * | | | | Update Troubleshooting.mdit332015-10-271-4/+3
| | | | | |
| * | | | | Update Troubleshooting.mdit332015-10-271-0/+5
| | | | | |
| * | | | | 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
| | | | | | |
| * | | | | | Added known issue for deleted channelsit332015-10-271-1/+2
| | | | | | |
| * | | | | | 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 #1184 from girishso/add-trailing-slashChristopher Speller2015-10-271-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | adds trailing slash if missing from Directory in config.json
| | * | | | | | | adds trailing slash if missing from Directory in config.jsonGirish S2015-10-271-0/+7
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other drivers too
| * | | | | | | Merge pull request #1174 from florianorben/member-popoverChristopher Speller2015-10-274-67/+215
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-262-2/+165
| | | | | | | | |
| * | | | | | | | Merge pull request #1154 from girishso/username_symbolsChristopher Speller2015-10-272-4/+15
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | auto-link mentions with user names having symbols
| | * | | | | | | 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 #1194 from mattermost/webhook-requestCorey Hulen2015-10-262-7/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Parse incoming webhook requests into model instead of string map
| | * | | | | | | Remove unused iconemoji fieldJoramWilander2015-10-261-1/+0
| | | | | | | | |
| | * | | | | | | Parse incoming webhook requsets into model instead of string mapJoramWilander2015-10-262-7/+26
| | | | | | | | |
| * | | | | | | | 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
| * | | | | | | | | Update Troubleshooting.mdit332015-10-261-0/+8
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Update README.mdit332015-10-261-0/+6
| | | | | | | | |
| * | | | | | | | Merge pull request #1192 from mattermost/PLT-828Christopher Speller2015-10-264-8/+12
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | PLT-828 fixing db upgrade code