Merge branch 'master' of https://github.com/chinalist/chinalist

Conflicts: abputilis adblock-lazy.txt adblock.txt
cjx82630 · Mar 17, 2014 · da64831 · da64831
2 parents 028cf28 + c8c81f4
commit da64831
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/dev/chinalist/chinalist-hide.txt b/dev/chinalist/chinalist-hide.txt
@@ -38,6 +38,7 @@ blog.dausos.com##.adr
 blog.dausos.com##.adt
 dmzj.com##iframe[width="960"]
 downg.com##.content.ad-b950x50
+du00.com###ad
 freegroup.org##.ad-box
 freegroup.org##div[style^="width:336px; height:280px;"]
 freehao123.com##.box

diff --git a/dev/chinalist/chinalist-miscellaneous.txt b/dev/chinalist/chinalist-miscellaneous.txt
@@ -476,6 +476,8 @@ disp.cc##.ads_bot_block
 dj520.com##.a304
 dj520.com##.pal
 ||djkk.com/ak/
+||share.dmhy.*/*?$image
+share.dmhy.me,share.dmhy.org##[id$="_ad"]
 /banner/*$domain=dolc.de|dolc.info
 dolc.de,dolc.info###sitefocus
 ||dospy.com/hezuo/

diff --git a/dev/chinalist/chinalist-specific.txt b/dev/chinalist/chinalist-specific.txt
@@ -411,16 +411,6 @@ dayoo.com##div[style="top: 10px; height: 320px; width: 100px; z-index: 1000; ove
 /pub/news/gzrb/*$script
 ||gzdaily.dayoo.com/tpl/banner$object
 
-!---动漫花园
-||share.dmhy.*/QS$image
-||share.dmhy.*/MY$image
-||share.dmhy.*/MZ$image
-||share.dmhy.*/shareman$image
-||share.dmhy.*/WLGO$image
-share.dmhy.me,share.dmhy.org##.ad
-share.dmhy.me,share.dmhy.org###shareman_ad
-share.dmhy.me,share.dmhy.org###WLGO_ad
-
 !---豆瓣
 ||douban.com^*/fm_bgad.js
 ||img3.douban.com/js/packed_ad
@@ -1583,13 +1573,11 @@ yesky.com##[class^="ad"]
 ||v.stats.yytcdn.com^
 
 !---人人影视
-@@||res.yyets.com/ads/bd-160.js
 ||copy.ousns.com^
-||res.yyets.com/ads/
 yyets.com##a[href="https://ehdw.taobao.com/"]
-yyets.com##[style="width:690px; height:90px; overflow:hidden; margin-bottom:1em; text-align:center;"]
 yyets.com##.games-rec-list
-yyets.com##.tb-box
+yyets.com##.j-t
+yyets.com##.joke
 
 !---叶子猪游戏网
 @@||yktj.yzz.cn/htmldata/mds/yzz_single_gg.js$domain=bbs.yzz.cn

diff --git a/dev/chinalist/chinalist-white.txt b/dev/chinalist/chinalist-white.txt
@@ -15,6 +15,7 @@ yocoy.com#@##AdArea
 @@||bbs.byr.cn/article/Advertising/
 @@||bbs.byr.cn/board/Advertising?
 @@||chinahr.com/images/phpads/$image,~third-party
+@@||houdask.com/data/advertising/$image
 @@||icbc.com.cn/ICBC_ADJS/$script,~third-party
 @@||fireeye.ijinshan.com/static/js/analyse.js
 @@||ganji.com/findjob/send_resume.php?$subdocument