Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master master into 3.0 #8469

Merged
merged 114 commits into from
Mar 12, 2021
Merged

Master master into 3.0 #8469

merged 114 commits into from
Mar 12, 2021

Conversation

ashleyfae
Copy link
Contributor

Proposed Changes:

  1. Merge master into 3.0 and fix conflicts.

ashleyfae and others added 30 commits September 8, 2020 12:49
@ashleyfae
Add price_id variable to edd_is_file_at_download_limit filter #8102
b91c245
@ashleyfae
Use param instead of property -- oops #8102
3f5ff02
@ashleyfae
Merge pull request #8103 from easydigitaldownloads/issue/8102
9903e31 
Add price_id variable to edd_is_file_at_download_limit filter #8102
@robincornett
Set login to redirect to current page instead of checkout
3f4e8e5 
#8100
@robincornett
Update redirect to use wp_get_referer, fallback to checkout
68c928a 
#8100
@robincornett
Update EDD redirect to replace the confirmation message on login screen
a70749e 
#8100
@robincornett @ashleyfae
Update redirect link
5cd7a78 
Co-authored-by: Ashley Gibson <ashley@nosegraze.com>
@robincornett
Update referer link
6e95e1b 
#8100
@robincornett
Update login error message
4d4cbd9 
#8100
@robincornett
Use wp_safe_redirect with EDD's login
3203c0b 
#8087
@robincornett
Create edd_get_lostpassword_url to use with EDD login forms
4e85380 
#8100
@robincornett
Create edd_login_register_error_message filter
acae26a 
#8100
@robincornett
Use edd_get_lostpassword_url for EDD lost password links
38e0fa4 
#8100
@robincornett @ashleyfae
Update escaping, conditional check
68587de 
Co-authored-by: Ashley Gibson <ashley@nosegraze.com>
@robincornett
Update lost password URL for WP 4.4 compatibility
56e1d5e 
#8100
@robincornett @ashleyfae
Escape redirect URL
581a27c 
Co-authored-by: Ashley Gibson <ashley@nosegraze.com>
@ashleyfae
Check if total_spent is set before using #8128
3ea6242
@ashleyfae
Merge pull request #8140 from easydigitaldownloads/issue/8128
f8a695e 
Check if total_spent is set before using #8128
@robincornett
Update fallback redirect for lost password link
9d761b4 
#8100
@ashleyfae
Merge branch 'master' into release/2.10
e8b40e5
Issue 7385 - Fixed modify_cart_item() when decreasing tax and updated…
59cefee 
… modify_cart_item_tax() unit test to check both tax increases and decreases
@ashleyfae
Prevent negative fees from getting applied twice #6837
eb84dd5
@robincornett
Update EDD_SL_Plugin_Updater to 1.8
c829cd7 
#7707
@robincornett
Allow auto_updater to run during cron to support auto-updates
481f80d 
#7707
@ashleyfae
Check if download_id exists before using #8181
24202f5
@robincornett
Remove use of INPUT_GET
8eaf988 
#8100
@ashleyfae
Merge pull request #8182 from easydigitaldownloads/issue/8181
0733860 
Check if download_id exists before using #8181
@robincornett @ashleyfae
Remove redundant escaping
c6ae269 
Co-authored-by: Ashley Gibson <ashley@nosegraze.com>
@robincornett
Revert fallback URL to checkout page
6107d41 
#8100
@ashleyfae
Ensure values are floats before doing calculations #8183
d74bec0
robincornett and others added 14 commits March 2, 2021 12:43
@robincornett
Update "Tested up to" WordPress version
39783b7 
#8444
@ashleyfae
Merge pull request #8446 from easydigitaldownloads/issue/8444
9e2f7e1 
Update "Tested up to" WordPress version
@cklosowski @robincornett
Readme content updates for 2.10 (#8451)
fa4c63c 
* Readme.txt content updates - mostly Stripe-related

* Readme.txt typo

* Readme.txt - Remove unnecessary FAQ entry

* Updating readme per PR suggestions

* Removing weird copy

* Link Stripe

Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>

* clarify stripe pro wording.

Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>

* Correct utm_content for Stripe Pro link.

Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>

Co-authored-by: Chris Klosowski <cklosowski@gmail.com>
Co-authored-by: Chris Klosowski <chris@sandhillsdev.com>
Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>
@cklosowski @ashleyfae
Version bumps and changelog for 2.10 (#8458)
11d0b05 
* Version bumps and changelog for 2.10

* Remove stray word

* Fix typos & wording in changelog.

* Add link to changelog and make credit card plural

Co-authored-by: Ashley Gibson <ashley@nosegraze.com>
@ashleyfae
Build pot file
50d6ba1
@ashleyfae
Fix merge conflict.
27373e3
@ashleyfae @robincornett
Remove unnecessary spaces in dismiss markup
e4088b8 
Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>
@ashleyfae @robincornett
Note updater version number in changelog
cc8f7e5 
Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>
@ashleyfae
Merge pull request #8459 from easydigitaldownloads/release/2.10
520e456 
Release/2.10
@cklosowski
Updating package.json to have a SemVer version
c91a8be
@cklosowski @robincornett
Version bump for 2.10.1 (#8462)
f39a0b4 
* Version bump for 2.10.1

* Fixing spelling of inclusion

Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>

Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>
@ashleyfae
Fix merge conflicts.
95b8b9f
@ashleyfae
Run build script
8f94fd0
@ashleyfae
Fix formatting.
c896029
@ashleyfae ashleyfae marked this pull request as draft March 11, 2021 13:24
@ashleyfae ashleyfae marked this pull request as ready for review March 11, 2021 14:24
@ashleyfae
Copy link
Contributor Author

@spencerfinnell Can you double check everything with Stripe and the build process is okay?

robincornett
robincornett reviewed Mar 11, 2021
View reviewed changes
Copy link
Contributor

@robincornett robincornett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running unit tests locally and these two are failing with this branch:

  • Tests_Query_Filters::test_edd_block_attachments_no_parent_bail
  • Tests_Query_Filters::test_edd_block_attachments_no_download_bail

They are not failing in release/3.0. It looks like in this branch that $files is false here, which is breaking wp_list_pluck on the next line. But I'm not seeing anything obvious that would be affecting it in this branch that isn't in release/3.0.

includes/admin/class-edd-notices.php Outdated Show resolved Hide resolved
includes/class-edd-license-handler.php Show resolved Hide resolved
spencerfinnell
spencerfinnell approved these changes Mar 11, 2021
View reviewed changes
Copy link
Contributor

@spencerfinnell spencerfinnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulling in Stripe still works as expected.

@ashleyfae
Copy link
Contributor Author

Note: failing unit tests are just #8473

@ashleyfae ashleyfae merged commit ffe8a96 into release/3.0 Mar 12, 2021
@ashleyfae ashleyfae deleted the merge/master-3.0 branch March 12, 2021 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spencerfinnell spencerfinnell spencerfinnell approved these changes

@robincornett robincornett robincornett approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ashleyfae @spencerfinnell @robincornett @cklosowski