Skip to content

Commit

Permalink
Merge branch 'release/1.51.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorenzo Mattei committed Aug 8, 2023
2 parents 00f3e3c + 9e370ee commit db1778c
Show file tree
Hide file tree
Showing 6 changed files with 364 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Configuration/AppStoreBuildNumber.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 46
CURRENT_PROJECT_VERSION = 47
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 1.50.2
MARKETING_VERSION = 1.51.0
4 changes: 2 additions & 2 deletions DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import BrowserServicesKit
final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"b1556a4069f2bfc1617455f906eafff0\""
public static let embeddedDataSHA = "d24ae1c8c819ff920bb0669647f6bc1b6b4f56f61a621406446d257649dcce46"
public static let embeddedDataETag = "\"abc1ea87000568b6e5e560e196a2bb4a\""
public static let embeddedDataSHA = "5c52a31abc7a22c5a69e5a40f1686cbdb3bf8a9e4de5c259b5f74e5ce40a6677"
}

var embeddedDataEtag: String {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import BrowserServicesKit
final class AppTrackerDataSetProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"f43b7810f0374c5c6ebf3563531c004f\""
public static let embeddedDataSHA = "243bc93361f4ba1bbdde7ae67f0169dafd0c6c1000c06d7f7acb90d34b0966c4"
public static let embeddedDataETag = "\"80559a75e5e3714d61ccca9879053a93\""
public static let embeddedDataSHA = "46fffdaa59e02e8e90a55114ff4086a4d4ea13c41b6a7f689e05d9d0cd25b0da"
}

