Commit ee753ccd authored by Kevin Stover's avatar Kevin Stover

Fixing merge conflicts.

parents 5f8650ef 08be869f
......@@ -4,7 +4,7 @@
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: 4.7
Tested up to: 4.9
Stable tag: 3.3.16
Stable tag: 3.3.17
License: GPLv2 or later
With a simple drag and drop interface you can create contact forms, email subscription forms, order forms, payment forms, and any other type of form for your WordPress site.
......
File mode changed from 100644 to 100755
File mode changed from 100755 to 100644
File mode changed from 100644 to 100755
......@@ -265,7 +265,7 @@ class Ninja_Forms {
// Plugin version
if ( ! defined( 'NF_PLUGIN_VERSION' ) )
define( 'NF_PLUGIN_VERSION', '3.3.16' );
define( 'NF_PLUGIN_VERSION', '3.3.17' );
// Plugin Folder Path
if ( ! defined( 'NF_PLUGIN_DIR' ) )
......
......@@ -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: 3.3.16
Version: 3.3.17
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -57,7 +57,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/**
* @since 3.0
*/
const VERSION = '3.3.16';
const VERSION = '3.3.17';
const WP_MIN_VERSION = '4.7';
......
......@@ -3,7 +3,7 @@ Contributors: wpninjasllc, kstover, jameslaws, kbjohnson90, klhall1987, krmoorho
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: 4.7
Tested up to: 4.9
Stable tag: 3.3.16
Stable tag: 3.3.17
License: GPLv2 or later
Drag and drop fields in an intuitive UI to create contact forms, email subscription forms, order forms, payment forms, send emails and more!
......@@ -111,23 +111,36 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 3.3.16 (17 September 2018) =
= 3.3.17 (16 October 2018) =
*Bugs:*
* Resolved an issue that was sometimes causing upgrades on multi-site to delete forms from other sites on the installation.
* Corrected a bad reference in our Create a Post template documentation.
* List field values sent in an email via CSV should no longer display as NULL if their value was 0.
* Resolved a couple issues that were causing server warnings.
* Pressing the tab key while in the delete a form modal should now shift focus to the delete button.
* Resolved an issue that could have caused some display issues on the dashboard due to cached scripts.
*Changes:*
* Removed some outdated objects to improve speed of publish.
* Added modal on downgrade to prevent accidental usage.
* Password fields have been deprecated in Ninja Forms core. Some of our add-ons will still utilize them.
* Updated several of our product images on the apps & integrations tab of the dashboard.
* Our in-app marketing feed will now fetch from a remote site for more swift product updates.
* [Ninja Shop](https://getninjashop.com/?utm_medium=dashboard_banner&utm_source=ninja-forms&utm_campaign=Awareness) has arrived!
== Changelog ==
= 3.3.17 (16 October 2018) =
*Bugs:*
* Pressing the tab key while in the delete a form modal should now shift focus to the delete button.
* Resolved an issue that could have caused some display issues on the dashboard due to cached scripts.
*Changes:*
* Updated several of our product images on the apps & integrations tab of the dashboard.
* Our in-app marketing feed will now fetch from a remote site for more swift product updates.
* [Ninja Shop](https://getninjashop.com/?utm_medium=dashboard_banner&utm_source=ninja-forms&utm_campaign=Awareness) has arrived!
= 3.3.16 (17 September 2018) =
*Bugs:*
* Resolved an issue that was sometimes causing upgrades on multi-site to delete forms from other sites on the installation.
......
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