Commit e9a77c5b authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.2.48'

parents df917ec7 3178a62f
......@@ -134,6 +134,30 @@ function ninja_forms_tab_addons(){
'link' => 'http://ninjaforms.com/downloads/freshbooks/',
'plugin' => 'ninja-forms-freshbooks/ninja-forms-freshbooks.php',
'docs' => '',
),
array (
'title' => __( 'AWeber', 'ninja-forms' ),
'image' => 'http://ninjaforms.com/wp-content/uploads/edd/2013/08/aweber-300x121.png',
'content' => __( 'Use Ninja Forms to quickly create flexible newsletter signup forms for your AWeber email marketing account.', 'ninja-forms' ),
'link' => 'http://ninjaforms.com/downloads/aweber/',
'plugin' => 'ninja-forms-aweber/ninja-forms-aweber.php',
'docs' => '',
),
array (
'title' => __( 'Picatcha', 'ninja-forms' ),
'image' => 'http://ninjaforms.com/wp-content/uploads/edd/2013/08/picatcha-header-300x121.png',
'content' => __( 'The Picatcha extension allows you to add image-based CAPTHA to your forms.', 'ninja-forms' ),
'link' => 'http://ninjaforms.com/downloads/picatcha/',
'plugin' => 'ninja-forms-picatcha/ninja-forms-picatcha.php',
'docs' => '',
),
array (
'title' => __( 'WYSIJA', 'ninja-forms' ),
'image' => 'http://ninjaforms.com/wp-content/uploads/edd/2013/08/wysija-header-300x121.jpg',
'content' => __( 'The Wisija extension allows you to quickly create newsletter signup forms for your Wisija mailing lists using the power and flexibility that Ninja Forms provides.', 'ninja-forms' ),
'link' => 'http://ninjaforms.com/downloads/wysija/',
'plugin' => 'ninja-forms-wysija/nf-wysija.php',
'docs' => '',
),
);
......
......@@ -3,7 +3,7 @@
Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
Version: 2.2.47
Version: 2.2.48
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -51,7 +51,7 @@ global $wpdb, $wp_version;
define("NINJA_FORMS_DIR", WP_PLUGIN_DIR."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_URL", plugins_url()."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_VERSION", "2.2.47");
define("NINJA_FORMS_VERSION", "2.2.48");
define("NINJA_FORMS_TABLE_NAME", $wpdb->prefix . "ninja_forms");
define("NINJA_FORMS_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fields");
define("NINJA_FORMS_FAV_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fav_fields");
......@@ -112,7 +112,7 @@ require_once( NINJA_FORMS_DIR . "/includes/display/fields/list-term-filter.php"
/* Require Pre-Registered Tabs and their sidebars */
if ( is_admin() ) {
//if ( is_admin() ) {
//Require EDD autoupdate file
if( !class_exists( 'EDD_SL_Plugin_Updater' ) ) {
......@@ -235,7 +235,7 @@ if ( is_admin() ) {
/* Manage Addons */
require_once( NINJA_FORMS_DIR . "/includes/admin/pages/ninja-forms-addons/tabs/addons/addons.php" );
}
//}
/* Require Pre-Registered Fields */
require_once( NINJA_FORMS_DIR . "/includes/fields/textbox.php" );
......
......@@ -3,7 +3,7 @@ Contributors: kstover, jameslaws, daveshine
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.4
Tested up to: 3.6
Stable tag: 2.2.47
Stable tag: 2.2.48
License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
......@@ -93,6 +93,16 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.2.48 =
*Bugs:*
* Fixed a bug that could prevent forms from displaying properly.
*Changes:*
* Added new extensions to the add-ons page.
= 2.2.47 =
*Bugs:*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment