Post-'Norwegian Constitution Day' pull (#792)

* Update FilterList.json

* Update TPLSubscriptionAssistant.html

* Update FilterListMaintainer.json

* Update FilterListTag.json

* Update FilterListLanguage.json

* Add files via upload

* Update SoftwareIcon.tsx

* Update index.ts

* Update Software.json

* Update SoftwareSyntax.json

* Update FilterList.json
This commit is contained in:
Imre Kristoffer Eilertsen 2019-05-20 14:06:05 +02:00 committed by Collin M. Barrett
parent 975e53ffa6
commit 49bd5ceef9
11 changed files with 244 additions and 5 deletions

View file

@ -7216,7 +7216,7 @@
},
{
"id": 680,
"description": "A version of the Nordic filter list for domains tools, such as Pi-hole, Google Hit Hider by Domain, and Samsung Knox.",
"description": "This is a slimmer version of \"Dandelion Sprout's Nordic Filters\", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers.",
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"homeUrl": "https://github.com/DandelionSprout/adfilt",
@ -13519,7 +13519,7 @@
"licenseId": 10,
"name": "Dandelion Sprout's Anti-Malware List",
"publishedDate": "2018-01-04T00:00:00",
"syntaxId": 28,
"syntaxId": 17,
"updatedDate": "2019-04-19T00:21:10",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Anti-Malware%20List.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Dandelion%20Sprout's%20Anti-Malware%20List.txt",
@ -17026,5 +17026,121 @@
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersABP.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersABP.txt",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersABP.txt"
},
{
"id": 1583,
"description": "Removes ads, affiliation ads, and empty boxes on Norwegian, Danish, Icelandic, Sami and Danish territorial sites to produce a cleaner browser experience. Meant to be used on top of general filters.",
"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": "Dandelion Sprout's Nordic Filters for Tidier Websites (for Privoxy)",
"publishedDate": "2019-05-19T00:00:00",
"syntaxId": 19,
"updatedDate": "2019-05-19T00:00:00",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersPrivoxy.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersPrivoxy.txt",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersPrivoxy.txt"
},
{
"id": 1584,
"description": "This is a slimmer version of \"Dandelion Sprout's Nordic Filters\", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers.",
"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": "Dandelion Sprout's Nordic Filters for Tidier Websites (dnsmasq)",
"syntaxId": 20,
"publishedDate": "2019-05-19T00:00:00",
"updatedDate": "2019-05-19T00:00:00",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDnsmasq.conf",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDnsmasq.conf",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDnsmasq.conf"
},
{
"id": 1585,
"description": "This is a slimmer version of \"Dandelion Sprout's Nordic Filters\", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers.",
"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": "Dandelion Sprout's Nordic Filters for Tidier Websites (The «hosts.deny» version)",
"syntaxId": 23,
"publishedDate": "2019-05-19T00:00:00",
"updatedDate": "2019-05-19T00:00:00",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsDeny.deny",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsDeny.deny",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsDeny.deny"
},
{
"id": 1586,
"description": "Most anti-malware lists are pretty big and can cover a 5- or 6-digit amount of specific domains. But my list hereby claims to remove more than 25% of all known malware sites with just a 2-digit amount of entries. This is mostly done by blocking top-level domains that have become devastatingly abused by spammers, usually because they allowed for free and uncontrolled domain registrations. There's also additional categories that cover unusual malware and phishing domains that very few other lists seem to cover.",
"descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Anti-Malware%20List.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": "Dandelion Sprout's Anti-Malware List (for Adblock Plus and AdBlock)",
"publishedDate": "2018-01-04T00:00:00",
"syntaxId": 28,
"updatedDate": "2019-04-19T00:21:10",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareABP.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Alternate%20versions%20Anti-Malware%20List/AntiMalwareABP.txt",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareABP.txt"
},
{
"id": 1587,
"description": "Most anti-malware lists are pretty big and can cover a 5- or 6-digit amount of specific domains. But my list hereby claims to remove more than 25% of all known malware sites with just a 2-digit amount of entries. This is mostly done by blocking top-level domains that have become devastatingly abused by spammers, usually because they allowed for free and uncontrolled domain registrations. There's also additional categories that cover unusual malware and phishing domains that very few other lists seem to cover.",
"descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Anti-Malware%20List.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": "Dandelion Sprout's Anti-Malware List (for AdGuard)",
"publishedDate": "2018-01-04T00:00:00",
"syntaxId": 6,
"updatedDate": "2019-04-19T00:21:10",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuard.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuard.txt",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuard.txt"
},
{
"id": 1588,
"description": "There's categories that cover unusual malware and phishing domains that very few other lists seem to cover.",
"descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Anti-Malware%20List.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": "Dandelion Sprout's Anti-Malware List (Internet Explorer TPL)",
"publishedDate": "2018-01-04T00:00:00",
"syntaxId": 10,
"updatedDate": "2019-04-19T00:21:10",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl"
},
{
"id": 1589,
"description": "Most anti-malware lists are pretty big and can cover a 5- or 6-digit amount of specific domains. But my list hereby claims to remove more than 25% of all known malware sites with just a 2-digit amount of entries. This is mostly done by blocking top-level domains that have become devastatingly abused by spammers, usually because they allowed for free and uncontrolled domain registrations. There's also additional categories that cover unusual malware and phishing domains that very few other lists seem to cover.",
"descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Anti-Malware%20List.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": "Dandelion Sprout's Anti-Malware List (for Privoxy)",
"publishedDate": "2018-01-04T00:00:00",
"syntaxId": 19,
"updatedDate": "2019-04-19T00:21:10",
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwarePrivoxy.action",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Alternate%20versions%20Anti-Malware%20List/AntiMalwarePrivoxy.action",
"viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwarePrivoxy.action"
}
]

