From 18ed793000140c389dceabe0b9595744340fdb50 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 6 Jul 2020 15:03:36 +0200 Subject: [PATCH] Extended the fix to AdGuard As per https://github.com/AdguardTeam/AdguardFilters/issues/58527 --- .../DandelionSproutsNorskeFiltre.tpl | 4 +++- .../NordicFiltersABP-Inclusion.txt | 6 ++++-- .../NordicFiltersABP.txt | 6 ++++-- .../NordicFiltersAdGuard.txt | 6 ++++-- .../NordicFiltersBrave.txt | 4 +++- .../NordicFiltersPrivacy.txt | 6 ++++-- .../NordicFiltersPrivoxy.action | 3 ++- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 6c0856ab5..53f035ee3 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 05July2020v2-Alpha +# Version: 06July2020v1-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -213,6 +213,7 @@ msFilterList # www.mbl.is frettir # adressa.no # kk.no, sol.no +# (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) # historienet.no, natgeo.no, komputer.no # https://www.nettavisen.no/okonomi/3423875562.html # qxl.no @@ -269,6 +270,7 @@ msFilterList # https://github.com/ryanbr/fanboy-adblock/issues/1243 -d ktg-content.cdn.prismic.io *(my.newsletter_popup.uid # ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— ++d candidate.hr-manager.net Advertisement PreviewAdvertisement. # https://github.com/easylist/easylist/issues/1861 +d _prebid_ # https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 6e09ea890..e1c93168a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 050720202 +! Version: 060720201 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 12 hours @@ -809,8 +809,9 @@ vafo.dk##.adform-flexblock ! adressa.no ##div[data-contenttype=ad] ! kk.no, sol.no +! (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) ##[type=advertisement] -##[class^=AdWrapper] +~candidate.hr-manager.net##[class^=AdWrapper] ! historienet.no, natgeo.no, komputer.no ##.wallpaper > .horseshoe ! https://www.nettavisen.no/okonomi/3423875562.html @@ -917,6 +918,7 @@ krom.is#@#.share-container ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +@@||candidate.hr-manager.net/Advertisement/PreviewAdvertisement. ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index d68ae4c76..599c3c532 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 050720202 +! Version: 060720201 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -809,8 +809,9 @@ vafo.dk##.adform-flexblock ! adressa.no ##div[data-contenttype=ad] ! kk.no, sol.no +! (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) ##[type=advertisement] -##[class^=AdWrapper] +~candidate.hr-manager.net##[class^=AdWrapper] ! historienet.no, natgeo.no, komputer.no ##.wallpaper > .horseshoe ! https://www.nettavisen.no/okonomi/3423875562.html @@ -917,6 +918,7 @@ krom.is#@#.share-container ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +@@||candidate.hr-manager.net/Advertisement/PreviewAdvertisement. ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index d2a19b47a..071bce52c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 05July2020v2 +! Version: 06July2020v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -843,8 +843,9 @@ vafo.dk##.adform-flexblock ! adressa.no ##div[data-contenttype=ad] ! kk.no, sol.no +! (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) ##[type=advertisement] -##[class^=AdWrapper] +~candidate.hr-manager.net##[class^=AdWrapper] ! historienet.no, natgeo.no, komputer.no ##.wallpaper > .horseshoe ! https://www.nettavisen.no/okonomi/3423875562.html @@ -952,6 +953,7 @@ krom.is#@#.share-container ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +@@||candidate.hr-manager.net/Advertisement/PreviewAdvertisement. ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index f815450eb..cb8eedbb7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 05July2020v2-Beta +! Version: 06July2020v1-Beta ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser) ! Expires: 12 hours @@ -243,6 +243,7 @@ vgtv.no##+js(golem.de.js) ! www.mbl.is/frettir/ ! adressa.no ! kk.no, sol.no +! (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) ! historienet.no, natgeo.no, komputer.no ! https://www.nettavisen.no/okonomi/3423875562.html ! qxl.no @@ -292,6 +293,7 @@ vgtv.no##+js(golem.de.js) ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +@@||candidate.hr-manager.net/Advertisement/PreviewAdvertisement. ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 5ca624218..1eb347c2c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 05July2020v2 +! Version: 06July2020v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -843,8 +843,9 @@ vafo.dk##.adform-flexblock ! adressa.no ##div[data-contenttype=ad] ! kk.no, sol.no +! (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) ##[type=advertisement] -##[class^=AdWrapper] +~candidate.hr-manager.net##[class^=AdWrapper] ! historienet.no, natgeo.no, komputer.no ##.wallpaper > .horseshoe ! https://www.nettavisen.no/okonomi/3423875562.html @@ -952,6 +953,7 @@ krom.is#@#.share-container ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +@@||candidate.hr-manager.net/Advertisement/PreviewAdvertisement. ! https://github.com/easylist/easylist/issues/1861 ! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index d6f6f5a9b..55c90747e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 05July2020v2-Alpha +# Version: 06July2020v1-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -251,6 +251,7 @@ contentMarketing # www.mbl.is/frettir/ # adressa.no # kk.no, sol.no +# (Exception: https://github.com/AdguardTeam/AdguardFilters/issues/58527) # historienet.no, natgeo.no, komputer.no # https://www.nettavisen.no/okonomi/3423875562.html # qxl.no