Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into coriander
Browse files Browse the repository at this point in the history
* upstream/master:
  Filter template hierarchy for embed templates (roots#2145)
  Decrease optipng level (roots#2143)
  Update sponsors [ci skip]
  Unescape post titles
  9.0.7
  When you're sloppy and forget things 😇
  Require Node 8+, also test PHP 7.2 and 7.3
  Shoutout to npm: https://npm.community/t/npm-install-downgrading-resolved-packages-from-https-to-http-registry-in-package-lock-json/1818
  Update to Bootstrap 4.2.1
  • Loading branch information
ptrckvzn committed Jan 30, 2019
2 parents 63a37d3 + 19057f6 commit 36462a6
Show file tree
Hide file tree
Showing 14 changed files with 2,597 additions and 748 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ language: php
sudo: false
dist: trusty
php:
- 7.3
- 7.2
- 7.1
- nightly

env:
- TRAVIS_NODE_VERSION="6"
- TRAVIS_NODE_VERSION="7"
- TRAVIS_NODE_VERSION="8"
- TRAVIS_NODE_VERSION="10"

matrix:
fast_finish: true
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### 9.0.7: December 28th, 2018
* Update sage-installer which now allows to opt-in for sending framework selection data ([#2137](https://github.com/roots/sage/pull/2137))

### 9.0.6: December 21st, 2018
* Update to Bootstrap 4.2.1 ([#2136](https://github.com/roots/sage/pull/2136))
* Do not ignore vendors for plugins ([#2132](https://github.com/roots/sage/pull/2132))
* Fix stylelint and eslint validation errors ([#2131](https://github.com/roots/sage/pull/2131))
* Hook run sequence fix ([#2123](https://github.com/roots/sage/pull/2123))
* Dispatch event when firing routes ([#2080](https://github.com/roots/sage/pull/2080))
* Normalize and enforce single quotes ([#2076](https://github.com/roots/sage/pull/2076))

### 9.0.5: September 17th, 2018
* Workaround for Bootstrap incompatibility with webpack. Fixes #2017 ([e72b490](https://github.com/roots/sage/commit/e72b4906264551dc00cd0890de74ae2bce0d77c8))

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Make sure all dependencies have been installed before moving on:
* [WordPress](https://wordpress.org/) >= 4.7
* [PHP](https://secure.php.net/manual/en/install.php) >= 7.1.3 (with [`php-mbstring`](https://secure.php.net/manual/en/book.mbstring.php) enabled)
* [Composer](https://getcomposer.org/download/)
* [Node.js](http://nodejs.org/) >= 6.9.x
* [Node.js](http://nodejs.org/) >= 8.0.0
* [Yarn](https://yarnpkg.com/en/docs/install)

## Theme installation
Expand Down Expand Up @@ -117,7 +117,7 @@ Contributions are welcome from everyone. We have [contributing guidelines](https

Help support our open-source development efforts by [becoming a patron](https://www.patreon.com/rootsdev).

<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a>
<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="itineris" width="200" height="150"></a> <a href="http://www.hbgdesignlab.se/"><img src="https://cdn.roots.io/app/uploads/helsingborgdesignlab.png" alt="Helsingborg Design LAB" with="200" height="150">

## Community

Expand Down
2 changes: 1 addition & 1 deletion app/filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/
collect([
'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment', 'embed'
])->map(function ($type) {
add_filter("{$type}_template_hierarchy", __NAMESPACE__.'\\filter_templates');
});
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"php": ">=7.1",
"composer/installers": "~1.0",
"illuminate/support": "5.6.*",
"roots/sage-lib": "~9.0.5",
"roots/sage-lib": "~9.0.7",
"soberwp/controller": "~2.1.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.8.0",
"roots/sage-installer": "~1.5"
"roots/sage-installer": "~1.6"
},
"scripts": {
"test": ["phpcs"],
Expand Down
Loading

0 comments on commit 36462a6

Please sign in to comment.