View file

@ -2170,5 +2170,33 @@
{
"filterListId": 1582,
"languageId": 160
},
{
"filterListId": 1583,
"languageId": 44
},
{
"filterListId": 1583,
"languageId": 106
},
{
"filterListId": 1583,
"languageId": 160
},
{
"filterListId": 1584,
"languageId": 44
},
{
"filterListId": 1584,
"languageId": 106
},
{
"filterListId": 1585,
"languageId": 44
},
{
"filterListId": 1585,
"languageId": 106
}
]

View file

@ -779,6 +779,34 @@
"filterListId": 1576,
"maintainerId": 22
},
{
"filterListId": 1583,
"maintainerId": 22
},
{
"filterListId": 1584,
"maintainerId": 22
},
{
"filterListId": 1585,
"maintainerId": 22
},
{
"filterListId": 1586,
"maintainerId": 22
},
{
"filterListId": 1587,
"maintainerId": 22
},
{
"filterListId": 1588,
"maintainerId": 22
},
{
"filterListId": 1589,
"maintainerId": 22
},
{
"filterListId": 21,
"maintainerId": 23

View file

@ -6774,5 +6774,45 @@
{
"filterListId": 1582,
"tagId": 10
},
{
"filterListId": 1583,
"tagId": 2
},
{
"filterListId": 1583,
"tagId": 6
},
{
"filterListId": 1584,
"tagId": 2
},
{
"filterListId": 1584,
"tagId": 6
},
{
"filterListId": 1585,
"tagId": 2
},
{
"filterListId": 1585,
"tagId": 6
},
{
"filterListId": 1586,
"tagId": 6
},
{
"filterListId": 1587,
"tagId": 6
},
{
"filterListId": 1588,
"tagId": 6
},
{
"filterListId": 1589,
"tagId": 6
}
]

View file

@ -207,5 +207,15 @@
"homeUrl": "https://adnauseam.io/",
"isAbpSubscribable": true,
"name": "AdNauseam"
},
{
"id": 33,
"isAbpSubscribable": false,
"name": "Legacy Unix derivatives"
},
{
"id": 34,
"isAbpSubscribable": false,
"name": "Windows command line"
}
]

View file

@ -362,5 +362,13 @@
{
"softwareId": 32,
"syntaxId": 28
},
{
"softwareId": 33,
"syntaxId": 23
},
{
"softwareId": 34,
"syntaxId": 27
}
]

View file

@ -22,7 +22,8 @@
<a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/fanboy-annoyance.tpl', 'Fanboy\'s Annoyance List')">Fanboy's Annoyance List</a> - <a href="https://easylist-msie.adblockplus.org/fanboy-annoyance.tpl">View ruleset</a><br>
<a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/fanboy-social.tpl', 'Fanboy\'s Social Blocking List')">Fanboy's Social Blocking List</a> - <a href="https://easylist-msie.adblockplus.org/fanboy-social.tpl">View ruleset</a><br>
<a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/malwaredomains_full.tpl', 'DNS-BH Malware Domains')">DNS-BH Malware Domains</a> - <a href="https://easylist-msie.adblockplus.org/malwaredomains_full.tpl">View ruleset</a><br>
<a href="javascript:window.external.msAddTrackingProtectionList('https://pgl.yoyo.org/adservers/serverlist.tpl', 'Peter Lowe\'s List')">Peter Lowe's List</a> - <a href="https://pgl.yoyo.org/adservers/serverlist.tpl">View ruleset</a><br><br>
<a href="javascript:window.external.msAddTrackingProtectionList('https://pgl.yoyo.org/adservers/serverlist.tpl', 'Peter Lowe\'s List')">Peter Lowe's List</a> - <a href="https://pgl.yoyo.org/adservers/serverlist.tpl">View ruleset</a><br>
<a href="javascript:window.external.msAddTrackingProtectionList('https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl', 'Dandelion Sprout\'s Anti-Malware List')">Dandelion Sprout's Anti-Malware List</a> - <a href="https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl">View ruleset</a><br><br>
* Language-specific lists:<br><br>

View file

@ -30,7 +30,9 @@ import {
img29,
img30,
img31,
img32
img32,
img33,
img34
} from "./imgs";
interface IProps {
@ -82,4 +84,6 @@ const icons: { [id: number]: IIcon; } = {
30: { image: img30, imageTitle: "BIND" },
31: { image: img31, imageTitle: "AdGuard Home" },
32: { image: img32, imageTitle: "AdNauseam" },
33: { image: img33, imageTitle: "Legacy Unix derivatives" },
34: { image: img34, imageTitle: "Windows command line" },
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

View file

@ -29,6 +29,8 @@ import img29 from "./29-Unbound.png";
import img30 from "./30-BIND.png";
import img31 from "./31-AdGuard-Home.png";
import img32 from "./32-AdNauseam.png";
import img33 from "./33-Legacy-Unix-Derivatives.png";
import img34 from "./34-Windows-command-line.png";
export {
img1,
@ -61,5 +63,7 @@ export {
img29,
img30,
img31,
img32
img32,
img33,
img34
};