Merge pull request #40 from WordImpress/release/1.7

Merge updates
impress-org · Oct 10, 2016 · 2293794 · 2293794
2 parents 9087ad1 + fc6133d
commit 2293794
Show file tree

Hide file tree

Showing 124 changed files with 859 additions and 773 deletions.
diff --git a/includes/actions.php b/includes/actions.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/EDD_SL_Plugin_Updater.php b/includes/admin/EDD_SL_Plugin_Updater.php
@@ -3,7 +3,7 @@
 // uncomment this line for testing
 //set_site_transient( 'update_plugins', null );
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/add-ons.php b/includes/admin/add-ons.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/admin-actions.php b/includes/admin/admin-actions.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/admin-footer.php b/includes/admin/admin-footer.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/admin-pages.php b/includes/admin/admin-pages.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/class-addon-activation-banner.php b/includes/admin/class-addon-activation-banner.php
@@ -7,7 +7,7 @@
  * https://github.com/WordImpress/plugin-activation-banner-demo
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/class-admin-notices.php b/includes/admin/class-admin-notices.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/class-api-keys-table.php b/includes/admin/class-api-keys-table.php
@@ -9,7 +9,7 @@
  * @since       1.1
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/class-give-settings.php b/includes/admin/class-give-settings.php
@@ -511,27 +511,27 @@ public function give_settings( $active_tab ) {
 							'id'   => 'enable_tags',
 							'type' => 'checkbox'
 						),
-						array(
-							'name' => esc_html__( 'Term and Conditions', 'give' ),
-							'desc' => '',
-							'id'   => 'give_title_display_settings_4',
-							'type' => 'give_title'
-						),
-						array(
-							'name' => esc_html__( 'Agree to Terms Label', 'give' ),
-							'desc' => esc_html__( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder. Note: You can customize the label per form as needed.', 'give' ),
-							'id'   => 'agree_to_terms_label',
-							'attributes'  => array(
-								'placeholder' => esc_attr__( 'Agree to Terms?', 'give' ),
-							),
-							'type' => 'text'
-						),
-						array(
-							'name' => esc_html__( 'Agreement Text', 'give' ),
-							'desc' => esc_html__( 'This is the actual text which the user will have to agree to in order to make a donation. Note: You can customize the content per form as needed.', 'give' ),
-							'id'   => 'agreement_text',
-							'type' => 'wysiwyg'
-						),
+						// array(
+						// 	'name' => esc_html__( 'Term and Conditions', 'give' ),
+						// 	'desc' => '',
+						// 	'id'   => 'give_title_display_settings_4',
+						// 	'type' => 'give_title'
+						// ),
+						// array(
+						// 	'name' => esc_html__( 'Agree to Terms Label', 'give' ),
+						// 	'desc' => esc_html__( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder. Note: You can customize the label per form as needed.', 'give' ),
+						// 	'id'   => 'agree_to_terms_label',
+						// 	'attributes'  => array(
+						// 		'placeholder' => esc_attr__( 'Agree to Terms?', 'give' ),
+						// 	),
+						// 	'type' => 'text'
+						// ),
+						// array(
+						// 	'name' => esc_html__( 'Agreement Text', 'give' ),
+						// 	'desc' => esc_html__( 'This is the actual text which the user will have to agree to in order to make a donation. Note: You can customize the content per form as needed.', 'give' ),
+						// 	'id'   => 'agreement_text',
+						// 	'type' => 'wysiwyg'
+						// ),
 					)
 				)
 

diff --git a/includes/admin/customers/class-customer-table.php b/includes/admin/customers/class-customer-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/customers/customer-actions.php b/includes/admin/customers/customer-actions.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/customers/customer-functions.php b/includes/admin/customers/customer-functions.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/customers/customers.php b/includes/admin/customers/customers.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/dashboard-widgets.php b/includes/admin/dashboard-widgets.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/forms/dashboard-columns.php b/includes/admin/forms/dashboard-columns.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/forms/metabox.php b/includes/admin/forms/metabox.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/payments/actions.php b/includes/admin/payments/actions.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/payments/class-payments-table.php b/includes/admin/payments/class-payments-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/payments/payments-history.php b/includes/admin/payments/payments-history.php
@@ -9,7 +9,7 @@
  * @since       1.0
 */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/payments/view-order-details.php b/includes/admin/payments/view-order-details.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/plugins.php b/includes/admin/plugins.php
@@ -9,7 +9,7 @@
  * @since       1.4
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-api-requests-logs-list-table.php b/includes/admin/reporting/class-api-requests-logs-list-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-donor-reports-table.php b/includes/admin/reporting/class-donor-reports-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-export-earnings.php b/includes/admin/reporting/class-export-earnings.php
@@ -11,7 +11,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-export.php b/includes/admin/reporting/class-export.php
@@ -11,7 +11,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-form-reports-table.php b/includes/admin/reporting/class-form-reports-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-gateways-reports-table.php b/includes/admin/reporting/class-gateways-reports-table.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-give-graph.php b/includes/admin/reporting/class-give-graph.php
@@ -11,7 +11,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/class-sales-logs-list-table.php b/includes/admin/reporting/class-sales-logs-list-table.php
@@ -8,7 +8,7 @@
  * @license     https://opensource.org/licenses/gpl-license GNU Public License
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/export/class-batch-export-customers.php b/includes/admin/reporting/export/class-batch-export-customers.php
@@ -11,7 +11,7 @@
  * @since       1.5
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/export/class-batch-export-forms.php b/includes/admin/reporting/export/class-batch-export-forms.php
@@ -11,7 +11,7 @@
  * @since       1.5
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/export/class-batch-export.php b/includes/admin/reporting/export/class-batch-export.php
@@ -11,7 +11,7 @@
  * @since       1.5
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/export/export-functions.php b/includes/admin/reporting/export/export-functions.php
@@ -10,7 +10,7 @@
  * @license     https://opensource.org/licenses/gpl-license GNU Public License
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/graphing.php b/includes/admin/reporting/graphing.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/logs.php b/includes/admin/reporting/logs.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/pdf-reports.php b/includes/admin/reporting/pdf-reports.php
@@ -9,7 +9,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly.
+// Exit if accessed directly..
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/reports.php b/includes/admin/reporting/reports.php
@@ -15,7 +15,7 @@
  * @since       1.0
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/tools.php b/includes/admin/reporting/tools.php
@@ -9,7 +9,7 @@
  * @since       1.5
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

diff --git a/includes/admin/reporting/tools/class-give-tools-delete-test-transactions.php b/includes/admin/reporting/tools/class-give-tools-delete-test-transactions.php
@@ -10,7 +10,7 @@
  * @since       1.5
  */
 
-// Exit if accessed directly
+// Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }