diff --git a/.github/README.md b/.github/README.md index f2f18f29d..b226e922a 100644 --- a/.github/README.md +++ b/.github/README.md @@ -43,3 +43,7 @@ FilterLists does not condone or endorse implementing any particular FilterList o ### Privacy We respect your privacy. That is the whole point of this site. The only minor data we collect about visitors is what [Cloudflare](https://www.cloudflare.com/analytics/), [Application Insights](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-data-retention-privacy), and [GitHub](https://help.github.com/articles/github-privacy-statement/) capture. + +### Internet Explorer TPL users + +Due to problems with finding time to look into issues with TPL subscription buttons and to load the website in Internet Explorer, a makeshift archive has been set up in the meantime. To view a smaller TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/DandelionSprout/FilterLists/patch-74/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. diff --git a/data/FilterList.json b/data/FilterList.json index 7b8e0b84a..db799af3b 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -65,7 +65,7 @@ "homeUrl": "https://github.com/mayve/private-adblock-filters", "issuesUrl": "https://github.com/mayve/private-adblock-filters/issues", "licenseId": 5, - "name": "Private Adblock Filters", + "name": "Mayve's Private Adblock Filters", "publishedDate": "2014-08-23T07:30:22", "syntaxId": 3, "updatedDate": "2017-03-04T08:46:00", @@ -325,6 +325,7 @@ { "id": 32, "description": "Block advertisements.", + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -5278,7 +5279,7 @@ "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HU4EDJZP2S9QA", "homeUrl": "https://firebog.net/", "licenseId": 2, - "name": "EasyPrivacy Hosts", + "name": "EasyPrivacy Domains", "syntaxId": 2, "updatedDate": "2019-02-11T15:20:10", "viewUrl": "https://v.firebog.net/hosts/Easyprivacy.txt" @@ -6692,6 +6693,7 @@ "id": 617, "description": "Ad server list for use with hosts files to block ads", "descriptionSourceUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", + "donateUrl": "https://www.patreon.com/blocklist", "homeUrl": " https://pgl.yoyo.org/adservers", "licenseId": 5, "name": "Peter Lowe's List (Hosts)", @@ -6796,11 +6798,11 @@ }, { "id": 632, - "description": "Samsung SmartTV domains (Will block \"Smart\" aspects of device)", + "description": "Samsung SmartTV domains (Will block the \"Smart\" aspects of devices)", "descriptionSourceUrl": "https://v.firebog.net/hosts/static/SamsungSmart.txt", "licenseId": 5, "name": "Samsung SmartTV Domains", - "syntaxId": 1, + "syntaxId": 2, "viewUrl": "https://v.firebog.net/hosts/static/SamsungSmart.txt" }, { @@ -7149,6 +7151,7 @@ { "id": 672, "description": "Ad server list for use with Little Snitch", + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7160,6 +7163,7 @@ }, { "id": 673, + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7171,6 +7175,7 @@ }, { "id": 674, + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7182,6 +7187,7 @@ }, { "id": 675, + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7195,6 +7201,7 @@ "id": 676, "description": "List of ad servers usable in Internet Junkbuster's / Privoxy block file", "descriptionSourceUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=junkbuster;showintro=1&mimetype=plaintext", + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7206,6 +7213,7 @@ }, { "id": 677, + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -7485,17 +7493,6 @@ "updatedDate": "2019-02-11T16:00:14", "viewUrl": "https://raw.githubusercontent.com/austinheap/sophos-xg-block-lists/master/easylist.txt" }, - { - "id": 701, - "emailAddress": "me@austinheap.com", - "homeUrl": "https://github.com/austinheap/sophos-xg-block-lists", - "licenseId": 2, - "name": "EasyPrivacy (Domains)", - "publishedDate": "2018-06-23T01:33:18", - "syntaxId": 2, - "updatedDate": "2019-02-11T16:00:14", - "viewUrl": "https://raw.githubusercontent.com/austinheap/sophos-xg-block-lists/master/easyprivacy.txt" - }, { "id": 702, "emailAddress": "me@austinheap.com", @@ -9032,6 +9029,7 @@ }, { "id": 842, + "donateUrl": "https://www.patreon.com/blocklist", "homeUrl": " https://pgl.yoyo.org/adservers", "licenseId": 5, "name": "Peter Lowe's List (dnsmasq)", @@ -12493,7 +12491,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "GandJ Hosts (Domains)", + "name": "G&J Hosts (Domains)", "publishedDate": "2017-09-02T01:07:36", "syntaxId": 2, "updatedDate": "2018-05-28T14:02:55", @@ -12669,7 +12667,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "Mayvs Private Adblock Filters (Domains)", + "name": "Mayve's Private Adblock Filters (Domains)", "publishedDate": "2017-09-02T01:07:36", "syntaxId": 2, "updatedDate": "2018-05-28T14:02:55", @@ -12851,17 +12849,6 @@ "updatedDate": "2018-05-28T14:02:55", "viewUrl": "https://raw.githubusercontent.com/deathbybandaid/piholeparser/master/Subscribable-Lists/ParsedBlacklists/SVN-Slovenian.txt" }, - { - "id": 1195, - "homeUrl": "https://github.com/deathbybandaid/piholeparser", - "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", - "licenseId": 14, - "name": "Samsung SmartTV Domains (Domains)", - "publishedDate": "2017-09-02T01:07:36", - "syntaxId": 2, - "updatedDate": "2018-05-28T14:02:55", - "viewUrl": "https://raw.githubusercontent.com/deathbybandaid/piholeparser/master/Subscribable-Lists/ParsedBlacklists/Samsung-SmartTV-Domains.txt" - }, { "id": 1196, "homeUrl": "https://github.com/deathbybandaid/piholeparser", @@ -13860,7 +13847,7 @@ "description": "Shalla's Blacklists is a collection of URL lists grouped into several categories intended for the usage with URL filters like SquidGuard or Dansguardian.", "homeUrl": "http://www.shallalist.de/", "licenseId": 5, - "name": "Shalla List Anonvpn Domains", + "name": "Shalla List AnonVPN Domains", "publishedDate": "2018-04-20T21:26:11", "submissionUrl": "https://github.com/cbuijs/shallalist/tree/master/anonvpn", "syntaxId": 2, @@ -13872,7 +13859,7 @@ "description": "Shalla's Blacklists is a collection of URL lists grouped into several categories intended for the usage with URL filters like SquidGuard or Dansguardian.", "homeUrl": "http://www.shallalist.de/", "licenseId": 5, - "name": "Shalla List Anonvpn Urls", + "name": "Shalla List AnonVPN Urls", "publishedDate": "2018-04-20T21:26:11", "submissionUrl": "https://github.com/cbuijs/shallalist/tree/master/anonvpn", "syntaxId": 8, @@ -15348,7 +15335,7 @@ "description": "Shalla's Blacklists is a collection of URL lists grouped into several categories intended for the usage with URL filters like SquidGuard or Dansguardian.", "homeUrl": "http://www.shallalist.de/", "licenseId": 5, - "name": "Shalla List Updatesites Domains", + "name": "Shalla List Program Updates Domains", "publishedDate": "2018-04-20T21:26:11", "submissionUrl": "https://github.com/cbuijs/shallalist/tree/master/updatesites", "syntaxId": 2, @@ -15360,7 +15347,7 @@ "description": "Shalla's Blacklists is a collection of URL lists grouped into several categories intended for the usage with URL filters like SquidGuard or Dansguardian.", "homeUrl": "http://www.shallalist.de/", "licenseId": 5, - "name": "Shalla List Updatesites Urls", + "name": "Shalla List Program Updates Urls", "publishedDate": "2018-04-20T21:26:11", "submissionUrl": "https://github.com/cbuijs/shallalist/tree/master/updatesites", "syntaxId": 8, @@ -16218,6 +16205,7 @@ { "id": 1526, "description": "Block advertisements.", + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -16229,6 +16217,7 @@ { "id": 1527, "description": "Block advertisements.", + "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", "licenseId": 5, @@ -16288,5 +16277,42 @@ "syntaxId": 3, "description": "List for keloger, cookie collector, malware tracker and other spyware for suspicious.", "viewUrl": "https://raw.githubusercontent.com/kano1/Kano/master/Spyware_Scrip.txt" + }, + { + "id": 1533, + "description": "Filters to address issues specific to legacy versions of uBO.", + "descriptionSourceUrl": "https://github.com/uBlockOrigin/uAssets/blob/master/filters/legacy.txt", + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uAssets Legacy", + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/legacy.txt" + }, + { + "id": 1534, + "emailAddress": "wduk10@hotmail.com", + "homeUrl": "https://hostsfile.mine.nu/", + "licenseId": 4, + "name": "The Hosts File Project IPs", + "syntaxId": 9, + "updatedDate": "2005-09-24T00:00:00", + "viewUrl": "https://hostsfile.mine.nu/hosts.ips" + }, + { + "id": 1535, + "description": "As someone who is a translation validator for WordPress.com and WordPress' phone apps, this list fixes some minor botherances to make the process of going through hundreds of strings and suggestions slightly easier. So now I'm sharing them with the world as well.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/WordPressTranslatorAssistant.txt", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Assistant list for WordPress validators and translators", + "publishedDate": "2018-03-27T00:00:00", + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/WordPressTranslatorAssistant.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/WordPressTranslatorAssistant.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/WordPressTranslatorAssistant.txt" } ] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 94d610363..6e222c9fe 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -1862,5 +1862,161 @@ { "filterListId": 1529, "languageId": 154 + }, + { + "filterListId": 1115, + "languageId": 11 + }, + { + "filterListId": 1117, + "languageId": 11 + }, + { + "filterListId": 1039, + "languageId": 11 + }, + { + "filterListId": 1180, + "languageId": 11 + }, + { + "filterListId": 978, + "languageId": 10 + }, + { + "filterListId": 1075, + "languageId": 10 + }, + { + "filterListId": 1112, + "languageId": 10 + }, + { + "filterListId": 1011, + "languageId": 17 + }, + { + "filterListId": 1043, + "languageId": 17 + }, + { + "filterListId": 1189, + "languageId": 17 + }, + { + "filterListId": 1107, + "languageId": 159 + }, + { + "filterListId": 983, + "languageId": 159 + }, + { + "filterListId": 1052, + "languageId": 159 + }, + { + "filterListId": 890, + "languageId": 95 + }, + { + "filterListId": 923, + "languageId": 95 + }, + { + "filterListId": 1036, + "languageId": 79 + }, + { + "filterListId": 941, + "languageId": 79 + }, + { + "filterListId": 938, + "languageId": 106 + }, + { + "filterListId": 1197, + "languageId": 106 + }, + { + "filterListId": 1111, + "languageId": 112 + }, + { + "filterListId": 946, + "languageId": 112 + }, + { + "filterListId": 1218, + "languageId": 48 + }, + { + "filterListId": 1084, + "languageId": 48 + }, + { + "filterListId": 948, + "languageId": 137 + }, + { + "filterListId": 951, + "languageId": 139 + }, + { + "filterListId": 1220, + "languageId": 139 + }, + { + "filterListId": 1159, + "languageId": 177 + }, + { + "filterListId": 974, + "languageId": 177 + }, + { + "filterListId": 1102, + "languageId": 113 + }, + { + "filterListId": 916, + "languageId": 113 + }, + { + "filterListId": 1113, + "languageId": 154 + }, + { + "filterListId": 1128, + "languageId": 110 + }, + { + "filterListId": 1173, + "languageId": 99 + }, + { + "filterListId": 1173, + "languageId": 141 + }, + { + "filterListId": 927, + "languageId": 99 + }, + { + "filterListId": 731, + "languageId": 83 + }, + { + "filterListId": 731, + "languageId": 110 + }, + { + "filterListId": 114, + "languageId": 110 + }, + { + "filterListId": 1214, + "languageId": 110 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 6a278e8e0..711d76916 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -683,6 +683,10 @@ "filterListId": 1461, "maintainerId": 22 }, + { + "filterListId": 1535, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 @@ -3315,10 +3319,6 @@ "filterListId": 1194, "maintainerId": 109 }, - { - "filterListId": 1195, - "maintainerId": 109 - }, { "filterListId": 1196, "maintainerId": 109 @@ -4330,5 +4330,25 @@ { "filterListId": 469, "maintainerId": 128 + }, + { + "filterListId": 115, + "maintainerId": 129 + }, + { + "filterListId": 135, + "maintainerId": 129 + }, + { + "filterListId": 1534, + "maintainerId": 129 + }, + { + "filterListId": 170, + "maintainerId": 7 + }, + { + "filterListId": 239, + "maintainerId": 7 } ] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index d29b06c4c..7eadab117 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -321,7 +321,7 @@ }, { "filterListId": 73, - "tagId": 15 + "tagId": 24 }, { "filterListId": 74, @@ -583,6 +583,10 @@ "filterListId": 115, "tagId": 2 }, + { + "filterListId": 115, + "tagId": 3 + }, { "filterListId": 116, "tagId": 2 @@ -723,6 +727,10 @@ "filterListId": 148, "tagId": 2 }, + { + "filterListId": 148, + "tagId": 4 + }, { "filterListId": 150, "tagId": 15 @@ -2753,7 +2761,7 @@ }, { "filterListId": 649, - "tagId": 15 + "tagId": 24 }, { "filterListId": 650, @@ -3007,10 +3015,6 @@ "filterListId": 700, "tagId": 2 }, - { - "filterListId": 701, - "tagId": 3 - }, { "filterListId": 702, "tagId": 2 @@ -3425,7 +3429,7 @@ }, { "filterListId": 807, - "tagId": 15 + "tagId": 25 }, { "filterListId": 808, @@ -5019,10 +5023,6 @@ "filterListId": 1194, "tagId": 2 }, - { - "filterListId": 1195, - "tagId": 15 - }, { "filterListId": 1196, "tagId": 2 @@ -5153,11 +5153,11 @@ }, { "filterListId": 1233, - "tagId": 15 + "tagId": 26 }, { "filterListId": 1234, - "tagId": 15 + "tagId": 26 }, { "filterListId": 1235, @@ -5301,7 +5301,7 @@ }, { "filterListId": 1291, - "tagId": 15 + "tagId": 25 }, { "filterListId": 1292, @@ -5387,37 +5387,21 @@ "filterListId": 1306, "tagId": 2 }, - { - "filterListId": 1307, - "tagId": 3 - }, { "filterListId": 1307, "tagId": 6 }, - { - "filterListId": 1308, - "tagId": 3 - }, { "filterListId": 1308, "tagId": 6 }, { "filterListId": 1309, - "tagId": 3 - }, - { - "filterListId": 1309, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1310, - "tagId": 3 - }, - { - "filterListId": 1310, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1311, @@ -5425,7 +5409,7 @@ }, { "filterListId": 1311, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1312, @@ -5433,71 +5417,39 @@ }, { "filterListId": 1312, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1313, - "tagId": 3 - }, - { - "filterListId": 1313, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1314, - "tagId": 3 - }, - { - "filterListId": 1314, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1315, - "tagId": 3 - }, - { - "filterListId": 1315, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1316, - "tagId": 3 - }, - { - "filterListId": 1316, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1317, - "tagId": 3 - }, - { - "filterListId": 1317, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1318, - "tagId": 3 - }, - { - "filterListId": 1318, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1319, - "tagId": 3 - }, - { - "filterListId": 1319, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1320, - "tagId": 3 - }, - { - "filterListId": 1320, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1321, @@ -5509,195 +5461,99 @@ }, { "filterListId": 1323, - "tagId": 3 - }, - { - "filterListId": 1323, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1324, - "tagId": 3 - }, - { - "filterListId": 1324, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1325, - "tagId": 3 - }, - { - "filterListId": 1325, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1326, - "tagId": 3 - }, - { - "filterListId": 1326, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1327, - "tagId": 3 - }, - { - "filterListId": 1327, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1328, - "tagId": 3 - }, - { - "filterListId": 1328, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1329, - "tagId": 3 - }, - { - "filterListId": 1329, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1330, - "tagId": 3 - }, - { - "filterListId": 1330, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1331, - "tagId": 3 - }, - { - "filterListId": 1331, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1332, - "tagId": 3 - }, - { - "filterListId": 1332, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1333, - "tagId": 3 - }, - { - "filterListId": 1333, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1334, - "tagId": 3 - }, - { - "filterListId": 1334, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1335, - "tagId": 3 - }, - { - "filterListId": 1335, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1336, - "tagId": 3 - }, - { - "filterListId": 1336, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1337, - "tagId": 3 - }, - { - "filterListId": 1337, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1338, - "tagId": 3 - }, - { - "filterListId": 1338, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1339, - "tagId": 3 - }, - { - "filterListId": 1339, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1340, - "tagId": 3 - }, - { - "filterListId": 1340, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1341, - "tagId": 3 - }, - { - "filterListId": 1341, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1342, - "tagId": 3 - }, - { - "filterListId": 1342, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1343, - "tagId": 3 - }, - { - "filterListId": 1343, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1344, - "tagId": 3 - }, - { - "filterListId": 1344, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1345, - "tagId": 3 - }, - { - "filterListId": 1345, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1346, - "tagId": 3 - }, - { - "filterListId": 1346, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1347, @@ -5725,323 +5581,163 @@ }, { "filterListId": 1353, - "tagId": 3 - }, - { - "filterListId": 1353, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1354, - "tagId": 3 - }, - { - "filterListId": 1354, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1355, - "tagId": 3 - }, - { - "filterListId": 1355, - "tagId": 6 + "tagId": 24 }, { "filterListId": 1356, - "tagId": 3 - }, - { - "filterListId": 1356, - "tagId": 6 + "tagId": 24 }, { "filterListId": 1357, - "tagId": 3 - }, - { - "filterListId": 1357, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1358, - "tagId": 3 - }, - { - "filterListId": 1358, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1359, - "tagId": 3 - }, - { - "filterListId": 1359, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1360, - "tagId": 3 - }, - { - "filterListId": 1360, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1361, - "tagId": 3 - }, - { - "filterListId": 1361, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1362, - "tagId": 3 - }, - { - "filterListId": 1362, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1363, - "tagId": 3 - }, - { - "filterListId": 1363, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1364, - "tagId": 3 - }, - { - "filterListId": 1364, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1365, - "tagId": 3 - }, - { - "filterListId": 1365, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1366, - "tagId": 3 - }, - { - "filterListId": 1366, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1367, - "tagId": 3 - }, - { - "filterListId": 1367, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1368, - "tagId": 3 - }, - { - "filterListId": 1368, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1369, - "tagId": 3 - }, - { - "filterListId": 1369, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1370, - "tagId": 3 - }, - { - "filterListId": 1370, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1371, - "tagId": 3 - }, - { - "filterListId": 1371, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1372, - "tagId": 3 - }, - { - "filterListId": 1372, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1373, - "tagId": 3 - }, - { - "filterListId": 1373, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1374, - "tagId": 3 - }, - { - "filterListId": 1374, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1375, - "tagId": 3 - }, - { - "filterListId": 1375, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1376, - "tagId": 3 - }, - { - "filterListId": 1376, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1377, - "tagId": 3 - }, - { - "filterListId": 1377, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1378, - "tagId": 3 - }, - { - "filterListId": 1378, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1379, - "tagId": 3 - }, - { - "filterListId": 1379, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1380, - "tagId": 3 - }, - { - "filterListId": 1380, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1381, - "tagId": 3 - }, - { - "filterListId": 1381, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1382, - "tagId": 3 - }, - { - "filterListId": 1382, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1383, - "tagId": 3 - }, - { - "filterListId": 1383, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1384, - "tagId": 3 - }, - { - "filterListId": 1384, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1385, - "tagId": 3 - }, - { - "filterListId": 1385, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1386, - "tagId": 3 - }, - { - "filterListId": 1386, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1387, - "tagId": 3 - }, - { - "filterListId": 1387, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1388, - "tagId": 3 - }, - { - "filterListId": 1388, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1389, - "tagId": 3 - }, - { - "filterListId": 1389, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1390, - "tagId": 3 - }, - { - "filterListId": 1390, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1391, - "tagId": 3 - }, - { - "filterListId": 1391, - "tagId": 6 + "tagId": 25 }, { "filterListId": 1392, - "tagId": 3 - }, - { - "filterListId": 1392, - "tagId": 6 + "tagId": 25 }, { "filterListId": 1393, @@ -6053,131 +5749,67 @@ }, { "filterListId": 1395, - "tagId": 3 - }, - { - "filterListId": 1395, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1396, - "tagId": 3 - }, - { - "filterListId": 1396, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1397, - "tagId": 3 - }, - { - "filterListId": 1397, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1398, - "tagId": 3 - }, - { - "filterListId": 1398, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1399, - "tagId": 3 - }, - { - "filterListId": 1399, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1400, - "tagId": 3 - }, - { - "filterListId": 1400, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1401, - "tagId": 3 - }, - { - "filterListId": 1401, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1402, - "tagId": 3 - }, - { - "filterListId": 1402, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1403, - "tagId": 3 - }, - { - "filterListId": 1403, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1404, - "tagId": 3 - }, - { - "filterListId": 1404, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1405, - "tagId": 3 - }, - { - "filterListId": 1405, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1406, - "tagId": 3 - }, - { - "filterListId": 1406, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1407, - "tagId": 3 - }, - { - "filterListId": 1407, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1408, - "tagId": 3 - }, - { - "filterListId": 1408, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1409, - "tagId": 3 - }, - { - "filterListId": 1409, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1410, - "tagId": 3 - }, - { - "filterListId": 1410, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1411, @@ -6189,67 +5821,35 @@ }, { "filterListId": 1413, - "tagId": 3 - }, - { - "filterListId": 1413, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1414, - "tagId": 3 - }, - { - "filterListId": 1414, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1415, - "tagId": 3 - }, - { - "filterListId": 1415, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1416, - "tagId": 3 - }, - { - "filterListId": 1416, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1417, - "tagId": 3 - }, - { - "filterListId": 1417, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1418, - "tagId": 3 - }, - { - "filterListId": 1418, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1419, - "tagId": 3 - }, - { - "filterListId": 1419, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1420, - "tagId": 3 - }, - { - "filterListId": 1420, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1421, @@ -6261,19 +5861,11 @@ }, { "filterListId": 1423, - "tagId": 3 - }, - { - "filterListId": 1423, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1424, - "tagId": 3 - }, - { - "filterListId": 1424, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1425, @@ -6285,19 +5877,11 @@ }, { "filterListId": 1427, - "tagId": 3 - }, - { - "filterListId": 1427, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1428, - "tagId": 3 - }, - { - "filterListId": 1428, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1429, @@ -6307,53 +5891,29 @@ "filterListId": 1430, "tagId": 4 }, - { - "filterListId": 1431, - "tagId": 3 - }, { "filterListId": 1431, "tagId": 6 }, - { - "filterListId": 1432, - "tagId": 3 - }, { "filterListId": 1432, "tagId": 6 }, { "filterListId": 1433, - "tagId": 3 - }, - { - "filterListId": 1433, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1434, - "tagId": 3 - }, - { - "filterListId": 1434, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1435, - "tagId": 3 - }, - { - "filterListId": 1435, - "tagId": 6 + "tagId": 26 }, { "filterListId": 1436, - "tagId": 3 - }, - { - "filterListId": 1436, - "tagId": 6 + "tagId": 26 }, { "filterListId": 1437, @@ -6363,109 +5923,57 @@ "filterListId": 1438, "tagId": 23 }, - { - "filterListId": 1439, - "tagId": 11 - }, { "filterListId": 1440, - "tagId": 11 + "tagId": 15 }, { "filterListId": 1441, - "tagId": 3 - }, - { - "filterListId": 1441, - "tagId": 6 + "tagId": 24 }, { "filterListId": 1442, - "tagId": 3 - }, - { - "filterListId": 1442, - "tagId": 6 + "tagId": 24 }, { "filterListId": 1443, "tagId": 3 }, - { - "filterListId": 1443, - "tagId": 6 - }, { "filterListId": 1444, "tagId": 3 }, - { - "filterListId": 1444, - "tagId": 6 - }, { "filterListId": 1445, - "tagId": 3 - }, - { - "filterListId": 1445, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1446, - "tagId": 3 - }, - { - "filterListId": 1446, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1447, - "tagId": 3 - }, - { - "filterListId": 1447, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1448, - "tagId": 3 - }, - { - "filterListId": 1448, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1449, - "tagId": 3 - }, - { - "filterListId": 1449, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1450, - "tagId": 3 - }, - { - "filterListId": 1450, - "tagId": 6 + "tagId": 26 }, { "filterListId": 1451, - "tagId": 3 - }, - { - "filterListId": 1451, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1452, - "tagId": 3 - }, - { - "filterListId": 1452, - "tagId": 6 + "tagId": 15 }, { "filterListId": 1453, @@ -6673,15 +6181,15 @@ }, { "filterListId": 1484, - "tagId": 3 + "tagId": 24 }, { "filterListId": 1485, - "tagId": 20 + "tagId": 24 }, { "filterListId": 1486, - "tagId": 20 + "tagId": 24 }, { "filterListId": 1487, @@ -6958,5 +6466,21 @@ { "filterListId": 1532, "tagId": 7 + }, + { + "filterListId": 1533, + "tagId": 2 + }, + { + "filterListId": 1534, + "tagId": 2 + }, + { + "filterListId": 1534, + "tagId": 3 + }, + { + "filterListId": 1535, + "tagId": 15 } ] diff --git a/data/Maintainer.json b/data/Maintainer.json index 441b0bb0f..5abb5f0fb 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -677,5 +677,10 @@ "id": 128, "homeUrl": "https://github.com/kano1", "name": "kano1" + }, + { + "id": 129, + "homeUrl": "https://hostsfile.mine.nu/", + "name": "Andy Short" } -] \ No newline at end of file +] diff --git a/data/TPLSubscriptionAssistant.html b/data/TPLSubscriptionAssistant.html new file mode 100644 index 000000000..1ae997513 --- /dev/null +++ b/data/TPLSubscriptionAssistant.html @@ -0,0 +1,66 @@ +Because FilterLists.com cannot be loaded in Internet Explorer, and because GitHub does not allow JavaScript links, here's a workaround to assist in subscribing to TPL lists.

