Merge branch 'release/3.6.0' into develop

weDevsOfficial · Nov 23, 2022 · baa3290 · baa3290
2 parents 0714173 + 0fd9de0
commit baa3290
Show file tree

Hide file tree

Showing 14 changed files with 1,146 additions and 544 deletions.
diff --git a/admin/html/whats-new.php b/admin/html/whats-new.php
@@ -1,5 +1,39 @@
 <?php
 $changelog = [
+    [
+        'version'  => 'Version 3.6.0',
+        'released' => '2022-11-23',
+        'changes'  => [
+            [
+                'title' => __( 'Admin dashboard news and update meta-box added', 'wp-user-frontend' ),
+                'type'  => 'Enhancement',
+            ],
+            [
+                'title' => __( 'Upgrade prompts design', 'wp-user-frontend' ),
+                'type'  => 'Enhancement',
+            ],
+            [
+                'title' => __( 'Email style handled', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'text-area type selection(Normal, Rich text-area, Teeny Rich text-area) bug in field options', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'Frontend form validation', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'Default value not saving for radio, dropdown, checkbox', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'sweetalert2 version', 'wp-user-frontend' ),
+                'type'  => 'Update',
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.5.29',
         'released' => '2022-09-15',

diff --git a/assets/js/frontend-form.min.js b/assets/js/frontend-form.min.js
diff --git a/assets/js/upload.min.js b/assets/js/upload.min.js
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,15 @@
+= v3.6.0 (23 Nov, 2022) =
+
+* Enhancement - Admin dashboard news and update meta-box added
+* Enhancement - Upgrade prompts design
+
+* Fix - Email style handled
+* Fix - text-area type selection(Normal, Rich text-area, Teeny Rich text-area) bug in field options
+* Fix - Frontend form validation
+* Fix - Default value not saving for radio, dropdown, checkbox
+
+* Update - sweetalert2 version
+
 v3.5.29 (15 Sep, 2022) =
 
 * Enhancement - Short-code encryption updated for registration page

diff --git a/includes/class-upgrades.php b/includes/class-upgrades.php
@@ -26,7 +26,7 @@ class WPUF_Upgrades {
     /**
      * The class constructor
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */
@@ -93,7 +93,7 @@ public function perform_updates() {
     /**
      * Show upgrade notice.
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */

diff --git a/includes/free/loader.php b/includes/free/loader.php
@@ -205,7 +205,7 @@ public function settings_login_prompt( $fields ) {
     /**
      * The pro settings preview on the free version
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @param $settings_fields
      *
@@ -264,7 +264,7 @@ public function pro_sections( $sections ) {
     /**
      * The pro settings preview on the free version
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @param $settings_fields
      *
@@ -954,7 +954,7 @@ public function post_form_templates( $integrations ) {
     /**
      * Pro form templates for previewing
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @param array $integrations
      *
@@ -971,7 +971,7 @@ public function pro_form_previews( $integrations ) {
     /**
      * A preview page to show the Pro Modules of WPUF
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */
@@ -983,7 +983,7 @@ public function modules_preview_page() {
     /**
      * Load required style and js for Modules page
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */
@@ -995,7 +995,7 @@ public function load_modules_scripts() {
     /**
      * Get the info of the pro modules as an array
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return string[]
      */
@@ -1127,7 +1127,7 @@ public function pro_modules_info() {
     /**
      * The content of the module page
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @param array $modules
      *
@@ -1290,7 +1290,7 @@ class="wpuf-button button-upgrade-to-pro">
     /**
      * payment gateways for previewing in the free version
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @param $gateways
      *
@@ -1316,7 +1316,7 @@ public function wpuf_payment_gateways( $gateways ) {
     /**
      * The subscription tabs from User Frontend > Subscription > Add/Edit Subscription
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */
@@ -1334,7 +1334,7 @@ public function subscription_tabs() {
     /**
      * The subscription tab contents from User Frontend > Subscription > Add/Edit Subscription
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return void
      */

diff --git a/includes/free/prompt.php b/includes/free/prompt.php
@@ -20,7 +20,7 @@ public static function get_pro_prompt_text() {
     /**
      * Get the upgrade to pro url from the PRO Prompts
      *
-     * @since WPUF_SINCE
+     * @since 3.6.0
      *
      * @return string
      */