summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.mdit332015-11-161-5/+17
* Merge pull request #1446 from mattermost/webhooks-disabledit332015-11-161-3/+27
|\
| * Update Administration.mdit332015-11-161-1/+1
| * Update Administration.mdit332015-11-161-8/+6
| * Updating given webhooks off by defaultit332015-11-161-2/+28
* | Merge pull request #1449 from mattermost/PLT-901Corey Hulen2015-11-161-3/+2
|\ \
| * | Adding device type=Corey Hulen2015-11-161-3/+2
|/ /
* | Merge pull request #1445 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-1615-67/+112
|\ \ | |/ |/|
| * Removing height variableAsaad Mahmood2015-11-161-1/+0
| * Updating timestamp in RHSAsaad Mahmood2015-11-162-6/+15
| * Multiple UI ImprovementsAsaad Mahmood2015-11-1615-64/+101
* | Merge pull request #1437 from rgarmsen2295/plt-1086Harrison Healey2015-11-166-69/+94
|\ \
| * | Fixed unit test issuesReed Garmsen2015-11-132-2/+3
| * | Allow admins to change the display name for the default channelReed Garmsen2015-11-135-68/+92
* | | Merge release branch 'release-1.2'Christopher Speller2015-11-1610-14/+21
|\ \ \
| * | | Updating version to 1.2.1Christopher Speller2015-11-162-1/+2
| * | | Merge pull request #1443 from mattermost/lfbrock-patch-2Christopher Speller2015-11-162-4/+2
| |\ \ \
| | * | | Update Outgoing-Webhooks.mdlfbrock2015-11-161-3/+1
| | * | | Update CHANGELOG.mdlfbrock2015-11-161-1/+1
| |/ / /
| * | | Merge pull request #1440 from mattermost/out-hook-fixJoram Wilander2015-11-165-8/+16
| |\ \ \
| | * | | adding skip=Corey Hulen2015-11-151-0/+4
| | * | | Merge branch 'out-hook-fix' of https://github.com/mattermost/platform into ou...=Corey Hulen2015-11-150-0/+0
| | |\ \ \
| | | * | | Fixing outgoing hook=Corey Hulen2015-11-155-8/+12
| | * | | | Fixing outgoing hook=Corey Hulen2015-11-155-8/+12
| |/ / / /
| * | | | Merge pull request #1436 from florianorben/1432.v1.2Christopher Speller2015-11-151-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | allow incoming webhooks even if it doesnt have a text on it if attachment fie...Florian Orben2015-11-141-1/+1
| |/ / /
* | | | Merge pull request #1433 from florianorben/PLT-862Corey Hulen2015-11-164-23/+34
|\ \ \ \ | |_|_|/ |/| | |
| * | | add a unit test to textgeneration.goFlorian Orben2015-11-141-4/+11
| * | | PLT-862: Show images from website links below messagesFlorian Orben2015-11-133-19/+23
| | |/ | |/|
* | | Merge pull request #1428 from mattermost/PLT-951Christopher Speller2015-11-161-1/+2
|\ \ \
| * | | PLT-951 updating help text=Corey Hulen2015-11-131-1/+2
* | | | Merge pull request #1426 from mattermost/plt-551Christopher Speller2015-11-162-83/+83
|\ \ \ \
| * | | | Fix cancel button on username setting and other general improvementsJoramWilander2015-11-132-83/+83
* | | | | Merge pull request #1424 from mattermost/plt-1113Christopher Speller2015-11-161-13/+14
|\ \ \ \ \
| * | | | | Tutorial tip dots are now clickableJoramWilander2015-11-131-13/+14
| |/ / / /
* | | | | Merge pull request #1431 from hmhealey/plt1149Joram Wilander2015-11-141-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed some console errors with the search autocomplete when there are no sugg...hmhealey2015-11-131-5/+7
* | | | | Merge release branch 'release-1.2'Christopher Speller2015-11-135-5/+11
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Updating dockerfile for release v1.2.0Christopher Speller2015-11-131-1/+1
| * | | Update ChangelogChristopher Speller2015-11-131-1/+1
| * | | Merge pull request #1427 from hmhealey/attachmentnullfix-1.2Christopher Speller2015-11-131-2/+3
| |\ \ \
| | * | | Added null check when accessing post texthmhealey2015-11-131-2/+3
| |/ / /
| * | | Merge pull request #1420 from asaadmahmoodspin/release-1.2Christopher Speller2015-11-132-1/+6
| |\ \ \
| | * | | Updating bad connection cssAsaad Mahmood2015-11-132-2/+3
| | * | | UI changes for Direct messages and Bad connectionAsaad Mahmood2015-11-132-1/+5
| |/ / /
* | | | Merge pull request #1422 from hmhealey/plt906Christopher Speller2015-11-131-8/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Made code for the member popover count a bit more robust to hopefully prevent...hmhealey2015-11-131-8/+14
* | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-136-20/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | Small fix for time in RHSAsaad Mahmood2015-11-131-3/+9
| * | | Updating post.scss due to merge issuesAsaad Mahmood2015-11-131-4/+7