Skip to content

Commit 18cc08a

Browse files
hanyutang-sandrahanyutang-sandra
committed
Merge branch 'main' of github.com:duckduckgo/privacy-configuration into htang/restore-subscription/Add-remote-config
2 parents 0b84d1d + 968a57a commit 18cc08a

15 files changed

+14031
-35671
lines changed

‎features/autoconsent.json‎

Lines changed: 13688 additions & 35642 deletions
Large diffs are not rendered by default.

‎features/element-hiding.json‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,6 +2216,10 @@
22162216
{
22172217
"selector": "#stickyFooterRoot",
22182218
"type": "hide"
2219+
},
2220+
{
2221+
"selector": ".sc-toncsa-0",
2222+
"type": "hide-empty"
22192223
}
22202224
]
22212225
},
@@ -2343,6 +2347,15 @@
23432347
}
23442348
]
23452349
},
2350+
{
2351+
"domain": "koreatimes.co.kr",
2352+
"rules": [
2353+
{
2354+
"selector": "[data-ad-position]",
2355+
"type": "hide-empty"
2356+
}
2357+
]
2358+
},
23462359
{
23472360
"domain": "kutv.com",
23482361
"rules": [
@@ -2542,15 +2555,6 @@
25422555
}
25432556
]
25442557
},
2545-
{
2546-
"domain": "modernhoney.com",
2547-
"rules": [
2548-
{
2549-
"selector": ".adthrive",
2550-
"type": "override"
2551-
}
2552-
]
2553-
},
25542558
{
25552559
"domain": "motortrend.com",
25562560
"rules": [
@@ -3522,6 +3526,15 @@
35223526
}
35233527
]
35243528
},
3529+
{
3530+
"domain": "theregister.com",
3531+
"rules": [
3532+
{
3533+
"selector": ".adun",
3534+
"type": "hide-empty"
3535+
}
3536+
]
3537+
},
35253538
{
35263539
"domain": "thetimes.co.uk",
35273540
"rules": [

‎features/tracker-allowlist.json‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,11 @@
176176
"gardeningknowhow.com",
177177
"adamtheautomator.com",
178178
"packhacker.com",
179-
"cookingclassy.com",
180-
"modernhoney.com"
179+
"cookingclassy.com"
181180
],
182181
"reason": [
183182
"gardeningknowhow.com, adamtheautomator.com, packhacker.com - https://github.com/duckduckgo/privacy-configuration/issues/1122",
184-
"cookingclassy.com - https://github.com/duckduckgo/privacy-configuration/pull/3325",
185-
"modernhoney.com - https://github.com/duckduckgo/privacy-configuration/pull/3851"
183+
"cookingclassy.com - https://github.com/duckduckgo/privacy-configuration/pull/3325 "
186184
]
187185
}
188186
]
@@ -827,6 +825,15 @@
827825
}
828826
]
829827
},
828+
"cookie-script.com": {
829+
"rules": [
830+
{
831+
"rule": "cdn.cookie-script.com",
832+
"domains": ["redlionchelwood.co.uk"],
833+
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/3892"
834+
}
835+
]
836+
},
830837
"cquotient.com": {
831838
"rules": [
832839
{
@@ -1529,6 +1536,15 @@
15291536
}
15301537
]
15311538
},
1539+
"flodesk.com": {
1540+
"rules": [
1541+
{
1542+
"rule": "flodesk.com",
1543+
"domains": ["myflodesk.com"],
1544+
"reason": "https://github.com/duckduckgo/privacy-configuration/pull/3884"
1545+
}
1546+
]
1547+
},
15321548
"flowplayer.org": {
15331549
"rules": [
15341550
{
@@ -3089,6 +3105,15 @@
30893105
}
30903106
]
30913107
},
3108+
"queryly.com": {
3109+
"rules": [
3110+
{
3111+
"rule": "api.queryly.com/v4/search.aspx",
3112+
"domains": ["fastcompany.com"],
3113+
"reason": "https://github.com/duckduckgo/privacy-configuration/pull/3894"
3114+
}
3115+
]
3116+
},
30923117
"reddit.com": {
30933118
"rules": [
30943119
{

‎overrides/android-override.json‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"exceptions": [],
5252
"features": {
5353
"tdsNextExperiment003": {
54-
"state": "enabled",
54+
"state": "disabled",
5555
"minSupportedVersion": 52361000,
5656
"rollout": {
5757
"steps": [
@@ -35596,6 +35596,29 @@
3559635596
}
3559735597
}
3559835598
]
35599+
},
35600+
{
35601+
"domain": [
35602+
"login.coinbase.com"
35603+
],
35604+
"patchSettings": [
35605+
{
35606+
"path": "/inputTypeSettings/-",
35607+
"op": "add",
35608+
"value": {
35609+
"selector": "input[data-testid='unified-login-email-prompt-input']",
35610+
"type": "credentials.username"
35611+
}
35612+
},
35613+
{
35614+
"path": "/inputTypeSettings/-",
35615+
"op": "add",
35616+
"value": {
35617+
"selector": "span[data-testid='input-interactable-area'] input[type='email']",
35618+
"type": "identities.emailAddress"
35619+
}
35620+
}
35621+
]
3559935622
}
3560035623
]
3560135624
}
@@ -36047,6 +36070,9 @@
3604736070
"tension": 1
3604836071
}
3604936072
},
36073+
"updateScriptOnPageFinished": {
36074+
"state": "disabled"
36075+
},
3605036076
"vpnMenuItem": {
3605136077
"state": "enabled",
3605236078
"targets": [
@@ -37730,6 +37756,9 @@
3773037756
"widgetAsProtection": {
3773137757
"minSupportedVersion": 52400000,
3773237758
"state": "enabled"
37759+
},
37760+
"embeddedSettingsWebView": {
37761+
"state": "enabled"
3773337762
}
3773437763
}
3773537764
},
@@ -37838,6 +37867,9 @@
3783837867
"steps": [
3783937868
{
3784037869
"percent": 5
37870+
},
37871+
{
37872+
"percent": 20
3784137873
}
3784237874
]
3784337875
}

