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

Update BSK for VPN settings #2165

Merged
merged 11 commits into from
Nov 28, 2023
Merged

Update BSK for VPN settings #2165

merged 11 commits into from
Nov 28, 2023

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Nov 15, 2023

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

BSK PR: duckduckgo/BrowserServicesKit#565
macOS PR: duckduckgo/macos-browser#1858

Description

Updates BSK with the latest changes.

Testing

Just make sure NetP works well.


Internal references:

Software Engineering Expectations
Technical Design Template

@diegoreymendez diegoreymendez changed the title VPN Settings Updates BSK. Nov 15, 2023
@diegoreymendez diegoreymendez marked this pull request as ready for review November 15, 2023 18:03
@samsymons samsymons changed the title Updates BSK. Update BSK for VPN settings Nov 24, 2023
# By Graeme Arthur (2) and others
# Via Jacek Łyp (4) and others
* develop:
  Fix migrating from Bookmarks V2 and older (#2196)
  Autofill pixel parameter removed (#2182)
  Fix bug where VPN location isn't respected (#2194)
  NetP waitlist (#2160)
  NetP VPN locations screen (#2183)
  bump bsk for CBR energy usage  (#2195)
  Fix sync Form Factor specific favorites tests (#2164)
  Release 7.98.0 (#2193)
  Update BSK ref to latest one (#2191)
  Release 7.97.1 (#2190)
  Revert "Breakage report improvements" (#2189)
  Breakage report improvements (#2168)
  bump C-S-S to 4.52.0 (#2186)
  Release 7.98.0 (#2179)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
#	DuckDuckGo/NetworkProtectionVPNLocationView.swift
@samsymons samsymons merged commit ac1cd2c into develop Nov 28, 2023
10 checks passed
@samsymons samsymons deleted the diego/vpn-settings branch November 28, 2023 02:18
federicocappelli pushed a commit to duckduckgo/macos-browser that referenced this pull request Nov 28, 2023
federicocappelli pushed a commit to duckduckgo/BrowserServicesKit that referenced this pull request Nov 28, 2023
Task/Issue URL: https://app.asana.com/0/0/1205958731729757/f

iOS PR: duckduckgo/iOS#2165
macOS PR: duckduckgo/macos-browser#1858
What kind of version bump will this require?: Major/Minor/Patch

Description

Adds support for the settings we'll be showing in our macOS Settings pane.
samsymons added a commit that referenced this pull request Nov 29, 2023
# By Anh Do (1) and others
# Via Bartek Waresiak (2) and GitHub (1)
* develop:
  update theme to use system colours (#2180)
  Release 7.99.0 (#2205)
  Update iOS privacy defaults (#2185)
  Remove disabled switches from VPN Settings screen (#2203)
  Update BSK for VPN settings (#2165)
  Fix migrating from Bookmarks V2 and older (#2196)
  Autofill pixel parameter removed (#2182)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Dec 5, 2023
* develop: (40 commits)
  Address Bar Spoofing Tests + Remediation (#2181)
  Update Sync e2e tests to fit the new UI (#2215)
  NetP waitlist final touches (#2209)
  NetP: Remove port from server address (#2214)
  NetP: Fix list row colours (#2213)
  Reset VPN waitlist T&C (#2212)
  Report macOS active/new user for netP (#2207)
  Sabrina/sync setup update (#2198)
  new pixels for toolbars and share sheet  (#2208)
  Use design system fonts throughout NetP (#2211)
  moving the toggle to the top of the dashboard (#2166)
  Allow automated fetching of synced bookmarks' favicons (#2163)
  NetP Geoswitching Design Review feedback (#2206)
  update theme to use system colours (#2180)
  Release 7.99.0 (#2205)
  Update iOS privacy defaults (#2185)
  Remove disabled switches from VPN Settings screen (#2203)
  Update BSK for VPN settings (#2165)
  Fix migrating from Bookmarks V2 and older (#2196)
  Autofill pixel parameter removed (#2182)
  ...
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.

2 participants