diff --git a/assets/checksums.txt b/assets/checksums.txt index f484fe826..5f912d209 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,5 +1,6 @@ +947915cfd402f6184c4da97224fe4ee0 assets/ublock/unbreak.txt b8fd6f6a836d34e0629dca07424d7bd8 assets/ublock/privacy.txt -ce91a0f0be1fd8829b078fa3bffcf575 assets/ublock/filters.txt +93a56996f9cbd501ee764938536f77cb assets/ublock/filters.txt c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt 77516c4443fb629fc6b1b91b26004cc9 assets/ublock/filter-lists.json 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt index eeabf62a0..76f84d24e 100644 --- a/assets/ublock/filters.txt +++ b/assets/ublock/filters.txt @@ -1,4 +1,8 @@ -# Needed to unbreak sites affected by out of the box lists +# Filters optimized for uBlock +# TODO: after a transition period, all exception filters to unbreak pages +# will be corralled into `unbreak.txt`, so that *only* block filters are +# present in this list. Transition period: let's say 2-3 weeks after I +# update Chrome/Opera store. # https://github.com/chrisaljoudi/uBlock/issues/20 # => blocking counterpart in Peter Lowe's Ad Server diff --git a/assets/ublock/unbreak.txt b/assets/ublock/unbreak.txt new file mode 100644 index 000000000..3a3550b34 --- /dev/null +++ b/assets/ublock/unbreak.txt @@ -0,0 +1,197 @@ +# Needed to unbreak web sites, mostly because of hosts file-based filters: +# Dan Pollock's, MVPS, Peter Lowe's + +# https://github.com/chrisaljoudi/uBlock/issues/20 +# => blocking counterpart in Peter Lowe's Ad Server +@@||www.google-analytics.com/ga.js^$domain=xda-developers.com + +# https://github.com/chrisaljoudi/uBlock/issues/63 +@@||adf.ly^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/69 +@@||widget-cdn.rpxnow.com^$domain=foxnews.com,script + +# https://github.com/chrisaljoudi/uBlock/issues/119 +# To counter `google-analytics.com` in Peter Lowe's list +@@||google-analytics.com^$domain=avianca.com + +# https://github.com/chrisaljoudi/uBlock/issues/141 +# Videos broken on weather.com +# To counter `tags.tiqcdn.com` in  MVPS +@@||tags.tiqcdn.com/utag/*.js$script,domain=cnet.com|weather.com + +# https://github.com/chrisaljoudi/uBlock/issues/17#issuecomment-51625306 +# To counter `extras.mnginteractive.com` in hpHosts +@@||extras.mnginteractive.com^$domain=mercurynews.com|denverpost.com|twincities.com + +# http://forums.lanik.us/viewtopic.php?f=64&t=17842&sid=46bd7065193153fe46efe816b7cd32c9&start=30#p59663 +# To counter `statcounter.com` in Peter Lowe's, MVPS, Dan Pollock's and hpHosts +@@||statcounter.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/166 +# To counter `liverail.com` in Peter Lowe's, MVPS, and hpHosts +@@||cdn-static.liverail.com^$object-subrequest + +# cnet.com needs this for video players +# https://github.com/chrisaljoudi/uBlock/issues/227 +# To counter `2mdn.net` in Peter Lowe's +# To counter `s0.2mdn.net` in MVPS, hpHosts, Dan Pollock's +@@||s0.2mdn.net/instream/*$domain=cnet.com|nfl.com|wistv.com +@@||s0.2mdn.net/instream/flash/v3/adsapi_3.swf$object + +# https://github.com/chrisaljoudi/uBlock/issues/243 +# To counter `cdn-i.dmdentertainment.com` in hpHosts +@@||cdn-i.dmdentertainment.com^$domain=cracked.com + +# https://twitter.com/ethanveres/status/527122036649639936 +# Fortunately, further connections to `mxpnl.com` are blocked +@@||cdn.vurb.com/*/mixpanel. + +# https://adblockplus.org/forum/viewtopic.php?f=2&t=25772 +@@||target.122.2o7.net^$domain=target.com + +# To counter `adm.fwmrm.net` from hpHosts, MVPS, Dan Pollock's +@@||adm.fwmrm.net^$domain=go.com + +# https://github.com/chrisaljoudi/uBlock/issues/274 +# To counter `mopub.com` in Peter Lowe's +@@||mopub.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/293 +# To counter `safelinking.net` in hpHosts +@@||safelinking.net^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/302 +# To counter `outbrain.com` in hpHosts +@@||outbrain.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/316 +# To counter `inc.com` in Peter Lowe's, hpHosts +@@||inc.com^$~third-party + +# Chrome store feedback +# To counter Peter Lowe's `intergi.com` +@@||intergi.com^$domain=tvgolo.com + +# https://github.com/chrisaljoudi/uBlock/issues/336 +# To counter `flurry.com` in Peter Lowe's, hpHosts, MVPS +@@||flurry.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/374 +# To counter `2mdn.net` in Peter Lowe's, `s0.2mdn.net` in hpHosts +@@||s0.2mdn.net/instream/*$object,script,domain=wsmv.com + +# https://twitter.com/JarkkoRytkonen/status/540052376015888385 +# To counter `google-analytics.com` in Peter Lowe's +@@||google-analytics.com^$domain=jackbox.tv + +# Videos broken on weather.com +# To counter `www.googletagservices.com` in MVPS, hpHosts, Dan Pollock's +@@||www.googletagservices.com/tag/js/gpt.js^$script,domain=weather.com + +# https://github.com/chrisaljoudi/uBlock/issues/409 +@@||c.speedtest.net^$~third-party + +# To counter Peter Lowe's, hpHosts +@@||boldchat.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/463 +# To counter Peter Lowe's, hpHosts +@@||mixpanel.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/466 +# Until fixed in EasyPrivacy +@@/google-analytics-dashboard + +# https://twitter.com/poroot/status/554300983472574465 +charlie.strim.io#@##tweets +ovh.strim.io#@##tweets + +# https://adblockplus.org/forum/viewtopic.php?f=10&t=24896&start=15#p114675 +# Until fixed in EasyList +@@||cdn.turner.com/ads/nba/adfuel.js$domain=www.nba.com + +# From Chrome store: Go to site http://www.vd.nl/ ... links from dropdown top menu do not work +# To counter Dan Pollock's, hpHosts, MVPS, Peter Lowe's +@@||google-analytics.com/analytics.js$domain=www.vd.nl + +# https://github.com/chrisaljoudi/uBlock/issues/570 +# To counter `yui.yahooapis.com` in hpHosts +@@||yui.yahooapis.com^ + +# Chrome store feedback +# To counter `top.mail.ru` in Peter Lowe's +@@||top.mail.ru^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/580 +# To counter `liverail.com` in Dan Pollock's, hpHosts, MVPS, Peter Lowe's +@@||cdn-static.liverail.com$domain=9to5mac.com + +# https://github.com/chrisaljoudi/uBlock/issues/602 +# To counter `/ads.css` in EasyList +@@||css.washingtonpost.com/*/ads.css$stylesheet,~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/607 +# To counter `||pcekspert.com^` in Peter Lowe's +@@||pcekspert.com^$~third-party + +# https://twitter.com/yo_0/status/559748330390323200 +# To counter `||clickbank.com^` in Dan Pollock's, Peter Lowe's +@@||clickbank.com^$~third-party + +# https://github.com/chrisaljoudi/uBlock/issues/614 +# To counter `awaps.yandex.ru` in hpHosts +# To counter `mc.yandex.ru` in hpHosts, MVPS +@@||awaps.yandex.ru^$domain=market.yandex.ru +@@||mc.yandex.ru^$domain=market.yandex.ru +@@||yastatic.net/market-export/*/advert.js$domain=market.yandex.ru + +# https://github.com/chrisaljoudi/uBlock/issues/650 +# https://github.com/chrisaljoudi/uBlock/issues/821 +# To counter `google-analytics.com` in Dan Pollock's, hpHosts, MVPS, Peter Lowe's +@@||www.google-analytics.com/ga.js$domain=onlinetv.ru|zie.nl + +# https://github.com/chrisaljoudi/uBlock/issues/774 +# To counter `carbonads.net` in Peter Lowe's +@@||carbonads.net^$~third-party + +# This enables twitch.tv to work in HTML5 +@@||imasdk.googleapis.com$domain=twitch.tv + +# Chrome store feedback: "totaljobs.com [...] with μBlock enabled, I can't click any links" +# To counter `2o7.net` in Peter Lowe's +@@||2o7.net^$domain=totaljobs.com + +# https://github.com/chrisaljoudi/uBlock/issues/822 +# https://github.com/chrisaljoudi/uBlock/issues/940 +# To counter `google-analytics.com` in Dan Pollock's, hpHosts, MVPS, Peter Lowe's +@@||google-analytics.com^$domain=musixmatch.com|bikstok.sonymusicshop.dk + +# https://github.com/chrisaljoudi/uBlock/issues/841 +# To counter `quantcast.com` in hpHosts, Peter Lowe's +@@||quantcast.com^$~third-party + +# Chrome store feedback: "on gaana.com it blocks the site" +# To counter `_social_tracking.` in EasyPrivacy +@@||css5.gaanacdn.com/minify-*/min/?$script,domain=gaana.com + +# https://twitter.com/Urre/status/572742363069714432 +# To counter `/keen.min.js` in EasyPrivacy +@@||keen.github.io/*/keen.min.js$~third-party + +# Feedback from Chrome store: "videos dont work on this site" +# http://www.okgoals.com/match-highlights-1425491618---41 +# To counter `intergi.com` in Peter Lowe's +@@||cdn.phoenix.intergi.com^$domain=okgoals.com + +# kissmetrics.com broken +# To counter `kissmetrics.com` in Peter Lowe's +@@||kissmetrics.com^$~third-party + +# Twitter: https://twitter.com/swashcap/status/578413787323056128 +# "Found Viewpoint’s site [...] Looks like it might be broken?" +# To counter hpHosts, Peter Lowe's `viewpoint.com` +@@||viewpoint.com^$~third-party + +# http://www.reddit.com/r/ublock/comments/32k908/cnncom_videos_wont_load_w_%C2%B5block_enabled/ +@@||i.cdn.turner.com/xslo/cvp/ads/freewheel/bundles/2/*$domain=cnn.com diff --git a/src/js/background.js b/src/js/background.js index a93a8915b..7cec3ed6c 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -120,6 +120,10 @@ return { 'assets/ublock/privacy.txt': { title: 'uBlock filters – Privacy', group: 'default' + }, + 'assets/ublock/unbreak.txt': { + title: 'uBlock filters – Unbreak', + group: 'default' } },