Merge branch 'dev-dirpath'

gravityplus · Jan 24, 2014 · aca7da7 · aca7da7
2 parents 45ef3ef + 34cb80d
commit aca7da7
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 77 deletions.
diff --git a/trunk/readme.txt b/trunk/readme.txt
@@ -241,6 +241,11 @@ This plugin is released under a GPL license.
 
 == Changelog ==
 
+= 2.6 & 2.6.1 (January 23, 2014) =
+* Added: Manual export of leads - a new setting in the Form settings configuration that prevents all entries from being sent to Salesforce; only manually-approved entries may be sent.
+* Fixed: PHP static method warnings
+* Fixed: Supports paths outside of standard WP plugin directory structure
+
 = 2.5.3 =
 * Fixed: Minor PHP static method warning
 * Fixed: Dates now export properly in API and new Web-to-Lead Addon
@@ -363,6 +368,16 @@ This plugin is released under a GPL license.
 
 == Upgrade Notice ==
 
+= 2.6 & 2.6.1 (January 23, 2014) =
+* Added: Manual export of leads - a new setting in the Form settings configuration that prevents all entries from being sent to Salesforce; only manually-approved entries may be sent.
+* Added: `$feed` and `$api` variables into the `gf_salesforce_create_data` filter, so that additional things can be done in `$merge_vars` based on the feed options, and $api can be further tweaked (setAssignmentRuleHeader) based on the feed object name. Thanks, [@sc0ttkclark](https://github.com/sc0ttkclark)!
+* Fixed: PHP static method warnings
+* Fixed: Supports paths outside of standard WP plugin directory structure
+
+= 2.5.3 =
+* Fixed: Minor PHP static method warning
+* Fixed: Dates now export properly in API and new Web-to-Lead Addon
+
 = 2.5.2.1 =
 * Fixed: Minor PHP static method warning
 
@@ -470,4 +485,4 @@ This plugin is released under a GPL license.
 * Fixed some PHP notices
 
 = 1.0 =
-* Launch!
+* Launch!