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.

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

Merge Hotfix/7.141.1 into 7.142.0 release branch #3481

Merged
merged 3 commits into from
Oct 25, 2024

Conversation

THISISDINOSAUR
Copy link
Contributor

Task/Issue URL: https://app.asana.com/0/0/1208593312489483/f
Tech Design URL:
CC:

Description:
Merges the hot fix into the latest release branch

Steps to test this PR:
1.
2.

Definition of Done (Internal Only):

Copy Testing:

  • Use of correct apostrophes in new copy, ie rather than '

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 15
  • iOS 16
  • iOS 17

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

miasma13 and others added 3 commits October 24, 2024 19:50
…nload)` (#3478)

Task/Issue URL:
https://app.asana.com/0/414709148257752/1208621179920770/f

**Description:**
When navigation should trigger download and is of data scheme handle it
via decisionHandler(.download)

**Steps to test this PR:**
- test downloads on https://napuzba.com/data-url/ (ensure proper file
name and extension)
- test website from
https://app.asana.com/0/1206777341262243/1208605967462508/f following
repro steps in
https://app.asana.com/0/0/1208605967462508/1208619416618129/f

**Definition of Done (Internal Only)**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

**Copy Testing**:

* [ ] Use of correct apostrophes in new copy, ie `’` rather than `'`

**Orientation Testing**:

* [ ] Portrait
* [ ] Landscape

**Device Testing**:

* [ ] iPhone SE (1st Gen)
* [ ] iPhone 8
* [ ] iPhone X
* [ ] iPhone 14 Pro
* [ ] iPad

**OS Testing**:

* [ ] iOS 15
* [ ] iOS 16
* [ ] iOS 17

**Theme Testing**:

* [ ] Light theme
* [ ] Dark theme

---
###### Internal references:
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
Please make sure all GH checks passed before merging. It can take around
20 minutes.
Briefly review this PR to see if there are no issues or red flags and
then merge it.
Copy link
Contributor

@ayoy ayoy left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@THISISDINOSAUR THISISDINOSAUR merged commit 84bc3af into release/7.142.0 Oct 25, 2024
13 checks passed
@THISISDINOSAUR THISISDINOSAUR deleted the hotfix/7.141.1 branch October 25, 2024 13:27
samsymons added a commit that referenced this pull request Oct 29, 2024
# By Mariusz Śpiewak (3) and others
# Via Elle Sullivan (2) and others
* main: (26 commits)
  Release 7.143.0-0 (#3497)
  Fix the condition (#3496)
  Use cookie to share subscription access token on DDG domains (#3488)
  Show VPN onboarding tips (#3429)
  TestFlight only release and promotion (#3474)
  point to BSK branch (#3492)
  Remove Recovered References (#3457)
  Fix image set warning (#3459)
  Make running the script more explicit (#3484)
  Add pixel when the error page is shown (#3487)
  Release 7.142.0-1 (#3483)
  Merge Hotfix/7.141.1 into 7.142.0 release branch (#3481)
  Release 7.141.1-0 (#3479)
  Handle 'data' scheme downloads through WebKit's `decisionHandler(.download)` (#3478)
  Email parsing improved (#3436)
  Fix updating OmniBar constraints on iOS18 (#3473)
  For BLOB downloads make sure the file is not preview-able before triggering the download (#3472)
  Set UserDefaults API access reason to 1C8F.1 (#3475)
  Bump BSK to the version with newTabSearchField feature flag (#3449)
  Use New Tab Page implementation without customization features (#3453)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants