Skip to content

Commit

Permalink
Merge branch 'release/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
ademers committed Feb 2, 2021
2 parents d287a85 + da26661 commit 842b204
Show file tree
Hide file tree
Showing 23 changed files with 196,960 additions and 867 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
/storage/*
!/storage/.gitignore

# CRAFT LICENSE KEY - ONLY FOR STARTER PROJECT
# SEE: https://craftcms.com/knowledge-base/more-information-than-you-require-about-craft-license-keys#gotchas
/config/license.key

# ASSETS
/web/assets/*
!/web/assets/.gitignore
Expand Down Expand Up @@ -40,4 +44,4 @@ hot
!.vscode/launch.json
!.vscode/extensions.json
config.codekit3
prepros-6.config
prepros-6.config
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ 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.2.2 2021-02-02
### Added
- Add Craft auto-complete for PhpStorm
### Changed
- Update Twigpack plugin to 1.2.9
- Update Sprig plugin to 1.3.2
- Update SEOmatic plugin to 3.3.30
- Update Redactor to 2.8.5
- Update Craft to 3.5.19.1
- Update Tailwind CSS to 2.0.2 postCSS 7.x compatible version
- Update Tailwind CSS typography plugin to 0.4.0
- Update Laravel Mix to 5.0.9
- Update Alpine JS to 2.8.0
- Update Lazysizes to 5.3.0
### Fixed
- Fix FOUC caused by Twigpack CSS async loading
## 1.2.1 2020-10-29
### Added
- Add *Sprigified* Craft contact form.
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
"project"
],
"type": "project",
"version": "1.2.1",
"version": "1.2.2",
"license": "MIT",
"require": {
"craftcms/cms": "3.5.14",
"craftcms/cms": "3.5.19.1",
"craftcms/contact-form": "2.2.7",
"craftcms/redactor": "2.8.3",
"craftcms/redactor": "2.8.5",
"mmikkel/retcon": "2.2.1",
"nystudio107/craft-minify": "1.2.10",
"nystudio107/craft-scripts": "1.2.10",
"nystudio107/craft-seomatic": "3.3.22",
"nystudio107/craft-twigpack": "1.2.6",
"putyourlightson/craft-sprig": "1.0.3",
"nystudio107/craft-seomatic": "3.3.30",
"nystudio107/craft-twigpack": "1.2.9",
"putyourlightson/craft-sprig": "1.3.2",
"vlucas/phpdotenv": "^3.4.0"
},
"autoload": {
Expand Down
Loading

0 comments on commit 842b204

Please sign in to comment.