Merge branch 'main' into dharb/eh-expand-timeouts

duckduckgo · Oct 18, 2023 · 0a85eb4 · 0a85eb4
2 parents 38a4810 + 6851a58
commit 0a85eb4
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 7 deletions.
diff --git a/features/amp-links.json b/features/amp-links.json
@@ -29,7 +29,6 @@
         ],
         "keywords": [
             "=amp",
-            "amp=",
             "&amp",
             "amp&",
             "/amp",

diff --git a/features/content-blocking.json b/features/content-blocking.json
@@ -23,6 +23,10 @@
         {
             "domain": "optout.networkadvertising.org",
             "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1377"
+        },
+        {
+            "domain": "ads.google.com",
+            "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1401"
         }
     ]
 }
diff --git a/features/custom-user-agent.json b/features/custom-user-agent.json
@@ -44,10 +44,6 @@
                 "domain": "crunchynihongo.com",
                 "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1201"
             },
-            {
-                "domain": "hulu.com",
-                "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1145"
-            },
             {
                 "domain": "vsp.com",
                 "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1292"

diff --git a/features/element-hiding.json b/features/element-hiding.json
@@ -85,7 +85,7 @@
         }
     ],
     "settings": {
-        "useStrictHideStyleTag": false,
+        "useStrictHideStyleTag": true,
         "rules": [
             {
                 "selector": "[id*='gpt-']",

diff --git a/features/tracker-allowlist.json b/features/tracker-allowlist.json
@@ -2045,6 +2045,13 @@
                             "<all>"
                         ],
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/529"
+                    },
+                    {
+                        "rule": "cmp.osano.com",
+                        "domains": [
+                            "<all>"
+                        ],
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1398"
                     }
                 ]
             },
@@ -2853,7 +2860,7 @@
             "zopim.com": {
                 "rules": [
                     {
-                        "rule": "widget-mediator.zopim.com",
+                        "rule": "zopim.com",
                         "domains": [
                             "<all>"
                         ],

diff --git a/overrides/android-override.json b/overrides/android-override.json
@@ -5,6 +5,10 @@
         },
         "contentBlocking": {
             "exceptions": [
+                {
+                    "domain": "timeanddate.com",
+                    "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1407"
+                }
             ]
         },
         "eme": {
@@ -321,6 +325,10 @@
                         "domain": "fifa.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/667"
                     },
+                    {
+                        "domain": "hulu.com",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1145"
+                    },
                     {
                         "domain": "mail.google.com",
                         "reason": "Page loads blank after login (inbox does not show)."
@@ -359,6 +367,10 @@
                         "domain": "fedex.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/927"
                     },
+                    {
+                        "domain": "hulu.com",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1145"
+                    },
                     {
                         "domain": "steamdb.info",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/667"

diff --git a/overrides/ios-override.json b/overrides/ios-override.json
@@ -239,6 +239,10 @@
                         "domain": "facebook.com",
                         "reason": "When going to the main login page, there is a banner at the top which warns of an 'Unsupported browser'."
                     },
+                    {
+                        "domain": "hulu.com",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1145"
+                    },
                     {
                         "domain": "instagram.com",
                         "reason": "A banner at the bottom which warns of an 'Unsupported browser' and interferes with rest of the UI."

diff --git a/overrides/macos-override.json b/overrides/macos-override.json
@@ -45,6 +45,9 @@
                             },
                             {
                                 "percent": 50.0
+                            },
+                            {
+                                "percent": 75.0
                             }
                         ]
                     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ @@
             ],
             "keywords": [
                 "=amp",
-                "amp=",
                 "&amp",
                 "amp&",
                 "/amp",
@@ Expand Down @@