Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions classes/controllers/FrmAddonsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FrmAddonsController {
protected static $plugin;

/**
* @since x.x
* @since 6.15
*/
public static function load_admin_hooks() {
add_action( 'admin_menu', __CLASS__ . '::menu', 100 );
Expand All @@ -43,7 +43,7 @@ public static function load_admin_hooks() {
/**
* Enqueues the Add-Ons page scripts and styles.
*
* @since x.x
* @since 6.15
*
* @return void
*/
Expand Down Expand Up @@ -76,7 +76,7 @@ public static function enqueue_assets() {
/**
* Get the Add-Ons page JS variables as an array.
*
* @since x.x
* @since 6.15
*
* @return array
*/
Expand Down Expand Up @@ -162,7 +162,7 @@ public static function list_addons() {
/**
* Organize and set categories.
*
* @since x.x
* @since 6.15
*
* @return void
*/
Expand Down Expand Up @@ -217,7 +217,7 @@ protected static function organize_and_get_categories() {
/**
* Organize and set categories.
*
* @since x.x
* @since 6.15
*
* @param array $addon The addon array that will be modified by reference.
* @return void
Expand Down
2 changes: 1 addition & 1 deletion classes/controllers/FrmDeactivationFeedbackController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Deactivation feedback controller
*
* @package Formidable
* @since x.x
* @since 6.15
*/

if ( ! defined( 'ABSPATH' ) ) {
Expand Down
22 changes: 11 additions & 11 deletions classes/helpers/FrmAddonsHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Provides helper functions for managing add-ons in the admin area.
*
* @since x.x
* @since 6.15
*/
class FrmAddonsHelper {
/**
Expand All @@ -25,7 +25,7 @@ class FrmAddonsHelper {
/**
* Show the CTA to upgrade or renew.
*
* @since x.x
* @since 6.15
* @return void
*/
public static function show_upgrade_renew_cta() {
Expand All @@ -47,7 +47,7 @@ public static function show_upgrade_renew_cta() {
/**
* Show 'Renew' banner for expired users.
*
* @since x.x
* @since 6.15
* @return void
*/
private static function show_expired_cta() {
Expand All @@ -65,7 +65,7 @@ private static function show_expired_cta() {
/**
* Show 'Upgrade to Pro' banner for users not connected to Pro.
*
* @since x.x
* @since 6.15
* @return void
*/
private static function show_lite_cta() {
Expand All @@ -88,7 +88,7 @@ private static function show_lite_cta() {
/**
* Show 'Upgrade' banner for non-elite users.
*
* @since x.x
* @since 6.15
* @return void
*/
private static function show_elite_cta() {
Expand Down Expand Up @@ -116,7 +116,7 @@ private static function show_elite_cta() {
/**
* Displays a reconnect link for checking add-ons status.
*
* @since x.x
* @since 6.15
* @return void
*/
public static function get_reconnect_link() {
Expand All @@ -136,7 +136,7 @@ public static function get_reconnect_link() {
/**
* Get the icon for a specific addon.
*
* @since x.x
* @since 6.15
* @param string $slug The slug of the addon.
* @return void
*/
Expand Down Expand Up @@ -177,7 +177,7 @@ public static function get_addon_icon( $slug ) {
/**
* Echo attributes for a given addon.
*
* @since x.x
* @since 6.15
*
* @param array $addon
* @return void
Expand Down Expand Up @@ -208,7 +208,7 @@ public static function add_addon_attributes( $addon ) {
/**
* Add classes for a given addon.
*
* @since x.x
* @since 6.15
*
* @param array $addon
* @return string
Expand Down Expand Up @@ -241,7 +241,7 @@ public static function is_locked() {
* Because the `FrmFormsHelper::get_plan_required` changes $addon by reference,
* we save the result inside a static field called `$plan_required`.
*
* @since x.x
* @since 6.15
*
* @param array $addon The addon array that will be modified by reference.
* @return void
Expand All @@ -253,7 +253,7 @@ private static function set_plan_required( $addon ) {
/**
* Get the required plan.
*
* @since x.x
* @since 6.15
*
* @return false|string
*/
Expand Down
4 changes: 2 additions & 2 deletions classes/helpers/FrmAppHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class FrmAppHelper {
*
* @var string
*/
public static $plug_version = '6.14.1';
public static $plug_version = '6.15';

/**
* @var bool
Expand Down Expand Up @@ -4335,7 +4335,7 @@ public static function tooltip_icon( $tooltip_text, $atts = array() ) {
/**
* Prints errors for settings in onboarding wizard or template settings.
*
* @since x.x
* @since 6.15
*
* @param array $args Args.
*
Expand Down
2 changes: 1 addition & 1 deletion classes/helpers/FrmEmailHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static function remove_mandrill_br() {
/**
* Gets default from email address in header for emails.
*
* @since x.x
* @since 6.15
*
* @return string
*/
Expand Down
8 changes: 4 additions & 4 deletions classes/helpers/FrmFormsHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ public static function get_plan_required( &$item ) {
/**
* Converts legacy package names to the current standard package name.
*
* @since x.x
* @since 6.15
* @param string $package_name
* @return string The updated package name.
*/
Expand All @@ -1552,7 +1552,7 @@ public static function convert_legacy_package_names( $package_name ) {
/**
* Get the license types.
*
* @since x.x
* @since 6.15
*
* @param array $args
* @return array
Expand Down Expand Up @@ -1846,12 +1846,12 @@ public static function actions_dropdown( $atts ) {
* Retrieves the list of template categories to ignore.
*
* @since 4.03.01
* @deprecated x.x
* @deprecated 6.15
*
* @return string[] Array of categories to ignore.
*/
public static function ignore_template_categories() {
_deprecated_function( __METHOD__, 'x.x' );
_deprecated_function( __METHOD__, '6.15' );

return self::get_license_types();
}
Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmAddon.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function edd_plugin_updater() {
}

/**
* Updates information on the "View version x.x details" page with custom data.
* Updates information on the "View version 6.15 details" page with custom data.
*
* @uses api_request()
*
Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmField.php
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ private static function format_field_results( &$results ) {
* Cached results are unslashed in FrmField::getAll, so we need to make sure that the cached object has an extra backslash.
* Otherwise the backslash is stripped away on load.
*
* @since x.x
* @since 6.15
*
* @param stdClass $result
* @return void
Expand Down
2 changes: 1 addition & 1 deletion formidable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Formidable Forms
* Description: Quickly and easily create drag-and-drop forms
* Version: 6.14.1
* Version: 6.15
* Plugin URI: https://formidableforms.com/
* Author URI: https://formidableforms.com/
* Author: Strategy11 Form Builder Team
Expand Down
2 changes: 1 addition & 1 deletion js/addons-page.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/form-templates.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions js/formidable.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function frmFrontFormJS() {
/**
* Validates a field value.
*
* @since x.x Added `onSubmit` parameter.
* @since 6.15 Added `onSubmit` parameter.
*
* @param {HTMLElement} field Field input.
* @param {Object} errors Errors data.
Expand All @@ -308,7 +308,7 @@ function frmFrontFormJS() {
}

/**
* @since x.x Added `onSubmit` to the data.
* @since 6.15 Added `onSubmit` to the data.
*/
triggerCustomEvent( document, 'frm_validate_field_value', {
field: field,
Expand Down Expand Up @@ -445,7 +445,7 @@ function frmFrontFormJS() {
/**
* Checks if the confirm field should be checked.
*
* @since x.x
* @since 6.15
*
* @param {HTMLElement} field Field input.
* @param {boolean} onSubmit Is `true` if the form is being submitted.
Expand All @@ -467,7 +467,7 @@ function frmFrontFormJS() {
/**
* Check the email field for errors.
*
* @since x.x Added `onSubmit` parameter.
* @since 6.15 Added `onSubmit` parameter.
*
* @param {HTMLElement} field Field input.
* @param {Object} errors Errors data.
Expand All @@ -490,7 +490,7 @@ function frmFrontFormJS() {
/**
* Check the password field for errors.
*
* @since x.x Added `onSubmit` parameter.
* @since 6.15 Added `onSubmit` parameter.
*
* @param {HTMLElement} field Field input.
* @param {Object} errors Errors data.
Expand Down
Loading