Merge pull request #504 from DandelionSprout/patch-23

Friday night pull
This commit is contained in:
Collin M. Barrett 2018-09-22 00:50:12 +00:00 committed by GitHub
commit 96480cf1d8
9 changed files with 295 additions and 8 deletions

View file

@ -663,7 +663,7 @@
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List",
"policyUrl": null,
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
@ -12267,7 +12267,7 @@
"id": 617,
"chatUrl": null,
"description": "Ad server list for use with hosts files to block ads",
"descriptionSourceUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext",
"descriptionSourceUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": null,
@ -12276,11 +12276,11 @@
"issuesUrl": null,
"licenseId": null,
"name": "Peter Lowe's List (Hosts)",
"policyUrl": null,
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 1,
"viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext",
"viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
@ -13333,5 +13333,236 @@
"viewUrl": "https://tgc.cloud/downloads/hosts.txt",
"viewUrlMirror1": "https://raw.githubusercontent.com/10ZiN/10ZiN.github.io/master/downloads/hosts.txt",
"viewUrlMirror2": null
},
{
"id": 670,
"chatUrl": null,
"description": "A version of the Norwegian filter list for Little Snitch.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"forumUrl": null,
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 10,
"name": "Dandelion Sprout's Norwegian Filters for Tidier Websites (Little Snitch)",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 18,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/LittleSnitchNorwegianList.lsrules",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/LittleSnitchNorwegianList.lsrules",
"viewUrlMirror2": null
},
{
"id": 671,
"chatUrl": null,
"description": "This rule group demonstrates the subscription of a blocklist. It's for demo purposes only. It lets you try out the subscription procedure and the available configuration options. You can rename the group, enable/disable either individual rules or the entire group, specify the update interval, and more.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": null,
"forumUrl": null,
"homeUrl": "https://www.obdev.at/products/littlesnitch/index.html",
"issuesUrl": null,
"licenseId": null,
"name": "Little Snitch Blocklist Example",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 18,
"viewUrl": "https://obdev.at/resources/littlesnitch/blocklist-example.lsrules",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 672,
"chatUrl": null,
"description": "Ad server list for use with Little Snitch",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (Little Snitch)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 18,
"viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=littlesnitch-rule-group-subscriptions;showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 673,
"chatUrl": null,
"description": null,
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (Internet Explorer)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 10,
"viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=msfilter&showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 674,
"chatUrl": null,
"description": null,
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (Domains)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 2,
"viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 675,
"chatUrl": null,
"description": null,
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (IPs)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 9,
"viewUrl": "https://pgl.yoyo.org/adservers/iplist.php?ipformat=plain&showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 676,
"chatUrl": null,
"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",
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (Privoxy)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 19,
"viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=junkbuster;showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 677,
"chatUrl": null,
"description": null,
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "pgl@yoyo.org",
"forumUrl": null,
"homeUrl": "https://pgl.yoyo.org/adservers/",
"issuesUrl": null,
"licenseId": 5,
"name": "Peter Lowe's List (Domains with wildcards)",
"policyUrl": "https://pgl.yoyo.org/as/policy.php",
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 16,
"viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=adblock;showintro=1&mimetype=plaintext",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 678,
"chatUrl": null,
"description": null,
"descriptionSourceUrl": null,
"discontinuedDate": "2014-05-19",
"donateUrl": null,
"emailAddress": null,
"forumUrl": null,
"homeUrl": "https://gist.github.com/sx2008/2766874",
"issuesUrl": null,
"licenseId": null,
"name": "Privoxy User Action File (sx2008)",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 19,
"viewUrl": "https://gist.githubusercontent.com/sx2008/2766874/raw/c12a305decef3332663d1e04efa80b881211cfac/user.action",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 679,
"chatUrl": null,
"description": "This is my Privoxy configuration. It blocks common trackers and ads.",
"descriptionSourceUrl": "https://github.com/fdb/privoxy-config/blob/master/README",
"discontinuedDate": "2012-05-15",
"donateUrl": null,
"emailAddress": null,
"forumUrl": null,
"homeUrl": "https://github.com/fdb/privoxy-config",
"issuesUrl": "https://github.com/fdb/privoxy-config/issues",
"licenseId": null,
"name": "Privoxy Config - Block Trackers",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 19,
"viewUrl": "https://raw.githubusercontent.com/fdb/privoxy-config/master/block-trackers.action",
"viewUrlMirror1": null,
"viewUrlMirror2": null
},
{
"id": 680,
"chatUrl": null,
"description": "A version of the Norwegian filter list for domains tools, such as Pi-hole, Samsung Knox, Personal Blocklist, and Google Hit Hider by Domain.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"forumUrl": null,
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 10,
"name": "Dandelion Sprout's Norwegian Filters for Tidier Websites (Domains)",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 2,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltreDomains.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltreDomains.txt",
"viewUrlMirror2": null
}
]

