From c02eef2e42263662f92d64e6f344c3cb34f1cbd4 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 21 Sep 2018 23:22:20 +0200 Subject: [PATCH 01/17] Added Little Snitch --- data/Software.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/Software.json b/data/Software.json index b4a560257..4027ea4c4 100644 --- a/data/Software.json +++ b/data/Software.json @@ -124,5 +124,12 @@ "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" } ] From b3934c98b2f9a5859e77974b949574f068e81a0d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 21 Sep 2018 23:25:44 +0200 Subject: [PATCH 02/17] Added the Little Snitch syntax --- data/Syntax.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/Syntax.json b/data/Syntax.json index a26cbaa15..474a436a1 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -78,5 +78,10 @@ "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" } ] From ae1d559e051eb83921204c0fc34f7d88d9f965ec Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 21 Sep 2018 23:26:41 +0200 Subject: [PATCH 03/17] Tied Little Snitch to its syntax --- data/SoftwareSyntax.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 6484fe1fc..6596d8ff8 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -186,5 +186,9 @@ { "softwareId": 5, "syntaxId": 17 + }, + { + "softwareId": 20, + "syntaxId": 18 } -] \ No newline at end of file +] From a7b7e657fe1ea88f7be95039059fc06114b4af16 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 21 Sep 2018 23:50:02 +0200 Subject: [PATCH 04/17] Added 2 new lists --- data/FilterList.json | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 8f37f4431..5b4589bc5 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13333,5 +13333,47 @@ "viewUrl": "https://tgc.cloud/downloads/hosts.txt", "viewUrlMirror1": "https://raw.githubusercontent.com/10ZiN/10ZiN.github.io/master/downloads/hosts.txt", "viewUrlMirror2": null - } + }, + { + "id": 388, + "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": 389, + "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 + }, ] From 17b4fa36d3ec08e0eb48ad29a2319d7b793c6552 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:12:20 +0200 Subject: [PATCH 05/17] Added 8 new lists Holy cow, Peter Lowe is a syntax-wise gold mine. --- data/FilterList.json | 138 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 6 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 5b4589bc5..029fb9ddc 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -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 }, @@ -13335,7 +13335,7 @@ "viewUrlMirror2": null }, { - "id": 388, + "id": 670, "chatUrl": null, "description": "A version of the Norwegian filter list for Little Snitch.", "descriptionSourceUrl": null, @@ -13356,7 +13356,7 @@ "viewUrlMirror2": null }, { - "id": 389, + "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, @@ -13376,4 +13376,130 @@ "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 + } ] From 3ea2d18f21b8de407686c6b05af95b79e2c392e0 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:17:43 +0200 Subject: [PATCH 06/17] Added Privoxy's syntax --- data/Syntax.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/Syntax.json b/data/Syntax.json index 474a436a1..8142cd1c2 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -83,5 +83,10 @@ "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#ACTIONS", + "name": "Privoxy" } ] From 8fb2cd0a045ef8c8494d3f2a466f2d2d2fc020ea Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:19:54 +0200 Subject: [PATCH 07/17] Assigned some softwares to syntaxes Apparently AdBlock supports more lists than what I had previously believed. --- data/SoftwareSyntax.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 6596d8ff8..10ec322cc 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -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 @@ -190,5 +198,9 @@ { "softwareId": 20, "syntaxId": 18 + }, + { + "softwareId": 21, + "syntaxId": 19 } ] From 7bd8c492d486ed74f68b0384f04d52cf5233bd8c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:39:09 +0200 Subject: [PATCH 08/17] Added 2 old Privoxy lists to start us off with --- data/FilterList.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 029fb9ddc..d86e0816c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13501,5 +13501,47 @@ "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 } ] From 782ec7aa908620047170eeada9fa9bd3b850a936 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:40:05 +0200 Subject: [PATCH 09/17] Fixed missing commas --- data/FilterList.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index d86e0816c..165c1eb68 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13435,7 +13435,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 2, - "viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=1&mimetype=plaintext" + "viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=1&mimetype=plaintext", "viewUrlMirror1": null, "viewUrlMirror2": null }, @@ -13477,7 +13477,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 19, - "viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=junkbuster;showintro=1&mimetype=plaintext" + "viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=junkbuster;showintro=1&mimetype=plaintext", "viewUrlMirror1": null, "viewUrlMirror2": null }, @@ -13498,7 +13498,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 16, - "viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=adblock;showintro=1&mimetype=plaintext" + "viewUrl": "https://pgl.yoyo.org/as/serverlist.php?hostformat=adblock;showintro=1&mimetype=plaintext", "viewUrlMirror1": null, "viewUrlMirror2": null }, @@ -13519,7 +13519,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 19, - "viewUrl": "https://gist.githubusercontent.com/sx2008/2766874/raw/c12a305decef3332663d1e04efa80b881211cfac/user.action" + "viewUrl": "https://gist.githubusercontent.com/sx2008/2766874/raw/c12a305decef3332663d1e04efa80b881211cfac/user.action", "viewUrlMirror1": null, "viewUrlMirror2": null }, @@ -13540,7 +13540,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 19, - "viewUrl": "https://raw.githubusercontent.com/fdb/privoxy-config/master/block-trackers.action" + "viewUrl": "https://raw.githubusercontent.com/fdb/privoxy-config/master/block-trackers.action", "viewUrlMirror1": null, "viewUrlMirror2": null } From 25ef7c34bb905eb2a5ca2adfe26b32bf5dc5cb14 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:40:43 +0200 Subject: [PATCH 10/17] Update Syntax.json --- data/Syntax.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Syntax.json b/data/Syntax.json index 8142cd1c2..2cd5a06a8 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -86,7 +86,7 @@ }, { "id": 19, - "definitionUrl": "https://www.privoxy.org/user-manual/actions-file.html#ACTIONS", - "name": "Privoxy" + "definitionUrl": "https://www.privoxy.org/user-manual/actions-file.html", + "name": "Privoxy action file" } ] From 26cf7864727763af195493236f6c9394064434ac Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:47:08 +0200 Subject: [PATCH 11/17] Added logos for Little Snitch and Privoxy --- .../softwareIcon/imgs/20-Little-Snitch.png | Bin 0 -> 1168 bytes .../components/softwareIcon/imgs/21-Privoxy.png | Bin 0 -> 1286 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/20-Little-Snitch.png create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/21-Privoxy.png diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/20-Little-Snitch.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/20-Little-Snitch.png new file mode 100644 index 0000000000000000000000000000000000000000..1562eec0a0f64334594c15e53fc3e790034aacc0 GIT binary patch literal 1168 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 ws1xF8}}l literal 0 HcmV?d00001 From 0b2669f6a7efc58bcfbfeb7ebd45c546f28cdd76 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:48:46 +0200 Subject: [PATCH 12/17] Update SoftwareIcon.tsx --- .../modules/home/components/softwareIcon/SoftwareIcon.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index 8895e8175..3ab0a4ffd 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -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" } }; From d27bb4572594c5888c647f2e15fbf4fdb4a4cb21 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:50:51 +0200 Subject: [PATCH 13/17] Update index.ts --- .../modules/home/components/softwareIcon/imgs/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts index 4c845ba56..6e0a2d8b3 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts @@ -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 }; From 4658f936e0f70b1ca7726447f9db590b1b17941c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:52:15 +0200 Subject: [PATCH 14/17] Added another missing comma --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 165c1eb68..9d742ccac 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13456,7 +13456,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 9, - "viewUrl": "https://pgl.yoyo.org/adservers/iplist.php?ipformat=plain&showintro=1&mimetype=plaintext" + "viewUrl": "https://pgl.yoyo.org/adservers/iplist.php?ipformat=plain&showintro=1&mimetype=plaintext", "viewUrlMirror1": null, "viewUrlMirror2": null }, From c48e73e2d3957793a8f05dea589bfae8c864bd9a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 00:53:55 +0200 Subject: [PATCH 15/17] Added Privoxy as a software --- data/Software.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/Software.json b/data/Software.json index 4027ea4c4..82abbbf60 100644 --- a/data/Software.json +++ b/data/Software.json @@ -131,5 +131,12 @@ "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" } ] From a82d4aa02516d40dd15baf1da6abb4d231420d13 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 01:31:56 +0200 Subject: [PATCH 16/17] Sneaking my newest list into this pull --- data/FilterList.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 9d742ccac..a51d990fd 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13543,5 +13543,26 @@ "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 } ] From 357a4abe0d5990da3e828ec26a40296463679ef9 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Sep 2018 01:33:37 +0200 Subject: [PATCH 17/17] Update FilterListMaintainer.json --- data/FilterListMaintainer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index d98b6109e..2e1ffd541 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -255,6 +255,14 @@ "filterListId": 603, "maintainerId": 22 }, + { + "filterListId": 670, + "maintainerId": 22 + }, + { + "filterListId": 680, + "maintainerId": 22 + }, { "filterListId": 23, "maintainerId": 23