Skip to content

Commit

Permalink
Merge release/2.1.0 into dominik/test-base-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ayoy authored Feb 1, 2024
2 parents 4b6c98c + 6bc9a30 commit ae44d25
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 200
CURRENT_PROJECT_VERSION = 201
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 2.0.0
MARKETING_VERSION = 2.1.0
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 = "\"17614921fb443aeafb249fee935598f2\""
public static let embeddedDataSHA = "5775192923dbbde0e9c264b0df9df39c92990c60abee380ec768f4140053c256"
public static let embeddedDataETag = "\"5af0f033fb461e1f8ef9431b61df37e1\""
public static let embeddedDataSHA = "0a80cc7f56e50cbbd3011e8a7c72d440c78a90df434198594d5cf80a9e0fba37"
}

var embeddedDataEtag: String {
Expand Down
38 changes: 34 additions & 4 deletions DuckDuckGo/ContentBlocker/macos-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1706568909205,
"version": 1706704064294,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -1056,7 +1056,16 @@
"customUserAgent": {
"settings": {
"defaultPolicy": "brand",
"defaultSites": [],
"defaultSites": [
{
"domain": "chase.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/988"
},
{
"domain": "web.whatsapp.com",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1780"
}
],
"webViewDefault": [
{
"domain": "accounts.google.com",
Expand All @@ -1078,7 +1087,7 @@
},
"exceptions": [],
"state": "enabled",
"hash": "005f62f0e37756cedcc2acfcb4216966"
"hash": "492b7a86e347eae43cf3d6f633a184ff"
},
"dbp": {
"state": "enabled",
Expand Down Expand Up @@ -4533,6 +4542,11 @@
"state": "disabled",
"hash": "841fa92b9728c9754f050662678f82c7"
},
"notificationPermissions": {
"exceptions": [],
"state": "disabled",
"hash": "728493ef7a1488e4781656d3f9db84aa"
},
"privacyDashboard": {
"exceptions": [],
"features": {
Expand Down Expand Up @@ -5610,6 +5624,12 @@
"domains": [
"<all>"
]
},
{
"rule": "ezodn.com",
"domains": [
"reisezoom.com"
]
}
]
},
Expand Down Expand Up @@ -6478,6 +6498,16 @@
}
]
},
"mailerlite.com": {
"rules": [
{
"rule": "mailerlite.com",
"domains": [
"<all>"
]
}
]
},
"maxymiser.net": {
"rules": [
{
Expand Down Expand Up @@ -7643,7 +7673,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "4b11a2e6e70c2de69177ce188cb9af8c"
"hash": "c9ea7e3d491209cc42758decdbbb8143"
},
"trackingCookies1p": {
"settings": {
Expand Down

0 comments on commit ae44d25

Please sign in to comment.