summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding perm delete to cmd line=Corey Hulen2015-11-1625-35/+461
|
* PLT-975 adding perm deletes=Corey Hulen2015-11-1618-0/+419
|
* 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 CHANGELOG.md
| | * 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
| |\ | | | | | | Fixing outgoing hook
| | * adding skip=Corey Hulen2015-11-151-0/+4
| | |
| | * Merge branch 'out-hook-fix' of https://github.com/mattermost/platform into ↵=Corey Hulen2015-11-150-0/+0
| | |\ | | | | | | | | | | | | out-hook-fix
| | | * 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 field is present
| | * allow incoming webhooks even if it doesnt have a text on it if attachment ↵Florian Orben2015-11-141-1/+1
| |/ | | | | | | field is present
* | Merge pull request #1433 from florianorben/PLT-862Corey Hulen2015-11-164-23/+34
|\ \ | | | | | | PLT-862: Show images from website links below messages
| * | 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
| * | | PLT-951 updating help text=Corey Hulen2015-11-131-1/+2
| | | |
* | | | Merge pull request #1426 from mattermost/plt-551Christopher Speller2015-11-162-83/+83
|\ \ \ \ | | | | | | | | | | PLT-551 Fix cancel button on username setting and other general improvements
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-1113 Tutorial tip dots are now clickable
| * | | | | Tutorial tip dots are now clickableJoramWilander2015-11-131-13/+14
| |/ / / /
* | | | | Merge pull request #1431 from hmhealey/plt1149Joram Wilander2015-11-141-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-1149 Fixed some console errors related to the search autocomplete
| * | | | Fixed some console errors with the search autocomplete when there are no ↵hmhealey2015-11-131-5/+7
| | | | | | | | | | | | | | | | | | | | suggestions to show
* | | | | 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
| |\ \ \ | | | | | | | | | | (1.2) Added null check when accessing post text
| | * | | 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
| |\ \ \ | | | | | | | | | | UI changes for Direct messages and Bad connection
| | * | | 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
|\ \ \ \ | |_|_|/ |/| | | PLT-906 Improved client-side handling when ExtraInfo.MemberCount may not be set
| * | | Made code for the member popover count a bit more robust to hopefully ↵hmhealey2015-11-131-8/+14
| | | | | | | | | | | | | | | | prevent issues involving old data
* | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-136-20/+29
|\ \ \ \ | |_|_|/ |/| | | Multiple UI improvements
| * | | Small fix for time in RHSAsaad Mahmood2015-11-131-3/+9
| | | |
| * | | Updating post.scss due to merge issuesAsaad Mahmood2015-11-131-4/+7
| | | |
| * | | Updating post.scssAsaad Mahmood2015-11-131-75/+91
| | | |
| * | | Fixing eslint errorAsaad Mahmood2015-11-131-1/+0
| | | |
| * | | Multiple UI improvementsAsaad Mahmood2015-11-136-113/+98
| |/ /
* | | Merge pull request #1419 from hmhealey/plt998Joram Wilander2015-11-131-18/+86
|\ \ \ | |/ / |/| | PLT-998/999/1100 Improving search term highlighting in results
| * | Improved highlighting of search flags to handle quotes and flagshmhealey2015-11-121-18/+86
| | |
* | | Merge pull request #1417 from florianorben/PLT-1141Christopher Speller2015-11-131-0/+1
|\ \ \ | | | | | | | | PLT-1141: Page previews can overflow their boundaries
| * | | PLT-1141: Page previews can overflow their boundariesFlorian Orben2015-11-121-0/+1
| | | |
* | | | Merge pull request #1414 from lindy65/patch-9Christopher Speller2015-11-131-2/+19
|\ \ \ \ | | | | | | | | | | Update documentation-guidelines.md
| * | | | Update documentation-guidelines.mdlindy652015-11-121-2/+19
| |/ / / | | | | | | | | Fixed typo on line 44 and added "Sub-section Headings..."
* | | | Merge pull request #1421 from mattermost/help-docs-updateit332015-11-137-73/+99
|\ \ \ \ | | | | | | | | | | Docs update
| * | | | Delete Slack-Import.mdit332015-11-121-29/+0
| | | | |
| * | | | Update README.mdit332015-11-121-3/+3
| | | | |