‎overrides/extension-override.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@
107107
{
108108
"domain": "sas.dk",
109109
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1347"
110+
},
111+
{
112+
"domain": "whatsapp.com",
113+
"reason": "https://github.com/duckduckgo/privacy-configuration/pull/3889"
110114
}
111115
]
112116
},

‎overrides/ios-override.json‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
"exceptions": [],
301301
"features": {
302302
"tdsNextExperiment003": {
303-
"state": "enabled",
303+
"state": "disabled",
304304
"rollout": {
305305
"steps": [
306306
{
@@ -785,6 +785,29 @@
785785
}
786786
}
787787
]
788+
},
789+
{
790+
"domain": [
791+
"login.coinbase.com"
792+
],
793+
"patchSettings": [
794+
{
795+
"path": "/inputTypeSettings/-",
796+
"op": "add",
797+
"value": {
798+
"selector": "input[data-testid='unified-login-email-prompt-input']",
799+
"type": "credentials.username"
800+
}
801+
},
802+
{
803+
"path": "/inputTypeSettings/-",
804+
"op": "add",
805+
"value": {
806+
"selector": "span[data-testid='input-interactable-area'] input[type='email']",
807+
"type": "identities.emailAddress"
808+
}
809+
}
810+
]
788811
}
789812
]
790813
}
@@ -868,6 +891,11 @@
868891
"settings": {
869892
"defaultPolicy": "brand",
870893
"useUpdatedSafariVersions": true,
894+
"safariVersionMappings": {
895+
"26": "18_6",
896+
"26.0": "18_6",
897+
"26.0.1": "18_7"
898+
},
871899
"ddgFixedSites": [
872900
{
873901
"domain": "chase.com",
@@ -1366,6 +1394,9 @@
13661394
"state": "disabled",
13671395
"description": "Enables wide pixel measurement for Privacy Pro subscription restore events",
13681396
"minSupportedVersion": "7.191.0"
1397+
},
1398+
"winBackOffer": {
1399+
"state": "disabled"
13691400
}
13701401
}
13711402
},

‎overrides/macos-override.json‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,15 @@
304304
"minSupportedVersion": "1.140.0"
305305
},
306306
"emailConfirmationDecoupling": {
307-
"state": "internal",
308-
"minSupportedVersion": "1.158.0"
307+
"state": "enabled",
308+
"minSupportedVersion": "1.158.0",
309+
"rollout": {
310+
"steps": [
311+
{
312+
"percent": 5
313+
}
314+
]
315+
}
309316
}
310317
},
311318
"minSupportedVersion": "1.70.0"
@@ -323,7 +330,7 @@
323330
],
324331
"features": {
325332
"tdsNextExperiment003": {
326-
"state": "enabled",
333+
"state": "disabled",
327334
"rollout": {
328335
"steps": [
329336
{
@@ -832,6 +839,29 @@
832839
}
833840
}
834841
]
842+
},
843+
{
844+
"domain": [
845+
"login.coinbase.com"
846+
],
847+
"patchSettings": [
848+
{
849+
"path": "/inputTypeSettings/-",
850+
"op": "add",
851+
"value": {
852+
"selector": "input[data-testid='unified-login-email-prompt-input']",
853+
"type": "credentials.username"
854+
}
855+
},
856+
{
857+
"path": "/inputTypeSettings/-",
858+
"op": "add",
859+
"value": {
860+
"selector": "span[data-testid='input-interactable-area'] input[type='email']",
861+
"type": "identities.emailAddress"
862+
}
863+
}
864+
]
835865
}
836866
]
837867
}
@@ -853,8 +883,7 @@
853883
"minSupportedVersion": "1.157.0"
854884
},
855885
"newTabPagePerTab": {
856-
"state": "enabled",
857-
"minSupportedVersion": "1.157.0"
886+
"state": "disabled"
858887
}
859888
}
860889
},
@@ -903,6 +932,9 @@
903932
"performanceMetrics": {
904933
"state": "enabled"
905934
},
935+
"breakageReporting": {
936+
"state": "enabled"
937+
},
906938
"fingerprintingHardware": {
907939
"state": "enabled",
908940
"settings": {
@@ -1522,6 +1554,9 @@
15221554
"state": "disabled",
15231555
"description": "Enables wide pixel measurement for Privacy Pro subscription restore events",
15241556
"minSupportedVersion": "1.161.0"
1557+
},
1558+
"winBackOffer": {
1559+
"state": "disabled"
15251560
}
15261561
}
15271562
},
@@ -1618,6 +1653,9 @@
16181653
},
16191654
"unifiedURLPredictor": {
16201655
"state": "internal"
1656+
},
1657+
"appStoreUpdateFlow": {
1658+
"state": "enabled"
16211659
}
16221660
}
16231661
},

0 commit comments

Comments
 (0)