From 0dbe3ea802675a17469295d0a160cd257252f7ec Mon Sep 17 00:00:00 2001 From: DJCrashdummy Date: Tue, 12 Sep 2017 18:00:50 +0200 Subject: [PATCH 1/5] Update List.csv --- data/List.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/List.csv b/data/List.csv index 65c7dc4fb..37729493b 100644 --- a/data/List.csv +++ b/data/List.csv @@ -31,7 +31,7 @@ Adblock Polish Social Rules,https://raw.githubusercontent.com/MajkiIT/polish-ads Adblock Polska,https://raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt,https://www.facebook.com/adblockpl,Adblock PL is official Poland filter list for AdBlock and Adblock Plus.,https://github.com/adblockpolska/Adblock_PL_List,,,https://github.com/adblockpolska/Adblock_PL_List/issues,adblockpolska@gmail.com, Adblock Warning Removal List,https://easylist-downloads.adblockplus.org/antiadblockfilters.txt,https://easylist.to/,The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.,https://easylist.to/pages/other-supplementary-filter-lists-and-easylist-variants.html,,https://forums.lanik.us/,,easylist.subscription+anti@gmail.com, Adblock YouTube Ads,https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt,https://github.com/kbinani/adblock-youtube-ads,Blocks ads on YouTube.,,,,,, -AdBlockProtector,https://github.com/jspenguin2017/AdBlockProtector/blob/master/AdBlockProtectorList.txt,https://jspenguin2017.github.io/AdBlockProtector/,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to AdBlock Protector List.",https://github.com/jspenguin2017/AdBlockProtector,,,https://github.com/jspenguin2017/AdBlockProtector/issues,, +uBlock Protector List,https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt,https://jspenguin2017.github.io/uBlockProtector,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to AdBlock Protector List.",https://github.com/jspenguin2017/uBlockProtector,,,https://github.com/jspenguin2017/uBlockProtector/issues,, add.2o7Net,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts,https://github.com/FadeMind/hosts.extras,"2o7Net tracking sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Dead,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts,https://github.com/FadeMind/hosts.extras,"Dead sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Risk,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts,https://github.com/FadeMind/hosts.extras,"Risk content sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, From d074e5790e1e4e078f4060ca154cb441dadd010f Mon Sep 17 00:00:00 2001 From: DJCrashdummy Date: Tue, 12 Sep 2017 18:07:54 +0200 Subject: [PATCH 2/5] Update lists.json --- data/lists.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/lists.json b/data/lists.json index fcf2984c9..22d533a97 100644 --- a/data/lists.json +++ b/data/lists.json @@ -23,13 +23,13 @@ "tagLang": ["vi"], "viewUrl": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt" }, { - "descr": "This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to AdBlock Protector List.", - "descrSourceUrl": "https://github.com/jspenguin2017/AdBlockProtector", - "homeUrl": "https://jspenguin2017.github.io/AdBlockProtector/", - "issuesUrl": "https://github.com/jspenguin2017/AdBlockProtector/issues", - "list": "AdBlockProtector", + "descr": "This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.", + "descrSourceUrl": "https://github.com/jspenguin2017/uBlockProtector", + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector", + "issuesUrl": "https://github.com/jspenguin2017/uBlockProtector/issues", + "list": "uBlock Protector List", "related": ["AakList (Anti-Adblock Killer)"], - "viewUrl": "https://github.com/jspenguin2017/AdBlockProtector/blob/master/AdBlockProtectorList.txt" + "viewUrl": "https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt" }, { "descr": "Blocks Japanese regional social network advertisements and trackers.", "homeUrl": "https://github.com/k2jp/abp-japanese-filters", @@ -2273,4 +2273,4 @@ "list": "YouTube: Remove Youtube Suggestions", "related": "YouTube: Pure Video Experience", "viewUrl": "https://easylist-downloads.adblockplus.org/yt_annoyances_suggestions.txt" -}] \ No newline at end of file +}] From a7aabadd10d5726791548e54253f0a57c2a836cb Mon Sep 17 00:00:00 2001 From: DJCrashdummy Date: Tue, 12 Sep 2017 18:09:36 +0200 Subject: [PATCH 3/5] updated the description --- data/List.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/List.csv b/data/List.csv index 37729493b..5b0f35c05 100644 --- a/data/List.csv +++ b/data/List.csv @@ -31,7 +31,7 @@ Adblock Polish Social Rules,https://raw.githubusercontent.com/MajkiIT/polish-ads Adblock Polska,https://raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt,https://www.facebook.com/adblockpl,Adblock PL is official Poland filter list for AdBlock and Adblock Plus.,https://github.com/adblockpolska/Adblock_PL_List,,,https://github.com/adblockpolska/Adblock_PL_List/issues,adblockpolska@gmail.com, Adblock Warning Removal List,https://easylist-downloads.adblockplus.org/antiadblockfilters.txt,https://easylist.to/,The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.,https://easylist.to/pages/other-supplementary-filter-lists-and-easylist-variants.html,,https://forums.lanik.us/,,easylist.subscription+anti@gmail.com, Adblock YouTube Ads,https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt,https://github.com/kbinani/adblock-youtube-ads,Blocks ads on YouTube.,,,,,, -uBlock Protector List,https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt,https://jspenguin2017.github.io/uBlockProtector,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to AdBlock Protector List.",https://github.com/jspenguin2017/uBlockProtector,,,https://github.com/jspenguin2017/uBlockProtector/issues,, +uBlock Protector List,https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt,https://jspenguin2017.github.io/uBlockProtector,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.",https://github.com/jspenguin2017/uBlockProtector,,,https://github.com/jspenguin2017/uBlockProtector/issues,, add.2o7Net,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts,https://github.com/FadeMind/hosts.extras,"2o7Net tracking sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Dead,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts,https://github.com/FadeMind/hosts.extras,"Dead sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Risk,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts,https://github.com/FadeMind/hosts.extras,"Risk content sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, From ab30dc3a9ad2149f9307c0b5ec9141607d6f1191 Mon Sep 17 00:00:00 2001 From: DJCrashdummy Date: Wed, 13 Sep 2017 15:15:40 +0200 Subject: [PATCH 4/5] re-ordered --- data/List.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/List.csv b/data/List.csv index 5b0f35c05..33f65ff8b 100644 --- a/data/List.csv +++ b/data/List.csv @@ -31,7 +31,6 @@ Adblock Polish Social Rules,https://raw.githubusercontent.com/MajkiIT/polish-ads Adblock Polska,https://raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt,https://www.facebook.com/adblockpl,Adblock PL is official Poland filter list for AdBlock and Adblock Plus.,https://github.com/adblockpolska/Adblock_PL_List,,,https://github.com/adblockpolska/Adblock_PL_List/issues,adblockpolska@gmail.com, Adblock Warning Removal List,https://easylist-downloads.adblockplus.org/antiadblockfilters.txt,https://easylist.to/,The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.,https://easylist.to/pages/other-supplementary-filter-lists-and-easylist-variants.html,,https://forums.lanik.us/,,easylist.subscription+anti@gmail.com, Adblock YouTube Ads,https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt,https://github.com/kbinani/adblock-youtube-ads,Blocks ads on YouTube.,,,,,, -uBlock Protector List,https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt,https://jspenguin2017.github.io/uBlockProtector,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.",https://github.com/jspenguin2017/uBlockProtector,,,https://github.com/jspenguin2017/uBlockProtector/issues,, add.2o7Net,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts,https://github.com/FadeMind/hosts.extras,"2o7Net tracking sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Dead,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts,https://github.com/FadeMind/hosts.extras,"Dead sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, add.Risk,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts,https://github.com/FadeMind/hosts.extras,"Risk content sites based on BadHosts content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, @@ -273,6 +272,7 @@ uAssets Unbreak,https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/fi uBlock Antiskimming List,https://raw.githubusercontent.com/byaka/ublock-antiskimming-list/master/build/data.txt,https://github.com/byaka/ublock-antiskimming-list,Block sites with skimming scripts.,https://raw.githubusercontent.com/byaka/ublock-antiskimming-list/master/build/data.txt,,,https://github.com/byaka/ublock-antiskimming-list/issues,, uBlock Filters Plus,https://raw.githubusercontent.com/IDKwhattoputhere/uBlock-Filters-Plus/master/uBlock-Filters-Plus.txt,https://github.com/IDKwhattoputhere/uBlock-Filters-Plus,A filterlist with additional filters for uBlock Origin. Contains filters specific to uBlock Origin (like popunder filters) and some filters that have not yet been added to other filterlists.,https://github.com/IDKwhattoputhere/uBlock-Filters-Plus,,,https://github.com/IDKwhattoputhere/uBlock-Filters-Plus/issues,, uBlock Polish Filters - Supplement,https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt,http://www.certyficate.it/,uBlock supplement to Adblock & uBlock Polish Filters.,,,,https://github.com/MajkiIT/polish-ads-filter/issues,errors@certyficate.it, +uBlock Protector List,https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt,https://jspenguin2017.github.io/uBlockProtector,"This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.",https://github.com/jspenguin2017/uBlockProtector,,,https://github.com/jspenguin2017/uBlockProtector/issues,, uBO-Personal-Filters,https://raw.githubusercontent.com/uBlock-user/uBO-Personal-Filters/master/uPF.txt,https://github.com/uBlock-user/uBO-Personal-Filters,"A filterlist with additional filters for uBlock Origin to block third-party, tracking, annoyances and all other unwarranted resources from loading. Contains filters specific to uBlock Origin and some filters that have not yet been added to other filterlists.",https://github.com/uBlock-user/uBO-Personal-Filters,,,,, UncheckyAds,https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts,https://github.com/FadeMind/hosts.extras,"Windows installers ads sources sites based on Unchecky content.",https://github.com/StevenBlack/hosts,,,https://github.com/FadeMind/hosts.extras/issues,, Unified Hosts,https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts,https://github.com/StevenBlack/hosts,Extending and consolidating hosts files from a variety of sources,https://github.com/StevenBlack/hosts,,,,, From 81582305796cd93279e0f6941c2580970488f0c6 Mon Sep 17 00:00:00 2001 From: DJCrashdummy Date: Wed, 13 Sep 2017 15:18:21 +0200 Subject: [PATCH 5/5] re-ordered --- data/lists.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/lists.json b/data/lists.json index 22d533a97..8e3f9c924 100644 --- a/data/lists.json +++ b/data/lists.json @@ -22,14 +22,6 @@ "list": "ABPVN List", "tagLang": ["vi"], "viewUrl": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt" -}, { - "descr": "This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.", - "descrSourceUrl": "https://github.com/jspenguin2017/uBlockProtector", - "homeUrl": "https://jspenguin2017.github.io/uBlockProtector", - "issuesUrl": "https://github.com/jspenguin2017/uBlockProtector/issues", - "list": "uBlock Protector List", - "related": ["AakList (Anti-Adblock Killer)"], - "viewUrl": "https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt" }, { "descr": "Blocks Japanese regional social network advertisements and trackers.", "homeUrl": "https://github.com/k2jp/abp-japanese-filters", @@ -2083,6 +2075,14 @@ "list": "uBlock Polish Filters - Supplement", "tagLang": ["pl"], "viewUrl": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt" +}, { + "descr": "This project was built based on Anti-Adblock Killer (by Reek), but is now significantly different. Anti-Adblock Killer Script was completely re-implemented. Anti-Adblock Killer Filter was mostly copied and concatenated to uBlock Protector List.", + "descrSourceUrl": "https://github.com/jspenguin2017/uBlockProtector", + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector", + "issuesUrl": "https://github.com/jspenguin2017/uBlockProtector/issues", + "list": "uBlock Protector List", + "related": ["AakList (Anti-Adblock Killer)"], + "viewUrl": "https://raw.githubusercontent.com/jspenguin2017/uBlockProtector/master/uBlockProtectorList.txt" }, { "descr": "A filterlist with additional filters for uBlock Origin to block third-party, tracking, annoyances and all other unwarranted resources from loading. Contains filters specific to uBlock Origin and some filters that have not yet been added to other filterlists.", "descrSourceUrl": "https://github.com/uBlock-user/uBO-Personal-Filters",