From fdb5a42d30e7efc2d8f4b91dde3e03ecd15f72c1 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 19 Jul 2014 16:15:42 -0400 Subject: [PATCH] update of third-party assets --- assets/checksums.txt | 6 +++--- .../wiltteri/master}/wiltteri.txt | 21 +++++++++++++------ assets/ublock/filter-lists.json | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) rename assets/thirdparties/{download.wiltteri.net => raw.githubusercontent.com/wiltteri/master}/wiltteri.txt (99%) diff --git a/assets/checksums.txt b/assets/checksums.txt index c30b03667..62750a05f 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,11 +1,11 @@ -acbf3e508bae1a81020d42db416b0868 assets/ublock/filters.txt -5c6399ec38f1b2052539c77458cb4334 assets/ublock/filter-lists.json -36d8978c647291a4415dc02fe176e54e assets/thirdparties/download.wiltteri.net/wiltteri.txt +c137cc06b4ffe4af465a04a14d951d10 assets/ublock/filters.txt +3a1a4984aed3fe588c3b9c28f5e70f6f assets/ublock/filter-lists.json 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt 94c0a3eab74c42783855f07b22a429cf assets/thirdparties/home.fredfiber.no/langsholt/adblock.txt 3739b55487ff20f235c736601319f843 assets/thirdparties/adblock.gardar.net/is.abp.txt 95c3ea68a37221730b5d6283ce8caa76 assets/thirdparties/raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt 14ac2062c6a74c43cfa17103d4a5830a assets/thirdparties/raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt +54f7032c0e7ef73feb32d3c5437b8694 assets/thirdparties/raw.githubusercontent.com/wiltteri/master/wiltteri.txt c04a27bfd7eed1f5fb08e5dd47f7703b assets/thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt 4fb0e3ce956a596192a2a6b076629f06 assets/thirdparties/raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt 4f5b2e6b7aa7c71f834fdad08c026d42 assets/thirdparties/cjxlist1.googlecode.com/svn/cjxlist.txt diff --git a/assets/thirdparties/download.wiltteri.net/wiltteri.txt b/assets/thirdparties/raw.githubusercontent.com/wiltteri/master/wiltteri.txt similarity index 99% rename from assets/thirdparties/download.wiltteri.net/wiltteri.txt rename to assets/thirdparties/raw.githubusercontent.com/wiltteri/master/wiltteri.txt index c239db72b..af49005a1 100644 --- a/assets/thirdparties/download.wiltteri.net/wiltteri.txt +++ b/assets/thirdparties/raw.githubusercontent.com/wiltteri/master/wiltteri.txt @@ -1,9 +1,9 @@ [Adblock Plus 2.0] -! Checksum: jCDlWPKEtmxbf7KmoifUmw -! Version: 201405261320 +! Checksum: cjjvBtcTWxJMQN048ut3ng +! Version: 201406181900 ! Title: Wiltteri ! Description: Finnish supplement list for EasyList -! Last modified: 26 May 2014 13:20 UTC +! Last modified: 18 Jun 2014 19:00 UTC ! Expires: 4 days (update frequency) ! Homepage: http://wiltteri.net/ ! License: http://unlicense.org/ @@ -305,6 +305,8 @@ _mainosnappi. ||eat.fi/vartti/ ||ecross.fi/*files/imagemanagermodule/@random ||educations.com^*/partners/$domain=koulutus.fi|utbildning.se +||eivmp.com/images/*banneri +||eivmp.com/images/mainos ||ekoenergia.fi/bannerit/ ||ekokompassi.fi/kuvat/ala_logot.gif ||elamalapselle.fi/banner/ @@ -718,6 +720,7 @@ _mainosnappi. ||kivijarvi.fi/images/vkivi.jpg ||klassinen.fi/tiedostot/banneri/ ||klassinen.fi^*/img/rondolehti.jpg +||klikkaaja.net/promo/ ||klikki.com^$third-party ||kmvlehti.fi^*/alma_init_cjs.js ||kmvlehti.fi^*/meedio_kmv_lehti.js @@ -1069,6 +1072,7 @@ _mainosnappi. ||otavafiles.fi^*/ilmoitus_bg. ||otavafiles.fi^*/matkalaukku/nostot/ ||oty.fi/images/banners/ +||oululehti.fi/edoris? ||oulunkarpat.fi/20*/bannerit/ ||ouluthisweek.net/banners/ ||overdrive.fi/bannerit/ @@ -1443,6 +1447,7 @@ _mainosnappi. ||static.vertaa.fi/data/*/banner/ ||stayhome.fi^*/webawards-suurtaulu. ||stll.fi/@Bin/*banner +||storage.googleapis.com/suomensanomat/img/savikauppa/$domain=suomensanomat.fi ||studiofeelit.fi/shop/logos/logot ||sue.fi/images/*.swf ||sue.fi/images/*banner @@ -1890,7 +1895,7 @@ radiosuomipop.fi,suomenviihderavintolat.fi,suomiareena.fi###banner2 suomiareena.fi###banner5 vyy.fi###banner6 kotikarjala.fi###bannerAreaSidebar -kotikarjala.fi###bannerAreaTop +kotikarjala.fi,oululehti.fi###bannerAreaTop tuningstudio.fi###bannerHeader yrittajat.fi###bannerRight helvetin16.com###bannerSix @@ -2004,6 +2009,7 @@ myyitseasuntosi.com###columnC_3columns koti-kajaani.fi###column_middle > .flexslider koti-kajaani.fi###column_right > .basic_box vuokatti.fi###column_right > .nosto_narrow:last-child +iltalehti.fi###com-autotalli-multibanner autot.oikotie.fi###commercial autot.oikotie.fi###commercial-2 aukusti.fi###container > p[style="text-align: center;"] @@ -2450,6 +2456,7 @@ sirkusfinlandia.fi###sponssi turkusoundcheck.com###sponssit-row ellos.fi###spotBottom gentleman.fi###staatBanneri +suomensanomat.fi###static-info qruiser.com###stripe tourdehelsinki.fi###sub_sponsors urps.fi###supplementary @@ -2665,7 +2672,7 @@ tennis.fi##.banneripaikka_top ilves.com,kyronniemi.fi,tune.fi##.bannerit imps.fi,netticasino.com,radiofinlandia.net,radiorex.fi,ruokamenot.fi,urheiluveikkaus.com##.banneritem kilipailut.fi,sips.fi,terveysinfo.fi##.bannerlink -com,fi,net##.bannerlist +fi##.bannerlist ilkka.fi##.bannernostot_right ammattiautot.fi,basket.fi,helsinki-vantaa.fi,judoliitto.fi,kehy.fi,koneporssi.com,lyy.fi,nkl.fi,reservilaisliitto.fi,riemurasia.net,suomenpolkupyoratukku.fi,tuningstudio.fi,visulahti.fi##.banners skv.fi##.banners2_skv @@ -3225,7 +3232,7 @@ suisto.fi##div > table[border="0"] savonkinot.fi##div a > img lumiparkki.fi##div ul.xoxo > li.widget.widget_sp_image alypaa.com##div:first-child:last-child > div:first-child + div:last-child > a -aarre.fi,devilskuopio.fi,edukouvola.fi,fin5.fi,kalottjazzblues.net,lakiwiki.fi,lehtiapaja.fi,luontotupa.net,metsavetoomus.fi,orivedenponnistus.fi,outokummunkaupunki.fi,pelaa.org,ramasa.net,vantaalla.info,vapaatohjelmat.fi##div[align="center"] +devilskuopio.fi,edukouvola.fi,fin5.fi,kalottjazzblues.net,lakiwiki.fi,lehtiapaja.fi,luontotupa.net,metsavetoomus.fi,orivedenponnistus.fi,outokummunkaupunki.fi,pelaa.org,ramasa.net,vantaalla.info,vapaatohjelmat.fi##div[align="center"] teatterihelsinki.fi##div[align="center"] + * + * + * + * + * + p goldenring.fi##div[align="center"] + * > p helsinginkisaveikot.fi##div[align="center"] + * img @@ -3935,6 +3942,7 @@ seksitreffit.fi##table[width="1024"][bgcolor="#d31517"] ||aller.fi/banner/$third-party ||almamedia.fi/mp/$subdocument ||autotalli.com/externalquicksearch?$subdocument +||autotalli.com^*/html_multibanner/$third-party ||autotalli.com^*/htmlbanners/$subdocument ||bmm.fi^$third-party ||cromet.fi/commercials/$third-party @@ -4012,4 +4020,5 @@ ylilauta.org#@##hideads hervannansanomat.fi#@#.ads-left tilannehuone.fi#@#.mainos elisaviihde.fi#@#.outside_ad +lamminveto.com#@#.sponsorit valonpolku.com#@#a[href*="/adrotate/adrotate-out.php?"] \ No newline at end of file diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json index 174ffb94b..56b59ad38 100644 --- a/assets/ublock/filter-lists.json +++ b/assets/ublock/filter-lists.json @@ -163,7 +163,7 @@ "title": "ISR: EasyList Hebrew", "group": "regions" }, - "download.wiltteri.net/wiltteri.txt": { + "raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt": { "off": true, "title": "FIN: Wiltteri", "group": "regions"