+ +How this works:
+1) Save this file as an HTML file. (This can be done by e.g. right-clicking on the raw file and saving, or by pasting it into a notepad and saving it there.)
+2) Open the saved HTML file in Internet Explorer.
+3) Click on a link to subscribe to it.
+3.5) Normally the link will be blocked the first time around. If so, click on "Allow Blocked Content" in the resulting prompt below, and then click the link again.

+ +-------------------------------------------------

+ +* International lists:

+EasyList - View ruleset
+EasyList Without Rules for Adult Sites - View ruleset
+EasyPrivacy - View ruleset
+EasyPrivacy Without International Rules - View ruleset
+EasyList + EasyPrivacy - View ruleset
+Peter Lowe's List - View ruleset
+DNS-BH Malware Domains - View ruleset
+Adblock Warning Removal List - View ruleset
+Fanboy's Social Blocking List - View ruleset
+Fanboy's Annoyance List - View ruleset

+ +* Language-specific lists:

+ +Bulgarian List + EasyList - View ruleset
+EasyList China + EasyList - View ruleset
+EasyList China - View ruleset
+EasyList Czech and Slovak - View ruleset
+EasyList Dutch - View ruleset
+EasyList Germany + EasyList - View ruleset
+EasyList Germany - View ruleset
+EasyList Italy + EasyList - View ruleset
+EasyList Italy - View ruleset
+EasyList Lithuania + EasyList - View ruleset
+EasyList Spanish + EasyList - View ruleset
+EasyList Spanish - View ruleset
+EasyList Hebrew - View ruleset
+Latvian List + EasyList - View ruleset
+Liste AR + Liste FR + EasyList - View ruleset
+Liste AR - View ruleset
+Liste FR + EasyList - View ruleset
+Liste FR - View ruleset
+ROList + EasyList - View ruleset
+RU AdList - View ruleset
+Dandelion Sprouts nordiske filtre - View ruleset

