Browse Source

Merge branch 'dev'

1.17.0
SteelWagstaff 3 years ago
parent
commit
ade0a3d1ff
  1. 14
      .github/workflows/standards-and-tests.yml
  2. 10
      README.md
  3. 7
      composer.json
  4. 7
      composer.lock
  5. BIN
      languages/fr_FR.mo
  6. 6716
      package-lock.json
  7. 6
      style.css

14
.github/workflows/standards-and-tests.yml

@ -13,15 +13,15 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
php: [ 7.4 ] php: [ 7.4, 8.0 ]
os: [ ubuntu-20.04 ] os: [ ubuntu-20.04 ]
wordpress: [ 6.0.2, latest ] wordpress: [ 6.0.3, latest ]
experimental: [ false ]
include: include:
- php: 8.0 - experimental: true
os: ubuntu-20.04 - experimental: false
wordpress: latest php: 8.0
experimental: true wordpress: 6.0.3
name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }} name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
env: env:

10
README.md

@ -10,9 +10,9 @@
Contributors: conner_bw, greatislander, steelwagstaff Contributors: conner_bw, greatislander, steelwagstaff
Tags: publishing, catalog, pressbooks, default-theme Tags: publishing, catalog, pressbooks, default-theme
Requires at least: 6.0.2 Requires at least: 6.0.3
Tested up to: 6.0.2 Tested up to: 6.0.3
Stable tag: 1.16.0 Stable tag: 1.17.0
Requires PHP: 7.4 Requires PHP: 7.4
License: GNU General Public License v3 or later License: GNU General Public License v3 or later
License URI: https://www.gnu.org/licenses/gpl-3.0.html License URI: https://www.gnu.org/licenses/gpl-3.0.html
@ -31,9 +31,9 @@ Aldine is the default theme for the home page of [Pressbooks](https://pressbooks
## Changelog ## Changelog
### 1.16.1 ### 1.17.0
* See: https://github.com/pressbooks/pressbooks-aldine/releases/tag/1.16.1 * See: https://github.com/pressbooks/pressbooks-aldine/releases/tag/1.17.0
* Full release history available at: https://github.com/pressbooks/pressbooks-aldine/releases * Full release history available at: https://github.com/pressbooks/pressbooks-aldine/releases
## Upgrade Notice ## Upgrade Notice

7
composer.json

@ -18,17 +18,14 @@
"forum": "https://discourse.pressbooks.org/" "forum": "https://discourse.pressbooks.org/"
}, },
"config": { "config": {
"platform": { "sort-packages": true,
"php": "7.4"
},
"sort-packages": true,
"allow-plugins": { "allow-plugins": {
"composer/installers": true, "composer/installers": true,
"dealerdirect/phpcodesniffer-composer-installer": true "dealerdirect/phpcodesniffer-composer-installer": true
} }
}, },
"require": { "require": {
"php": ">=7.4", "php": "^7.4|8.0.*",
"composer/installers": "^2", "composer/installers": "^2",
"phpcompatibility/php-compatibility": "^9.3", "phpcompatibility/php-compatibility": "^9.3",
"pressbooks/mix": "^2.1", "pressbooks/mix": "^2.1",

7
composer.lock generated

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "4d7cd01dc8e472d2a68d952060a21d78", "content-hash": "bca254bf292cf20628d024e2b7bf1d91",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -2857,11 +2857,8 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.4" "php": "^7.4|8.0.*"
}, },
"platform-dev": [], "platform-dev": [],
"platform-overrides": {
"php": "7.4"
},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.3.0"
} }

BIN
languages/fr_FR.mo

Binary file not shown.

6716
package-lock.json generated

File diff suppressed because it is too large Load Diff

6
style.css

@ -5,9 +5,9 @@ Author: Pressbooks (Book Oven Inc.)
Author URI: https://pressbooks.org Author URI: https://pressbooks.org
Description: Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the worlds first publisher. Description: Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the worlds first publisher.
Tags: publishing, catalog, pressbooks, default-theme Tags: publishing, catalog, pressbooks, default-theme
Version: 1.16.1 Version: 1.17.0
Requires at least: 6.0.2 Requires at least: 6.0.3
Tested up to: 6.0.2 Tested up to: 6.0.3
Requires PHP: 7.4 Requires PHP: 7.4
License: GNU GPL v3 or later License: GNU GPL v3 or later
License URI: https://github.com/pressbooks/pressbooks-aldine/tree/master/LICENSE.md License URI: https://github.com/pressbooks/pressbooks-aldine/tree/master/LICENSE.md

Loading…
Cancel
Save