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

rollback #URL macro #2585

Merged
merged 3 commits into from
Mar 13, 2024
Merged

rollback #URL macro #2585

merged 3 commits into from
Mar 13, 2024

Conversation

mallexxx
Copy link
Collaborator

@mallexxx mallexxx commented Mar 13, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/414235014887631/1206830008080445/f
BSK PR: duckduckgo/BrowserServicesKit#718
macOS PR: duckduckgo/macos-browser#2403

Description:

  • roll back #URL macro

Steps to test this PR:

  1. validate CI steps
  2. validate ./scripts/loc_export.sh script works

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 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme
Internal references:

Software Engineering Expectations
Technical Design Template

@mallexxx mallexxx requested a review from brindy March 13, 2024 13:46
@mallexxx mallexxx mentioned this pull request Mar 13, 2024
Merged
6 tasks
@mallexxx mallexxx mentioned this pull request Mar 13, 2024
Merged
@mallexxx mallexxx requested review from dus7 and removed request for brindy March 13, 2024 13:50
mallexxx added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Mar 13, 2024
@mallexxx
rollback #URL macro (#718)
4e05a46 
Task/Issue URL: https://app.asana.com/0/414235014887631/1206830008080445/f
iOS PR: duckduckgo/iOS#2585
macOS PR: duckduckgo/macos-browser#2403
@mallexxx mallexxx merged commit 40c02ec into main Mar 13, 2024
13 checks passed
@mallexxx mallexxx deleted the alex/rollback-macros branch March 13, 2024 15:49
mallexxx added a commit to duckduckgo/macos-browser that referenced this pull request Mar 13, 2024
@mallexxx
rollback #URL macro (#2403)
4000ffe 
Task/Issue URL:
https://app.asana.com/0/414235014887631/1206830008080445/f
BSK PR: duckduckgo/BrowserServicesKit#718
iOS PR: duckduckgo/iOS#2585
samsymons added a commit that referenced this pull request Mar 14, 2024
@samsymons
Merge branch 'main' into sam/vpn-ui-improvements
289aa41 
* main:
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)
samsymons added a commit that referenced this pull request Mar 14, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…
f0898f9 
…-lottie-animation

* sam/vpn-ui-improvements:
  Fix unit tests.
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)
samsymons added a commit that referenced this pull request Mar 14, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-2-lottie-animation' into sam/vp…
4a5c86b 
…n-ui-improvements-3-combine-notification-settings

* sam/vpn-ui-improvements-2-lottie-animation:
  Fix unit tests.
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)
samsymons added a commit that referenced this pull request Mar 14, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-3-combine-notification-settings…
0834778 
…' into sam/vpn-ui-improvements-4-location-setting-change

# By Sam Symons (2) and others
# Via Sam Symons (4) and Diego Rey Mendez (1)
* sam/vpn-ui-improvements-3-combine-notification-settings:
  Fix unit tests.
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Mar 18, 2024
@samsymons
Merge branch 'main' into sam/improve-vpn-metadata
df32fcd 
* main: (31 commits)
  Use History in Suggestions on iOS (#2552)
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dus7 dus7 dus7 approved these changes

Assignees
No one assigned
Labels
includes-BSK-changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mallexxx @dus7