Merge pull request #8459 from easydigitaldownloads/release/2.10

Release/2.10
awesomemotive · Mar 9, 2021 · 520e456 · 520e456
2 parents e0065c0 + cc8f7e5
commit 520e456
Show file tree

Hide file tree

Showing 57 changed files with 7,037 additions and 862 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,7 @@ Easy-Digital-Downloads.iml
 *.pydevproject
 .project
 .metadata
-build/
+/build
 tmp/
 tests/clover.xml
 
@@ -35,3 +35,6 @@ vendor
 
 # Temporary files
 *~
+
+# Stripe
+includes/gateways/stripe
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -51,6 +51,7 @@ module.exports = function(grunt) {
  checktextdomain: {
  options:{
  text_domain: 'easy-digital-downloads',
+ correct_domain: true,
  keywords: [
  '__:1,2d',
  '_e:1,2d',
@@ -155,9 +156,36 @@ module.exports = function(grunt) {
  }
  },
 
+ replace: {
+ stripe: {
+ options: {
+ patterns: [
+ {
+ match: /edd_stripe_bootstrap/g,
+ replacement: 'edd_stripe_core_bootstrap',
+ expression: true,
+ },
+ {
+ match: /remove_action(.*);/g,
+ replacement: '',
+ expression: true,
+ }
+ ]
+ },
+ files: [
+ {
+ expand: true,
+ flatten: true,
+ src: [ 'includes/gateways/stripe/edd-stripe.php' ],
+ dest: 'includes/gateways/stripe'
+ }
+ ]
+ }
+ }
+
  });
 
  // Build task(s).
- grunt.registerTask( 'build', [ 'cssmin', 'uglify', 'force:checktextdomain', 'makepot', 'clean', 'copy', 'compress' ] );
+ grunt.registerTask( 'build', [ 'cssmin', 'uglify', 'force:checktextdomain', 'makepot', 'replace', 'clean', 'copy', 'compress' ] );
 
 };
diff --git a/assets/css/colorbox.css b/assets/css/colorbox.css
diff --git a/assets/css/colorbox.min.css b/assets/css/colorbox.min.css
diff --git a/assets/css/edd-admin.css b/assets/css/edd-admin.css
@@ -17,7 +17,8 @@
  text-indent: -9999px;
  visibility: hidden;
 }
-.edd-wrap a {
+.edd-wrap a,
+.edd-notice .notice-dismiss {
  text-decoration: none;
 }
 a.edd-delete {

diff --git a/assets/css/edd-admin.min.css b/assets/css/edd-admin.min.css
diff --git a/assets/images/colorbox/border.png b/assets/images/colorbox/border.png
diff --git a/assets/images/colorbox/controls.png b/assets/images/colorbox/controls.png
diff --git a/assets/images/colorbox/ie6/borderBottomCenter.png b/assets/images/colorbox/ie6/borderBottomCenter.png
diff --git a/assets/images/colorbox/ie6/borderBottomLeft.png b/assets/images/colorbox/ie6/borderBottomLeft.png
diff --git a/assets/images/colorbox/ie6/borderBottomRight.png b/assets/images/colorbox/ie6/borderBottomRight.png
diff --git a/assets/images/colorbox/ie6/borderMiddleLeft.png b/assets/images/colorbox/ie6/borderMiddleLeft.png
diff --git a/assets/images/colorbox/ie6/borderMiddleRight.png b/assets/images/colorbox/ie6/borderMiddleRight.png
diff --git a/assets/images/colorbox/ie6/borderTopCenter.png b/assets/images/colorbox/ie6/borderTopCenter.png
diff --git a/assets/images/colorbox/ie6/borderTopLeft.png b/assets/images/colorbox/ie6/borderTopLeft.png
diff --git a/assets/images/colorbox/ie6/borderTopRight.png b/assets/images/colorbox/ie6/borderTopRight.png
diff --git a/assets/images/colorbox/loading.gif b/assets/images/colorbox/loading.gif
diff --git a/assets/images/colorbox/loading_background.png b/assets/images/colorbox/loading_background.png
diff --git a/assets/images/colorbox/overlay.png b/assets/images/colorbox/overlay.png
diff --git a/assets/js/admin-scripts.js b/assets/js/admin-scripts.js
@@ -1204,18 +1204,6 @@ jQuery(document).ready(function ($) {
 
  emails : function() {
 
- // Show the email template previews
- var email_preview_wrap = $('#email-preview-wrap');
- if( email_preview_wrap.length ) {
- var emailPreview = $('#email-preview');
- email_preview_wrap.colorbox({
- inline: true,
- href: emailPreview,
- width: '80%',
- height: 'auto'
- });
- }
-
  $('#edd-sendwp-connect').on('click', function(e) {
 
  e.preventDefault();

diff --git a/assets/js/admin-scripts.min.js b/assets/js/admin-scripts.min.js
diff --git a/assets/js/edd-checkout-global.js b/assets/js/edd-checkout-global.js
@@ -184,9 +184,12 @@ window.EDD_Checkout = (function($) {
 
  } else {
 
- if (!inputs.is('.card-address-2')) {
- inputs.attr('required','required');
- }
+ inputs.each( function () {
+ var $input = $( this );
+ if ( ! $input.is( '.card-name, .card-address, .card-address-2' ) ) {
+ $input.prop( 'required', true );
+ }
+ } );
  $('#edd_cc_fields,#edd_cc_address').slideDown();
 
  }

diff --git a/assets/js/edd-checkout-global.min.js b/assets/js/edd-checkout-global.min.js