Merge pull request #366 from xupefei/master

New URL for Japanese filter
This commit is contained in:
Raymond Hill 2014-11-16 20:28:14 -02:00
commit 94ffaafd98
5 changed files with 9873 additions and 4 deletions

View File

@ -33,6 +33,7 @@ bcf5b80a544d42c0ddc05bea142911bd assets/thirdparties/www.hufilter.hu/hufilter.tx
1da7664601ca18f3806ca0af3d9cf123 assets/thirdparties/someonewhocares.org/hosts/hosts
6a81c9870feba977186aa272c4fda61d assets/thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt
9ff3d32dee480ddb132e9659b5683eb6 assets/thirdparties/raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt
d0efc28f5a17d6c270b9808ae58d5adf assets/thirdparties/raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt
54f7032c0e7ef73feb32d3c5437b8694 assets/thirdparties/raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt
0102ded26ea496c96aa78406fdce1784 assets/thirdparties/raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt
635779fb2454573444fdc8e1e116adb2 assets/thirdparties/raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt

View File

@ -148,11 +148,12 @@
"group": "regions",
"homeURL": "http://adblock-chinalist.googlecode.com/svn/trunk/adblock.txt"
},
"adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt": {
"raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt": {
"off": true,
"title": "JPN: ABP Japanese filters (日本用フィルタ)",
"title": "JPN: ABP Japanese filters (日本用フィルタ)",
"group": "regions",
"homeURL": "https://adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt"
"homeURL": "https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt",
"old": "adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt"
},
"margevicius.lt/easylistlithuania.txt": {
"off": true,

View File

@ -39,6 +39,7 @@ THIRDPARTY_REMOTEURLS=(
'https://cjxlist1.googlecode.com/svn/cjxlist.txt'
'http://adblock-chinalist.googlecode.com/svn/trunk/adblock.txt'
'https://adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt'
'https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt'
'http://margevicius.lt/easylistlithuania.txt'
'http://stanev.org/abp/adblock_bg.txt'
'https://indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt'
@ -88,6 +89,7 @@ THIRDPARTY_LOCALURLS=(
'thirdparties/cjxlist1.googlecode.com/svn/cjxlist.txt'
'thirdparties/adblock-chinalist.googlecode.com/svn/trunk/adblock.txt'
'thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt'
'thirdparties/raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt'
'thirdparties/margevicius.lt/easylistlithuania.txt'
'thirdparties/stanev.org/abp/adblock_bg.txt'
'thirdparties/indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt'

View File

@ -150,10 +150,16 @@
},
"adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt": {
"off": true,
"title": "JPN: ABP Japanese filters (の日本用フィルタ)",
"title": "JPN: ABP Japanese filters (obsolete: to be removed)",
"group": "regions",
"homeURL": "https://adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt"
},
"raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt": {
"off": true,
"title": "JPN: ABP Japanese filters (日本用フィルタ)",
"group": "regions",
"homeURL": "https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt"
},
"margevicius.lt/easylistlithuania.txt": {
"off": true,
"title": "LTU: Adblock Plus Lithuania",