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

Better detection of AMP pages #2284

Merged
merged 4 commits into from
Jan 16, 2024
Merged

Better detection of AMP pages #2284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a5630e
Update BSK
SlayterDev Dec 21, 2023
9ba1d20
Merge branch 'main' into brad/better-amp-checks
SlayterDev Jan 8, 2024
72cb52c
Update BSK
SlayterDev Jan 12, 2024
6760ce3
Merge branch 'main' into brad/better-amp-checks
SlayterDev Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9902,7 +9902,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 101.1.1;
version = 101.1.2;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "202dc0540c214e21b89395370177873e090a7633",
"version" : "101.1.1"
"revision" : "44569e233945c099887266c1d7b8e07b25558a02",
"version" : "101.1.2"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,7 @@ But if you *do* want a peek under the hood, you can find more information about
"settings.ppro.ITR.subtitle" = "If your identity is stolen, we'll help restore it";

/* Identity theft restoration cell title for privacy pro */
"settings.ppro.ITR.title" = "Identity Theft Restioration";
"settings.ppro.ITR.title" = "Identity Theft Restoration";

/* Learn more button text for privacy pro */
"settings.ppro.learn.more" = "Learn More";
Expand All @@ -1867,7 +1867,7 @@ But if you *do* want a peek under the hood, you can find more information about
"settings.ppro.subscribe" = "Subscribe to Privacy Pro";

/* VPN cell title for privacy pro */
"settings.ppro.VPN.title" = "VPN (Virtual Private Network";
"settings.ppro.VPN.title" = "VPN";

/* Settings screen cell for long press previews */
"settings.previews" = "Long-Press Previews";
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DuckUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
targets: ["DuckUI"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.2"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SyncUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let package = Package(
],
dependencies: [
.package(path: "../DuckUI"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.2"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/Waitlist/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
targets: ["Waitlist", "WaitlistMocks"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.1.2"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down
Loading