Merge branch 'trunk' into fix-svg-display

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased][unreleased]
 
+### Enhancements
+
+* Enable the additional media library modal filters. Fixes [#873](https://github.com/WebDevStudios/CMB2/issues/873).
+
 ## 2.2.4 - 2017-02-27
 
 ### Enhancements

README.md

@@ -18,17 +18,17 @@
 **License:**           GPLv2 or later  
 **License URI:**       [http://www.gnu.org/licenses/gpl-2.0.html](http://www.gnu.org/licenses/gpl-2.0.html)  
 
-[![Wordpress plugin](http://img.shields.io/wordpress/plugin/v/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
-[![Wordpress](http://img.shields.io/wordpress/plugin/dt/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
-[![Wordpress rating](http://img.shields.io/wordpress/plugin/r/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
+[![Wordpress plugin](https://img.shields.io/wordpress/plugin/v/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
+[![Wordpress](https://img.shields.io/wordpress/plugin/dt/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
+[![Wordpress rating](https://img.shields.io/wordpress/plugin/r/cmb2.svg)](https://wordpress.org/plugins/cmb2/)
 
 Complete contributors list found here: [github.com/WebDevStudios/CMB2/graphs/contributors](https://github.com/WebDevStudios/CMB2/graphs/contributors)
 
 ## Description
 
 CMB2 is a developer's toolkit for building metaboxes, custom fields, and forms for WordPress that will blow your mind. Easily manage meta for posts, terms, users, comments, or create custom option pages.
 
-**[Download plugin on wordpress.org](http://wordpress.org/plugins/cmb2/)**
+**[Download plugin on wordpress.org](https://wordpress.org/plugins/cmb2/)**
 
 CMB2 is a complete rewrite of [Custom Metaboxes and Fields for WordPress](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress). To get started, please follow the examples in the included `example-functions.php` file and have a look at the [basic usage instructions](https://github.com/WebDevStudios/CMB2/wiki/Basic-Usage).
 
@@ -83,6 +83,8 @@ A complete list of all our awesome contributors found here: [github.com/WebDevSt
 * [CMB Field Type: CMB2-radio-image](https://github.com/satwinderrathore/CMB2-radio-image): Image as radio buttons.
 * [CMB2 Term Select](https://github.com/florianbeck/cmb2-field-type-tags): Special CMB2 Field that allows users to define an autocomplete text field for terms. _Note: this will set the taxonomy terms, but has the option (`'apply_term' => false`) to disable and save the term ids as data instead (like for options pages, etc)._
 * [CMB2 Related Links](https://github.com/jtsternberg/CMB2-Related-Links): Allows users to add a related links via a repeating field group. Field inputs are powered by the [CMB2 Field Type: CMB2 Post Search field](https://github.com/WebDevStudios/CMB2-Post-Search-field) documented above, and so each link can be populated with existing WordPress content by clicking on the search button. _Note: this is not a standard field type, but instead a function you use in combination with CMB2::add_field()._
+* [CMB Field Type: Order](https://github.com/rubengc/cmb2-field-order): Allows users to define custom order of predefined options.
+* [CMB Field Type: Animation](https://github.com/rubengc/cmb2-field-animation): Allows users to pickup an animation from [Animate.css](https://github.com/daneden/animate.css) (includes preview of chosen animation).
 
 #### Other Helpful Resources
 * [WordPress Shortcode Button](https://github.com/jtsternberg/Shortcode_Button): Uses CMB2 fields to generate fields for shortcode input modals.
@@ -98,7 +100,7 @@ A complete list of all our awesome contributors found here: [github.com/WebDevSt
 
 
 ## Links
-* [Project Homepage](http://cmb2.io)
+* [Project Homepage](https://cmb2.io)
 * [Github project page](https://github.com/webdevstudios/CMB2)
 * [Documentation (GitHub wiki)](https://github.com/webdevstudios/CMB2/wiki)
 

bootstrap.php

@@ -11,6 +11,7 @@
 
 /**
  * Function to encapsulate the CMB2 bootstrap process.
+ *
  * @since  2.2.0
  * @return void
  */
@@ -35,6 +36,7 @@ function cmb2_bootstrap() {
 	/**
 	 * For back-compat. Does the dirty-work of instantiating all the
 	 * CMB2 instances for the cmb2_meta_boxes filter
+	 *
 	 * @since  2.0.2
 	 */
 	$cmb_config_arrays = apply_filters( 'cmb2_meta_boxes', array() );
@@ -50,6 +52,7 @@ function cmb2_bootstrap() {
 	/**
 	 * Get all created metaboxes, and instantiate CMB2_hookup
 	 * on metaboxes which require it.
+	 *
 	 * @since  2.0.2
 	 */
 	foreach ( CMB2_Boxes::get_all() as $cmb ) {
@@ -63,7 +66,6 @@ function cmb2_bootstrap() {
 			$rest = new CMB2_REST( $cmb );
 			$rest->universal_hooks();
 		}
-
 	}
 
 	/**
@@ -72,4 +74,4 @@ function cmb2_bootstrap() {
 	do_action( 'cmb2_after_init' );
 }
 
-// End. That's it, folks! //
+/* End. That's it, folks! */