Skip to content

Commit

Permalink
update version number
Browse files Browse the repository at this point in the history
  • Loading branch information
bdolor committed Jul 11, 2018
1 parent 3f4f66b commit f093a2f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
11 changes: 8 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Contributors: bdolor, aparedes
Donation link: https://github.com/BCcampus/pressbooks-textbook/wiki/Contribution-guidelines
Tags: pressbooks, textbook
Requires at least: 4.9.5
Tested up to: 4.9.6
Stable tag: 4.1.0
Requires at least: 4.9.6
Tested up to: 4.9.7
Stable tag: 4.1.1
Requires PHP: 7
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -90,6 +90,11 @@ When creating Open Textbooks and other OERs, we feel it is best to adhere to the

See: https://github.com/BCcampus/pressbooks-textbook/commits/master for more detail

= 4.1.1 (2018/07/11) =
* fix for parent theme change - thanks @greatislander
* compatibility with PB 5.4.0
* support for new sidebar textboxes - thanks to @josieg for reporting

= 4.1.0 (2018/06/22) =
* add oembed support for bcc instance of kaltura
* remove candela-citations as a dependency
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bccampus/pressbooks-textbook",
"description": "Adds functionality to Pressbooks to make it easier to author textbooks",
"type": "wordpress-plugin",
"version": "4.1.0",
"version": "4.1.1",
"homepage": "https://github.com/bccampus/pressbooks-textbook",
"authors": [
{
Expand Down
8 changes: 4 additions & 4 deletions inc/class-textbook.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Textbook {
* @since 1.0.0
* @var string
*/
const VERSION = '4.1.0';
const VERSION = '4.1.1';

/**
* Unique identifier for plugin.
Expand Down Expand Up @@ -182,9 +182,9 @@ private function filterPlugins( $pbt_plugin ) {
*/
private function getUserOptions() {

(array) $other = get_option( 'pbt_other_settings' );
(array) $reuse = get_option( 'pbt_reuse_settings' );
(array) $redistribute = get_option( 'pbt_redistribute_settings' );
$other = get_option( 'pbt_other_settings', [] );
$reuse = get_option( 'pbt_reuse_settings', [] );
$redistribute = get_option( 'pbt_redistribute_settings', [] );

$result = @array_merge( $other, $reuse, $redistribute );

Expand Down
4 changes: 2 additions & 2 deletions pressbooks-textbook.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @wordpress-plugin
* Plugin Name: Textbooks for Pressbooks
* Description: A plugin that extends Pressbooks for textbook authoring
* Version: 4.1.0
* Version: 4.1.1
* Author: Brad Payne
* Author URI: http://github.com/bdolor
* Text Domain: pressbooks-textbook
Expand All @@ -20,7 +20,7 @@
* Domain Path: /languages
* GitHub Plugin URI: https://github.com/BCcampus/pressbooks-textbook
* Tags: pressbooks, OER, publishing, textbooks
* Pressbooks tested up to: 5.3.3
* Pressbooks tested up to: 5.4.0
*/

// If file is called directly, abort.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ div.part.invisible {
border-radius: 4px;
border: 1px solid $color-black;
margin-bottom: 15px;
float: none;
}

.bcc-box h3:first-child {
Expand Down
2 changes: 1 addition & 1 deletion themes-book/opentextbook/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Theme Name: Open Textbooks
Description: Textbook specific features for the open textbook project. The screenshot/image used for this theme is 'open textbooks' by Guilia Forsythe used under CC BY.
Author: Brad Payne
Version: 2.1.2
Version: 2.1.3
Template: pressbooks-book
Text Domain: open-textbook
Tags: Textbooks for Pressbooks
Expand Down

0 comments on commit f093a2f

Please sign in to comment.