From 07005cc65b8a0d7660868cca8c673d49a8685625 Mon Sep 17 00:00:00 2001 From: Raam Dev Date: Wed, 25 Jan 2017 21:16:51 -0500 Subject: [PATCH] Release s2Member v170126-RC (Release Candidate) --- CHANGELOG.md | 3 ++- readme.txt | 8 ++++---- s2member.php | 12 ++++++------ src/includes/translations/s2member.pot | 14 +++++++------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dbbb8e4..bb25d51b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -= $v = += v170126-RC = - (s2Member/s2Member Pro) **JW Player v7:** This release adds support for JW Player v7 in the `[s2Stream /]` shortcode. See [Issue #774](https://github.com/websharks/s2member/issues/774). - (s2Member Pro) **Bug Fix:** Allow Pro-Forms to use `success="%%sp_access_url%%"` without issue. See [Issue #1024](https://github.com/websharks/s2member/issues/1024). @@ -7,6 +7,7 @@ - (s2Member) **Bug Fix:** Updated several outdated links within the software; e.g., removing older `www.` references, correcting forum links, and more. Also corrected missing changelog. See [Issue #1027](https://github.com/websharks/s2member/issues/1027). - (s2Member Pro) **Pro Upgrader:** The pro upgrader has been refactored and now asks for your s2Member Pro License Key instead of your s2Member.com password. The next time you upgrade to the most recent version of s2Member Pro, you will be asked for your License Key. You can obtain your License Key by logging into your account at s2Member.com. Once logged in, visit your 'My Account' page, where you will find your License Key right at the top. See [Issue #668](https://github.com/websharks/s2member/issues/668). - (s2Member/s2Member Pro) **CloudFlare Compat.:** Enhancing compatibility with Rocket Loader via `data-cfasync="false"` on dynamic s2Member scripts. See: [Issue #1038](https://github.com/websharks/s2member/issues/1038). + = v161129 = - (s2Member Pro) **Bug Fix:** Stripe refund notifications via the Stripe Webhook were always interpreted by s2Member as full refunds. This release corrects this bug so that s2Member will handle partial refunds via the Stripe API properly in all cases. Props @raamdev for reporting. diff --git a/readme.txt b/readme.txt index 4e8f3d5c..4060ded2 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ === s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) === -Version: 161129 -Stable tag: 161129 +Version: 170126-RC +Stable tag: 170126-RC SSL Compatible: yes bbPress® Compatible: yes @@ -17,11 +17,11 @@ Authorize.Net® Compatible: yes w/s2Member® Pro Google® Checkout Compatible: yes w/s2Member® Pro ClickBank® Compatible: yes w/s2Member® Pro -Tested up to: 4.7 +Tested up to: 4.8-alpha Requires at least: 4.2 Requires PHP: 5.2 -Tested up to PHP: 7.0.12 +Tested up to PHP: 7.0.14 Copyright: © 2009 WebSharks, Inc. License: GNU General Public License v2 or later. diff --git a/s2member.php b/s2member.php index 755844d6..91a190a1 100644 --- a/s2member.php +++ b/s2member.php @@ -20,8 +20,8 @@ */ /* -- This section for WordPress parsing. ------------------------------------------------------------------------------ -Version: 161129 -Stable tag: 161129 +Version: 170126-RC +Stable tag: 170126-RC SSL Compatible: yes bbPress Compatible: yes @@ -36,11 +36,11 @@ Google Wallet Compatible: yes w/s2Member Pro ClickBank Compatible: yes w/s2Member Pro -Tested up to: 4.7-alpha +Tested up to: 4.8-alpha Requires at least: 4.2 Requires PHP: 5.2 -Tested up to PHP: 7.0.12 +Tested up to PHP: 7.0.14 Copyright: © 2009 WebSharks, Inc. License: GNU General Public License @@ -77,7 +77,7 @@ * * @var string */ -${__FILE__}['tmp'] = '161129'; //version// +${__FILE__}['tmp'] = '170126-RC'; //version// if(!defined('WS_PLUGIN__S2MEMBER_VERSION')) define('WS_PLUGIN__S2MEMBER_VERSION', ${__FILE__}['tmp']); /** @@ -110,7 +110,7 @@ * * @var string */ -${__FILE__}['tmp'] = '161129'; //version// +${__FILE__}['tmp'] = '170126-RC'; //version// if(!defined('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION')) define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', ${__FILE__}['tmp']); /* diff --git a/src/includes/translations/s2member.pot b/src/includes/translations/s2member.pot index 34ebee2c..25ec2cbd 100644 --- a/src/includes/translations/s2member.pot +++ b/src/includes/translations/s2member.pot @@ -1,14 +1,14 @@ -# Copyright (C) 2016 +# Copyright (C) 2017 # This file is distributed under the same license as the package. msgid "" msgstr "" -"Project-Id-Version: 161129\n" +"Project-Id-Version: 170126-RC\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n" -"POT-Creation-Date: 2016-11-29 21:26:05+00:00\n" +"POT-Creation-Date: 2017-01-26 02:14:50+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1263,8 +1263,8 @@ msgctxt "s2member-front" msgid "Thank you. Your purchase has been approved.
— Please click here to proceed." msgstr "" -#: pro/src/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:176 -#: pro/src/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:295 +#: pro/src/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:180 +#: pro/src/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:299 #: pro/src/includes/classes/gateways/stripe/stripe-sp-checkout-in.inc.php:162 msgctxt "s2member-front" msgid "Oops. Unable to generate Access Link. Please contact Support for assistance." @@ -4336,7 +4336,7 @@ msgstr "" #: src/includes/classes/paypal-return-in-proxy-x-preview.inc.php:65 msgctxt "s2member-front" -msgid "Thank you! (this is a preview, no action necessary).

* Note: each of your Customers are returned back to your site immediately after they complete checkout. This Return Page displays a message and instructions for the Customer. s2Member may change the message and instructions dynamically, based on what the Customer is actually doing (i.e., based on the type of transaction that is taking place).

* With s2Member Pro installed, it is possible to customize this Return Page in various ways." +msgid "Thank you! (this is a preview, no action necessary).

* Note: each of your Customers are returned back to your site immediately after they complete checkout. This Return Page displays a message and instructions for the Customer. s2Member may change the message and instructions dynamically, based on what the Customer is actually doing (i.e., based on the type of transaction that is taking place).

* With s2Member Pro installed, it is possible to customize this Return Page in various ways." msgstr "" #: src/includes/classes/paypal-return-in-proxy-x-preview.inc.php:66