summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Multiple UI changesAsaad Mahmood2015-10-2914-59/+86
* Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2919-236/+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
| * | Merge pull request #1216 from mattermost/revert-1170-PLT-395Christopher Speller2015-10-2813-219/+1
| |\ \
| | * | Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-2813-219/+1
| |/ /
* | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2836-207/+1437
|\| |
| * | Merge pull request #1210 from mattermost/PLT-25Christopher Speller2015-10-284-11/+10
| |\ \
| | * | PLT-25 fixing issues with stats page=Corey Hulen2015-10-274-11/+10
| * | | Merge pull request #1187 from mattermost/code-contribution-guidelines-updateChristopher Speller2015-10-282-47/+49
| |\ \ \
| | * | | Update Code-Contribution-Guidelines.mdit332015-10-271-1/+1
| | * | | Fixing linkit332015-10-261-1/+1
| | * | | Update CONTRIBUTING.mdit332015-10-261-1/+1
| | * | | Update CONTRIBUTING.mdit332015-10-261-16/+12
| | * | | Update CONTRIBUTING.mdit332015-10-261-1/+1
| | * | | Update CONTRIBUTING.mdit332015-10-261-1/+4
| | * | | Update Code-Contribution-Guidelines.mdit332015-10-261-44/+1
| | * | | Update CONTRIBUTING.mdit332015-10-261-3/+49
| * | | | Merge pull request #1205 from florianorben/fix-relative-timeJoram Wilander2015-10-281-2/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Dont display '1 minute ago' timestamps for post posted < than 1 minute agoFlorian Orben2015-10-281-2/+6
| | | |/ | | |/|
| * | | 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
| * | Merge pull request #1190 from mattermost/PLT-25Corey Hulen2015-10-2719-3/+1144
| |\ \
| | * | 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
| |\ \ \ \ \ \
| | * | | | | | 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-2765-395/+1881
|\| | | | | |
| * | | | | | Added known issue for deleted channelsit332015-10-271-1/+2
| * | | | | | 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