View file

@ -255,6 +255,14 @@
"filterListId": 603,
"maintainerId": 22
},
{
"filterListId": 670,
"maintainerId": 22
},
{
"filterListId": 680,
"maintainerId": 22
},
{
"filterListId": 23,
"maintainerId": 23

View file

@ -124,5 +124,19 @@
"homeUrl": "https://www.samsungknox.com",
"isAbpSubscribable": false,
"name": "Samsung Knox"
},
{
"id": 20,
"downloadUrl": "https://www.obdev.at/products/littlesnitch/download.html",
"homeUrl": "https://www.obdev.at/products/littlesnitch/index.html",
"isAbpSubscribable": false,
"name": "Little Snitch"
},
{
"id": 21,
"downloadUrl": "https://www.privoxy.org/sf-download-mirror/",
"homeUrl": "https://www.privoxy.org/",
"isAbpSubscribable": false,
"name": "Privoxy"
}
]

View file

@ -39,6 +39,10 @@
"softwareId": 5,
"syntaxId": 2
},
{
"softwareId": 6,
"syntaxId": 2
},
{
"softwareId": 8,
"syntaxId": 2
@ -175,6 +179,10 @@
"softwareId": 5,
"syntaxId": 16
},
{
"softwareId": 6,
"syntaxId": 16
},
{
"softwareId": 19,
"syntaxId": 16
@ -186,5 +194,13 @@
{
"softwareId": 5,
"syntaxId": 17
},
{
"softwareId": 20,
"syntaxId": 18
},
{
"softwareId": 21,
"syntaxId": 19
}
]
]

View file

@ -78,5 +78,15 @@
"id": 17,
"definitionUrl": "https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#scriptlet-injection",
"name": "uBlock Origin scriptlet injection"
},
{
"id": 18,
"definitionUrl": "https://help.obdev.at/littlesnitch/#/lsc-rule-group-subscriptions",
"name": "Little Snitch subscription-style rules"
},
{
"id": 19,
"definitionUrl": "https://www.privoxy.org/user-manual/actions-file.html",
"name": "Privoxy action file"
}
]

View file

@ -15,7 +15,9 @@ import {
img15,
img16,
img18,
img19
img19,
img20,
img21
} from "./imgs";
interface IProps {
@ -52,5 +54,7 @@ const icons: { [id: number]: IIcon; } = {
15: { image: img15, imageTitle: "uBlock" },
16: { image: img16, imageTitle: "Internet Explorer (TPL)" },
18: { image: img18, imageTitle: "FireHOL" },
19: { image: img19, imageTitle: "Samsung Knox" }
19: { image: img19, imageTitle: "Samsung Knox" },
20: { image: img20, imageTitle: "Little Snitch" },
21: { image: img20, imageTitle: "Privoxy" }
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -14,6 +14,8 @@ import img15 from "./15-uBlock.svg";
import img16 from "./16-Internet-Explorer-TPL.png";
import img18 from "./18-FireHOL.png";
import img19 from "./19-Samsung-Knox.png";
import img20 from "./20-Little-Snitch.png";
import img21 from "./21-Privoxy.png";
export {
img1,
@ -31,5 +33,7 @@ export {
img15,
img16,
img18,
img19
img19,
img20,
img21
};