Skip to content

Commit

Permalink
Merge branch 'release/0.19.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanDS committed Mar 11, 2020
2 parents e230af4 + 47fe885 commit 7f5b5ba
Show file tree
Hide file tree
Showing 13 changed files with 550 additions and 417 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
sudo: false
os: linux

dist: trusty

language: php
Expand All @@ -13,10 +14,12 @@ cache:
- vendor
- $HOME/.composer/cache

matrix:
jobs:
include:
- php: nightly
env: WP_VERSION=latest
- php: 7.4
env: WP_VERSION=latest
- php: 7.3
env: WP_VERSION=latest
- php: 7.2
Expand All @@ -40,7 +43,7 @@ before_script:
if [[ ! -z "$WP_VERSION" ]] ; then
bash ssl-alp/bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
case "$TRAVIS_PHP_VERSION" in
7.3|7.2|7.1|7.0|nightly)
7.4|7.3|7.2|7.1|7.0|nightly)
echo "Using PHPUnit 6.x"
composer global require "phpunit/phpunit:^6"
;;
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ been pushed back to these plugins and WordPress itself:
[17](https://github.com/adamsilverstein/mathml-block/issues/12),
[18](https://github.com/WordPress/gutenberg/issues/13749),
[19](https://core.trac.wordpress.org/ticket/46459)
[20](https://github.com/WordPress/gutenberg/issues/20600)

### Co-Authors Plus
Authors: Mohammad Jangda, Daniel Bachhuber, Automattic, Shepherd Interactive, Mark Jaquith
Expand Down
14 changes: 13 additions & 1 deletion ssl-alp/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: logbook, coauthor, revisions, references, latex, tex, mathematics, wiki
Requires at least: 5.1.0
Tested up to: 5.3.2
Requires PHP: 7.0.0
Stable tag: 0.18.0
Stable tag: 0.19.0
License: GNU General Public License v3 or later
License URI: LICENCE

Expand Down Expand Up @@ -79,6 +79,18 @@ on the ALP website.

== Changelog ==

= 0.19.0 =
- Removed the manual WP_Query SQL modifications for including coauthors in
search results, and replaced with a parameter based search. Due to this
functionality not being identical, other changes were made to restore
original functionality. This is quite a major change and needs field testing.
- Added ability to disable the display of cross-references on supported posts.
- Updated edit summary JavaScript (just refactoring, no functionality changes).
- Fixed bug where a link to network settings from the site settings page would
be displayed to network admins where ALP is active on the site only, not
network-wide.
- Updated automatic test configuration.

= 0.18.0 =
- Fix bug with child block which appeared from 5.3.
- Fix bug whereby media types detected by WordPress/PHP to have different media
Expand Down
7 changes: 4 additions & 3 deletions ssl-alp/alp.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Academic Labbook
* Plugin URI: https://alp.attackllama.com/
* Description: Turn WordPress into a collaborative academic labbook.
* Version: 0.18.0
* Version: 0.19.0
* Author: Sean Leavey
* Author URI: https://attackllama.com/
* License: GPL3
Expand All @@ -21,13 +21,14 @@
* Current plugin version.
*/

define( 'SSL_ALP_VERSION', '0.18.0' );
define( 'SSL_ALP_VERSION', '0.19.0' );

/**
* Plugin name
* Plugin name and path
*/

define( 'SSL_ALP_PLUGIN_NAME', 'Academic Labbook' );
define( 'SSL_ALP_PLUGIN_PATH', 'ssl-alp/alp.php' );

/**
* Base plugin directory
Expand Down
Loading

0 comments on commit 7f5b5ba

Please sign in to comment.