Skip to content

Commit

Permalink
Merge branch 'release/1.4.40' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Oct 5, 2018
2 parents d098972 + 4cc62ca commit 576054f
Show file tree
Hide file tree
Showing 40 changed files with 284 additions and 200 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# ImageOptimize Changelog

## 1.4.40 - 2018.10.05
### Added
* Add Super Table conditional for field

### Changed
* Updated build process

## 1.4.39 - 2018.09.25
### Changed
* Added a try/catch around ColorThief, to catch errors thrown due to empty/transparent images
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nystudio107/craft-imageoptimize",
"description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like Imgix, with zero template changes.",
"type": "craft-plugin",
"version": "1.4.39",
"version": "1.4.40",
"keywords": [
"craft",
"cms",
Expand Down
13 changes: 2 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,7 @@
"copyFiles": [
],
"manifest": {
"basePath": "",
"template": {
"twigCss": "./src/templates/_src/include-css-module.twig",
"twigModern": "./src/templates/_src/include-modern-module.twig",
"twigLegacy": "./src/templates/_src/include-legacy-module.twig"
},
"filename": {
"twigCss": "./src/templates/_includes/include-css-module.twig",
"twigModern": "./src/templates/_includes/include-modern-module.twig",
"twigLegacy": "./src/templates/_includes/include-legacy-module.twig"
}
"basePath": ""
},
"templates": "./src/templates/"
},
Expand Down Expand Up @@ -124,6 +114,7 @@
"purgecss-webpack-plugin": "^1.3.0",
"purgecss-whitelister": "^2.2.0",
"resolve-url-loader": "^3.0.0",
"style-loader": "^0.23.0",
"terser-webpack-plugin": "^1.1.0",
"vue-loader": "^15.4.2",
"vue-style-loader": "^4.1.2",
Expand Down

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Loading

0 comments on commit 576054f

Please sign in to comment.