Skip to content

Commit

Permalink
Merge pull request #5 from nathanbarry/1.3.3
Browse files Browse the repository at this point in the history
1.3.3
  • Loading branch information
davidlamarwheeler committed Sep 10, 2015
2 parents 3e3e9d4 + b89f4f5 commit 64842cc
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 73 deletions.
59 changes: 0 additions & 59 deletions README.md

This file was deleted.

9 changes: 9 additions & 0 deletions lib/multi_value_field_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ public function get_bulk_actions() {
return $this->_bulk_actions;
}

/**
* Get a list of columns
*
* @return array
*/
public function get_columns() {
return $this->_columns;
}

/**
* Add a column to the table
*
Expand Down
15 changes: 9 additions & 6 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
=== ConvertKit ===
Contributors: nickohrn, davidlamarwheeler
Contributors: nickohrn, davidlamarwheeler
Donate link: https://convertkit.com
Tags: email, marketing, embed form, convertkit, capture
Requires at least: 3.6
Tested up to: 3.6
Stable tag: 1.0.0
Requires at least: 3.6
Tested up to: 4.3
Stable tag: 1.3.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

ConvertKit is an email marketing platform for capturing leads from your WordPress blog.
ConvertKit is an email marketing platform for capturing leads from your WordPress blog.

== Description ==

Expand Down Expand Up @@ -44,6 +44,10 @@ Yes, for it to work you must first have an account on ConvertKit.com

== Changelog ==

### 1.3.3

* Updated for compatibility with WordPress 4.3

### 1.3.2

* Another fix for a pesky bug causing syntax errors
Expand All @@ -70,4 +74,3 @@ Yes, for it to work you must first have an account on ConvertKit.com
* Initial release

== Upgrade notice ==

10 changes: 5 additions & 5 deletions vendor/url-to-absolute/url-to-absolute.php
Original file line number Diff line number Diff line change
Expand Up @@ -439,20 +439,20 @@ function join_url( $parts, $encode=FALSE)
}

/**
* This function encodes URL to form a URL which is properly
* This function encodes URL to form a URL which is properly
* percent encoded to replace disallowed characters.
*
* RFC3986 specifies the allowed characters in the URL as well as
* reserved characters in the URL. This function replaces all the
* disallowed characters in the URL with their repective percent
* reserved characters in the URL. This function replaces all the
* disallowed characters in the URL with their repective percent
* encodings. Already encoded characters are not encoded again,
* such as '%20' is not encoded to '%2520'.
*
* Parameters:
* url the url to encode.
*
* Return values:
* Returns the encoded URL string.
* Returns the encoded URL string.
*/
function encode_url($url) {
$reserved = array(
Expand Down Expand Up @@ -482,4 +482,4 @@ function encode_url($url) {
return $url;
}

?>
?>
6 changes: 3 additions & 3 deletions wp-convertkit.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Plugin Name: WP ConvertKit
Plugin URI: http://convertkit.com/
Description: Quickly and easily integrate ConvertKit forms into your site.
Version: 1.2.1
Version: 1.3.3
Author: ConvertKit
Author URI: http://convertkit.com/
*/

require_once('lib/convertkit-api.php');
require_once('lib/integration/wishlist_member.php');
require_once plugin_dir_path( __FILE__ ) . "/lib/convertkit-api.php";
require_once plugin_dir_path( __FILE__ ) . "/lib/integration/wishlist_member.php";

if(!class_exists('WP_ConvertKit')) {
class WP_ConvertKit {
Expand Down

0 comments on commit 64842cc

Please sign in to comment.