Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ademers committed Mar 31, 2020
2 parents 384cd54 + 5e052d8 commit 8826e10
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 61 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.1.3 2020-03-31
### Changed
- Reinstall & uninstall Imager plugin to fix `project.yaml`.

## 1.1.2 - 2020-03-30
### Added
- Add _images_ Assets Volume.
Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
"project"
],
"type": "project",
"version": "1.1.2",
"version": "1.1.3",
"license": "MIT",
"require": {
"craftcms/cms": "3.4.11",
"craftcms/contact-form": "2.2.6",
"craftcms/redactor": "2.6.1",
"mmikkel/retcon": "2.1.0",
"nystudio107/craft-minify": "1.2.9",
"nystudio107/craft-scripts": "1.2.10",
"nystudio107/craft-seomatic": "3.2.49",
"nystudio107/craft-twigpack": "1.2.0",
"vlucas/phpdotenv": "^3.4.0"
},
"craftcms/cms": "3.4.11",
"craftcms/contact-form": "2.2.6",
"craftcms/redactor": "2.6.1",
"mmikkel/retcon": "2.1.0",
"nystudio107/craft-minify": "1.2.9",
"nystudio107/craft-scripts": "1.2.10",
"nystudio107/craft-seomatic": "3.2.49",
"nystudio107/craft-twigpack": "1.2.0",
"vlucas/phpdotenv": "^3.4.0"
},
"autoload": {
"psr-4": {
"modules\\": "modules/"
Expand Down
88 changes: 45 additions & 43 deletions composer.lock

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

10 changes: 3 additions & 7 deletions config/project.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dateModified: 1585350529
dateModified: 1585609569
email:
fromEmail: $SYSTEM_EMAIL_ADDRESS
fromName: $SENDER_NAME
Expand Down Expand Up @@ -33,19 +33,14 @@ fields:
translationMethod: none
type: craft\redactor\Field
graphql:
schemas:
scopes:
55645ee2-d4ea-4c4b-9bd2-e73354e65b82:
isPublic: true
name: 'Public Schema'
plugins:
contact-form:
edition: standard
enabled: true
schemaVersion: 1.0.0
imager:
edition: standard
enabled: true
schemaVersion: 2.0.0
minify:
edition: standard
enabled: true
Expand Down Expand Up @@ -89,6 +84,7 @@ sections:
titleLabel: Title
handle: blog
name: Blog
previewTargets: null
propagationMethod: all
siteSettings:
5175a4de-61e4-46da-a275-8d5e41e17cb6:
Expand Down

0 comments on commit 8826e10

Please sign in to comment.