Merge branch 'develop' into feature/2771

CalderaWP · Oct 23, 2018 · 9da80e3 · 9da80e3
2 parents 9c18acd + 38b768b
commit 9da80e3
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 18,426 deletions.
diff --git a/assets/build/css/caldera-forms-front.min.css b/assets/build/css/caldera-forms-front.min.css
diff --git a/assets/css/caldera-forms-front.css b/assets/css/caldera-forms-front.css
diff --git a/assets/js/caldera-forms-front.js b/assets/js/caldera-forms-front.js
diff --git a/assets/js/entry-viewer-2.js b/assets/js/entry-viewer-2.js
diff --git a/assets/js/parsley.min.js b/assets/js/parsley.min.js
diff --git a/assets/js/vue.js b/assets/js/vue.js
diff --git a/caldera-core.php b/caldera-core.php
@@ -4,7 +4,7 @@
   Plugin URI: https://CalderaForms.com
   Description: Easy to use, grid based responsive form builder for creating simple to complex forms.
   Author: Caldera Labs
-  Version: 1.8.0-a.1
+  Version: 1.7.4
   Author URI: http://CalderaLabs.org
   Text Domain: caldera-forms
   GitHub Plugin URI: https://github.com/CalderaWP/caldera-forms
@@ -53,7 +53,7 @@ function caldera_forms_wp_version_nag()
 
     define('CFCORE_PATH', plugin_dir_path(__FILE__));
     define('CFCORE_URL', plugin_dir_url(__FILE__));
-    define( 'CFCORE_VER', '1.8.0-a.1' );
+    define( 'CFCORE_VER', '1.7.4' );
     define('CFCORE_EXTEND_URL', 'https://api.calderaforms.com/1.0/');
     define('CFCORE_BASENAME', plugin_basename(__FILE__));
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "caldera-forms",
-  "version": "1.8.0-a.1",
+  "version": "1.7.4",
   "description": "Apex WordPress Forms",
   "main": "Gruntfile.js",
   "repository": {

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Shelob9, Desertsnowman, christiechirinos, andrewza, nahuelmahe
 Tags: form, contact form, forms, form creator, form manager, mailchimp, paypal, stripe, login, payment, forms manager, forms creation
 Requires at least: 4.7
 Tested up to: 4.9.7
-Stable tag: 1.8.0-a.1
+Stable tag: 1.7.4
 License: GPLv2
 Requires PHP: 5.6