Skip to content

Commit

Permalink
Merge branch 'release/1.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Dec 12, 2017
2 parents 560d858 + 1d512b9 commit 8b7f2fc
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 61 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Transcoder Changelog

## 1.0.8 - 2017.12.06
### Changed
* Updated to require craftcms/cms `^3.0.0-RC1`

## 1.0.7 - 2017.08.05
### Changed
* Craft 3 beta 23 compatibility
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

Transcode video & audio files to various formats, and provide video thumbnails

![Screenshot](resources/img/plugin-logo.png)

Related: [Transcoder for Craft 2.x](https://github.com/nystudio107/transcoder)

**Note**: This plugin may become a paid add-on when the Craft Plugin store becomes available.

## Requirements

This plugin requires Craft CMS 3.0.0-RC1 or later.

## Installation

To install Transcoder, follow these steps:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nystudio107/craft3-transcoder",
"description": "Transcode video & audio files to various formats, and provide video thumbnails",
"type": "craft-plugin",
"version": "1.0.7",
"version": "1.0.8",
"keywords": [
"craft",
"cms",
Expand All @@ -22,7 +22,7 @@
}
],
"require": {
"craftcms/cms": "~3.0.0-beta.23",
"craftcms/cms": "^3.0.0-RC1",
"mikehaertl/php-shellcommand": "~1.2"
},
"autoload": {
Expand Down
Binary file added resources/img/plugin-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 23 additions & 59 deletions src/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8b7f2fc

Please sign in to comment.