var embeddedDataEtag: String {
Expand Down
242 changes: 236 additions & 6 deletions DuckDuckGo/ContentBlocker/macos-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1690819077465,
"version": 1691186943127,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -1755,6 +1755,15 @@
}
]
},
{
"domain": "cleartax.in",
"rules": [
{
"selector": "#credential_picker_container",
"type": "override"
}
]
},
{
"domain": "coingecko.com",
"rules": [
Expand Down Expand Up @@ -2010,6 +2019,15 @@
}
]
},
{
"domain": "indeed.com",
"rules": [
{
"selector": ".google-Only-Modal",
"type": "hide"
}
]
},
{
"domain": "indiatimes.com",
"rules": [
Expand Down Expand Up @@ -2498,6 +2516,15 @@
}
]
},
{
"domain": "vinted.fr",
"rules": [
{
"selector": ".ad-container--leaderboard",
"type": "hide"
}
]
},
{
"domain": "wunderground.com",
"rules": [
Expand Down Expand Up @@ -2673,7 +2700,7 @@
]
},
"state": "enabled",
"hash": "5568171dfb10187ccabb0ca602449e3f"
"hash": "214ef180c3de6b13185f015e63bbbb0a"
},
"exceptionHandler": {
"exceptions": [],
Expand Down Expand Up @@ -3841,6 +3868,13 @@
},
"doubleclick.net": {
"rules": [
{
"rule": "doubleclick.net/ondemand/hls/content/",
"domains": [
"history.com"
],
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1185"
},
{
"rule": "securepubads.g.doubleclick.net/gampad/ads",
"domains": [
Expand Down Expand Up @@ -4386,6 +4420,154 @@
"wp.pl"
],
"reason": "Adwall appears which reappears when dismissed. The adwall prevents interaction with the page."
},
{
"rule": "googletagservices.com/tag/js/gpt.js",
"domains": [
"13wham.com",
"22thepoint.com",
"abc3340.com",
"abc45.com",
"abc6onyourside.com",
"abc7amarillo.com",
"abcnews4.com",
"abcstlouis.com",
"azteca48.com",
"bakersfieldnow.com",
"cbs12.com",
"cbs2iowa.com",
"cbs4local.com",
"cbs6albany.com",
"cbsaustin.com",
"chattanoogacw.com",
"cnycentral.com",
"cw14online.com",
"cw18milwaukee.com",
"cw23tv.com",
"cw34.com",
"cw35.com",
"cw7michigan.com",
"cwalbany.com",
"cwbaltimore.com",
"cwcentralpa.com",
"cwcincinnati.com",
"cwcolumbus.com",
"cwlasvegas.com",
"cwnashville.tv",
"cwokc.com",
"cwomaha.tv",
"cwrochester.com",
"cwtreasurevalley.com",
"dayton247now.com",
"fox11online.com",
"fox17.com",
"fox23maine.com",
"fox28savannah.com",
"fox38corpuschristi.com",
"fox42kptm.com",
"fox47.com",
"fox49.tv",
"fox4beaumont.com",
"fox56.com",
"foxbaltimore.com",
"foxchattanooga.com",
"foxillinois.com",
"foxkansas.com",
"foxnebraska.com",
"foxreno.com",
"foxrichmond.com",
"foxrochester.com",
"foxsanantonio.com",
"idahonews.com",
"katu.com",
"katv.com",
"kcby.com",
"kdsm17.com",
"keprtv.com",
"kfdm.com",
"kfoxtv.com",
"khqa.com",
"kimatv.com",
"kjzz.com",
"klewtv.com",
"kmph.com",
"kmyu.tv",
"komonews.com",
"kpic.com",
"krcgtv.com",
"ktul.com",
"ktvl.com",
"ktvo.com",
"ktxs.com",
"kunptv.com",
"kunwtv.com",
"kutv.com",
"kval.com",
"local12.com",
"local21news.com",
"midmichigannow.com",
"my15wtcn.com",
"my24milwaukee.com",
"my48.tv",
"mycbs4.com",
"myfox28columbus.com",
"mylvtv.com",
"mynbc15.com",
"mynews4.com",
"myrdctv.com",
"mytv30web.com",
"mytvbaltimore.com",
"mytvbuffalo.com",
"mytvcharleston.com",
"mytvrichmond.com",
"mytvwichita.com",
"mytvz.com",
"nbc16.com",
"nbc24.com",
"nbcmontana.com",
"nebraska.tv",
"nevadasportsnet.com",
"news3lv.com",
"news4sanantonio.com",
"newschannel20.com",
"newschannel9.com",
"okcfox.com",
"raleighcw.com",
"siouxlandnews.com",
"southernoregoncw.com",
"star64.tv",
"thecw38.com",
"thecw46.com",
"thecwtc.com",
"turnto10.com",
"univisionseattle.com",
"upnorthlive.com",
"utv44.com",
"wabm68.com",
"wach.com",
"wchstv.com",
"wcti12.com",
"wcyb.com",
"weartv.com",
"wfgxtv.com",
"wfxl.com",
"wgme.com",
"wgxa.tv",
"wjactv.com",
"wjla.com",
"wlos.com",
"wpde.com",
"wpgh53.com",
"wsbt.com",
"wset.com",
"wtov9.com",
"wtto21.com",
"wtwc40.com",
"wutv29.com",
"wvah.com",
"wwmt.com"
],
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1173"
}
]
},
Expand Down Expand Up @@ -4849,11 +5031,18 @@
"pardot.com": {
"rules": [
{
"rule": "go.pardot.com/",
"rule": "go.pardot.com",
"domains": [
"klove.com"
"<all>"
],
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/625"
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1180"
},
{
"rule": "storage.pardot.com",
"domains": [
"<all>"
],
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1180"
}
]
},
Expand Down Expand Up @@ -5057,6 +5246,17 @@
}
]
},
"qualtrics.com": {
"rules": [
{
"rule": "qualtrics.com",
"domains": [
"<all>"
],
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1196"
}
]
},
"quantcast.com": {
"rules": [
{
Expand Down Expand Up @@ -5622,11 +5822,33 @@
"reason": "CNAME ENTRY GENERATED FROM: liveperson.net"
}
]
},
"canadapost-postescanada.ca": {
"rules": [
{
"rule": "evaluation.canadapost-postescanada.ca",
"domains": [
"<all>"
],
"reason": "CNAME ENTRY GENERATED FROM: qualtrics.com"
}
]
},
"goto.com": {
"rules": [
{
"rule": "feedback.goto.com",
"domains": [
"<all>"
],
"reason": "CNAME ENTRY GENERATED FROM: qualtrics.com"
}
]
}
}
},
"exceptions": [],
"hash": "1ba5432dfee85f56743e1726db86b0a5"
"hash": "7ab265aeb47cbefdf8f5e496c56cac4d"
},
"trackingCookies1p": {
"settings": {
Expand Down Expand Up @@ -6048,6 +6270,14 @@
"domain": "earth.google.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099"
},
{
"domain": "iscorp.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/794"
},
{
"domain": "marvel.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1194"
},
{
"domain": "ticketmaster.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/794"
Expand Down
Loading

0 comments on commit db1778c

Please sign in to comment.