Skip to content

Commit

Permalink
Merge branch 'release/1.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Hemberger committed Dec 12, 2018
2 parents 3bda7af + 2af865c commit a5480a5
Show file tree
Hide file tree
Showing 24 changed files with 245 additions and 178 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
### Changelog


#### 1.6.3 (12/12/18)
* Changed: Updated CMB2 to 2.5.1.
* Changed: Remove overflow hidden on some elements to allow easier styling enhancements.

#### 1.6.2 (12/10/18)
* Changed: Now only add left margin to ul's that don't have a class.
* Changed: [grid] Better processing/formatting of content and excerpts.
Expand Down
2 changes: 0 additions & 2 deletions assets/css/mai-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -3968,7 +3968,6 @@ p.entry-meta {
margin: 32px 0;
}

.adjacent-entry-pagination,
.archive-pagination,
.entry-pagination {
overflow: hidden;
Expand Down Expand Up @@ -4164,7 +4163,6 @@ ol.comment-list {

.comment-header {
margin-bottom: 16px;
overflow: hidden;
}

.comment-author span[itemprop="name"] {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/mai-theme.min.css

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions includes/CMB2/.github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!--
Before posting a new issue:
- Please post general support and questions at https://www.wordpress.org/support/plugin/cmb2/. We will move to GitHub once a confirmed bug.
- Please check if your issue is addressed in the CMB2 Wiki Troubleshooting page: https://github.com/CMB2/CMB2/wiki/Troubleshooting
- Please review the contributing guidelines: https://github.com/CMB2/CMB2/blob/develop/CONTRIBUTING.md.
-->
### Expected Behavior:



### Actual Behavior:



### Steps to reproduce (I have confirmed I can reproduce this issue on the [`develop`](https://github.com/CMB2/CMB2/tree/develop) branch):

1.
2.

### CMB2 Field Registration Code:

```php
add_action( 'cmb2_admin_init', 'yourprefix_register_demo_metabox' );
function yourprefix_register_demo_metabox() {

$cmb = new_cmb2_box( array(
// Box Config...
) );

$cmb->add_field( array(
// Field Config...
) );

// Additional fields...
}
```
10 changes: 10 additions & 0 deletions includes/CMB2/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Fixes #{issue-number}.

### Changes proposed in this pull request

-

-

-

5 changes: 5 additions & 0 deletions includes/CMB2/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
### Enhancements
### Bug Fixes

## [2.5.1 - 2018-12-10](https://github.com/CMB2/CMB2/releases/tag/v2.5.1)

### Bug Fixes
* Fix issue when the `core/editor` object does not exist (is undefined), causing incompatibility issues with Yoast and likely others. Fixes [#1197](https://github.com/CMB2/CMB2/issues/1197)

## [2.5.0 - 2018-12-08](https://github.com/CMB2/CMB2/releases/tag/v2.5.0)

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-display-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-display-rtl.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-display.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-display.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-front-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-front-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-front.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-front.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-rtl.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* CMB2 - v2.5.0 - 2018-12-08
* CMB2 - v2.5.1 - 2018-12-10
* https://cmb2.io
* Copyright (c) 2018
* Licensed GPLv2+
Expand Down
2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* CMB2 - v2.5.0 - 2018-12-08
* CMB2 - v2.5.1 - 2018-12-10
* https://cmb2.io
* Copyright (c) 2018
* Licensed GPLv2+
Expand Down
2 changes: 1 addition & 1 deletion includes/CMB2/css/cmb2.min.css

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions includes/CMB2/init.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Bill Erickson (@billerickson / billerickson.net)
* Andrew Norcross (@norcross / andrewnorcross.com)
*
* Version: 2.5.0
* Version: 2.5.1
*
* Text Domain: cmb2
* Domain Path: languages
Expand Down Expand Up @@ -53,7 +53,7 @@
* ***********************************************************************
*/

if ( ! class_exists( 'CMB2_Bootstrap_250', false ) ) {
if ( ! class_exists( 'CMB2_Bootstrap_251', false ) ) {

/**
* Handles checking for and loading the newest version of CMB2
Expand All @@ -66,15 +66,15 @@
* @license GPL-2.0+
* @link https://cmb2.io
*/
class CMB2_Bootstrap_250 {
class CMB2_Bootstrap_251 {

/**
* Current version number
*
* @var string
* @since 1.0.0
*/
const VERSION = '2.5.0';
const VERSION = '2.5.1';

/**
* Current version hook priority.
Expand All @@ -83,20 +83,20 @@ class CMB2_Bootstrap_250 {
* @var int
* @since 2.0.0
*/
const PRIORITY = 9966;
const PRIORITY = 9965;

/**
* Single instance of the CMB2_Bootstrap_250 object
* Single instance of the CMB2_Bootstrap_251 object
*
* @var CMB2_Bootstrap_250
* @var CMB2_Bootstrap_251
*/
public static $single_instance = null;

/**
* Creates/returns the single instance CMB2_Bootstrap_250 object
* Creates/returns the single instance CMB2_Bootstrap_251 object
*
* @since 2.0.0
* @return CMB2_Bootstrap_250 Single instance object
* @return CMB2_Bootstrap_251 Single instance object
*/
public static function initiate() {
if ( null === self::$single_instance ) {
Expand Down Expand Up @@ -188,6 +188,6 @@ public function l10ni18n() {
}

// Make it so...
CMB2_Bootstrap_250::initiate();
CMB2_Bootstrap_251::initiate();

}// End if().
4 changes: 3 additions & 1 deletion includes/CMB2/js/cmb2.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,10 @@ window.CMB2 = window.CMB2 || {};
}

wp.data.subscribe( function() {
var editor = wp.data.hasOwnProperty('select') ? wp.data.select( 'core/editor' ) : null;

// the post is currently being saved && we have tinymce editors
if ( wp.data.select( 'core/editor' ).isSavingPost() && window.tinyMCE.editors.length ) {
if ( editor && editor.isSavingPost && editor.isSavingPost() && window.tinyMCE.editors.length ) {
for ( var i = 0; i < window.tinyMCE.editors.length; i++ ) {
window.tinyMCE.editors[i].save();
}
Expand Down
2 changes: 1 addition & 1 deletion includes/CMB2/js/cmb2.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit a5480a5

Please sign in to comment.