+ +-------------------------------------------------

+ +* Outdated international lists (Last updated more than 24 months ago), that have not been succeeded by more recently updated TPL lists

+ +(2016) Fanboy's Enhanced Tracking List - View ruleset
+(2016) Malware Patrol - View ruleset
+(2016) Rickroll Blacklist - View ruleset
+(2016) Prebake Obtrusive - View ruleset
+(2013) M - View ruleset
+(2013) Adversity - View ruleset
+(2013) Adversity - AntiSocial - View ruleset
+(2013) Stop Google Tracking - View ruleset
+(2011) Popup Block List for Adblock Plus Popup Addon - View ruleset
+(2011) Facebook Connect Opt-Out - View ruleset
+(Unknown year) TRUSTe Easy Tracking Protection List - View ruleset

+ +* Outdated language-specific lists (Last updated more than 24 months ago), that have not been succeeded by more recently updated TPL lists

+ +(2016) Adblock Persian List - View ruleset
+(2015) Wiltteri + EasyList - View ruleset

diff --git a/data/Tag.json b/data/Tag.json index 765a55c9d..1f6546c4c 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -113,5 +113,20 @@ "id": 23, "description": "Blocks pages from link-shortening services", "name": "shorteners" + }, + { + "id": 24, + "description": "Blocks piracy-focusing sites", + "name": "piracy" + }, + { + "id": 25, + "description": "Blocks political content", + "name": "politics" + }, + { + "id": 26, + "description": "Blocks software updates", + "name": "updates" } ]