Merge branch 'develop' into feature/2766

# Conflicts:
#	assets/build/css/caldera-forms-front.min.css
#	assets/css/caldera-forms-front.css
#	assets/js/caldera-forms-front.js
#	tests/bootstrap-unit.php

README.md

@@ -19,8 +19,12 @@ Requires: git, npm, Grunt.
     - `git clone [email protected]:CalderaWP/Caldera-Forms.git`
 - Switch directory
     - `cd Caldera-Forms.git`
-- npm install
-    - `npm i`
+- If you are using your own local development environment:
+    - `npm i && composer install`
+- If you are wish to use the provided local development environment
+    - `composer dev:install`
+
+
 ### Build For Release
 To create a build to ship to WordPress.org:
 `npm run package`
@@ -75,21 +79,13 @@ The local server is [http://localhost:8228](http://localhost:8228)
 
 
 #### Install Test Environment
-* Make sure all dependencies are installed:
-    - `composer update && npm update`
-* Install local development environment
-    - `composer wp:install
-        - Runs installer. Make sure Docker is running. May take awhile.
-    - `composer wp:activate`
-        - Activates Caldera Forms and Gutenberg and sets permalinks.
+* Install local development environment, dependencies and setup test forms
+    - `composer dev:install`
+        -  May take awhile.
 * Go to [http://localhost:8228](http://localhost:8228) and make sure you have a WordPress site and can login.
     - Username: admin
     - password: password
 
-* Install the tests forms and pages for them.
-    - `composer wp:test:setup`
-    - Adds forms needed for e2e tests and one page for each form. Useful for manual QA as well.
-
 ### Test Structures
 * PHP tests go in /tests and are run using phpunit
     - Integration tests, which require WordPress, are in tests. These used to be all the tests we have.
@@ -103,6 +99,8 @@ The local server is [http://localhost:8228](http://localhost:8228)
 
 #### Commands
 ##### Composer
+* `composer dev:install` - Installs dependencies, Docker-based test environment and sets up test forms.
+* `composer dev:destroy` - Deletes dependencies and the Docker-based test environment.
 * `composer wp:install` - Installs Docker-based test environment.
 * `composer wp:start` - Starts Docker-based test environment.
 * `composer wp:activate` - Activate plugins in Docker-based environment.
@@ -111,6 +109,7 @@ The local server is [http://localhost:8228](http://localhost:8228)
 * `composer wp:destroy` - Removes (including the database) the test environment and destroys containers.
 * `composer test:setup` - Adds test forms and puts them on pages.
 * `composer test:delete` - Delete test forms and pages the are on.
+* `composer nuke` - Deletes dependencies, including lock files -- NPM and Composer.
 
 ##### Composer
 * `npm test` - Run JavaScript test watcher

assets/js/caldera-forms-front.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-20 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-10-24 *//**
  * Simple event bindings for form state
  *
  * In general, access through CFState.events() not directly.
@@ -6826,7 +6826,8 @@ window.addEventListener("load", function(){
 						idAttr:  form_id,
 						formId: formId,
 						state: state,
-						fieldIds: CFFIELD_CONFIG[instance].fields.hasOwnProperty( 'ids' ) ? CFFIELD_CONFIG[instance].fields.ids : []
+						fieldIds: CFFIELD_CONFIG[instance].fields.hasOwnProperty( 'ids' ) ? CFFIELD_CONFIG[instance].fields.ids : [],
+						nonce: jQuery( '#_cf_verify_' + formId ).val()
 					});
 
 

assets/js/entry-viewer-2.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-20 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-10-24 *//**
  * API Client for Caldera Forms API for a single form
  *
  * @since 1.5.0

assets/js/parsley.min.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-20 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-10-24 *//*!
 * Parsley.js
 * Version 2.8.1 - built Sat, Feb 3rd 2018, 2:27 pm
 * http://parsleyjs.org

assets/js/vue.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-20 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-10-24 *//*!
  * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.

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__));
 

composer.json

@@ -67,6 +67,9 @@
         "mockery/mockery": ">=0.9 <2"
     },
     "scripts" : {
+        "dev:install": "composer install && npm install && composer wp:install && composer wp:activate && composer test:setup",
+        "dev:destroy": "composer nuke && composer wp:destroy",
+        "nuke": "rm package-lock.json && rm composer.lock && rm yarn.lock && rm -rf node_modules/ && rm -rf vendor",
         "wp:install": "bash ./bin/install-docker.sh && composer wp:config",
         "wp:activate": "bash ./bin/activate-plugin.sh",
         "test:setup": "bash ./bin/setup-test-forms.sh",

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": {

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
 

tests/bootstrap-unit.php

@@ -5,7 +5,12 @@
  */
 
 
+<<<<<<< HEAD
 $_plugin_root_dir = dirname(dirname(__FILE__ ));
+=======
+$_plugin_root_dir = dirname(dirname(__FILE__));
+
+>>>>>>> develop
 // Load Patchwork before everything else in order to allow us to redefine WordPress and plugin functions.
 require_once $_plugin_root_dir . '/vendor/brain/monkey/inc/patchwork-loader.php';
 require_once $_plugin_root_dir . '/vendor/autoload.php';