From f4c423fb419017a327475676dd62b3c76f9f70b4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 13:49:14 +0000 Subject: [PATCH 01/58] Bump Serilog.Sinks.ApplicationInsights from 3.0.3 to 3.0.4 Bumps [Serilog.Sinks.ApplicationInsights](https://github.com/serilog/serilog-sinks-applicationinsights) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/serilog/serilog-sinks-applicationinsights/releases) - [Changelog](https://github.com/serilog/serilog-sinks-applicationinsights/blob/master/CHANGES.md) - [Commits](https://github.com/serilog/serilog-sinks-applicationinsights/commits) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index be11dfbb2..be2d98a26 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -56,7 +56,7 @@ - + From 79777a6b697ecfe24922b020176aa04c4f4e14f2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2019 13:15:22 +0000 Subject: [PATCH 02/58] Bump @types/jest from 24.0.16 to 24.0.17 in /src/FilterLists.Web Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.16 to 24.0.17. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520899 -> 520899 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index c550b33d1cce95e8ea39a83d8746538fad329f52..ef2c9f861756bfb226e73863fef943a5b43b8bf3 100644 GIT binary patch delta 156 zcmX^7RQ~W&`Gzfw7n!FEW-%E}cVK1Yp3cX@$TxkGH C{51{$ delta 156 zcmX^7RQ~W&`Gzfw7n!F&oXKu9-GP;ndpaKrBj5Cep6tq@UPX?Xm0{We0q)*WRpn-- z6-l1vW`@ZgQ3mejfxiA85dj$`!3D`V1{Ot89%jzP Date: Tue, 6 Aug 2019 17:48:57 +0200 Subject: [PATCH 03/58] Update FilterList.json --- data/FilterList.json | 157 ++++++++++--------------------------------- 1 file changed, 36 insertions(+), 121 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index f8c92ddf3..400e9bfbf 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -328,7 +328,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 28, @@ -5096,7 +5096,7 @@ "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HU4EDJZP2S9QA", "homeUrl": "https://firebog.net/", "licenseId": 2, - "name": "EasyList Hosts", + "name": "EasyList (Hosts)", "syntaxId": 2, "updatedDate": "2019-04-15T08:22:11", "viewUrl": "https://v.firebog.net/hosts/Easylist.txt" @@ -5920,7 +5920,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Chinese", + "name": "ABP Anti-Circumvention Filter List - Chinese Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-02-21T09:32:36", @@ -5934,40 +5934,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Czech", + "name": "ABP Anti-Circumvention Filter List - Czech Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-25T21:10:14", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/czech.txt" }, - { - "id": 571, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Danish", - "publishedDate": "2018-08-02T13:05:29", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/danish.txt" - }, - { - "id": 572, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Dutch", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/dutch.txt" - }, { "id": 573, "description": "Filter list designed to fight circumvention ads in Adblock Plus", @@ -5976,7 +5948,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - English", + "name": "ABP Anti-Circumvention Filter List - English Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T17:30:59", @@ -5990,7 +5962,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - French", + "name": "ABP Anti-Circumvention Filter List - French Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-19T07:42:20", @@ -6004,54 +5976,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - German", + "name": "ABP Anti-Circumvention Filter List - German Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T17:24:27", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/german.txt" }, - { - "id": 577, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Hungarian", - "publishedDate": "2018-08-02T13:07:26", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/hungarian.txt" - }, - { - "id": 579, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Italian", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/italian.txt" - }, - { - "id": 582, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Polish", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/polish.txt" - }, { "id": 583, "description": "Filter list designed to fight circumvention ads in Adblock Plus", @@ -6060,7 +5990,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Portuguese", + "name": "ABP Anti-Circumvention Filter List - Portuguese Only", "publishedDate": "2018-08-02T13:07:41", "syntaxId": 3, "updatedDate": "2019-03-25T11:53:01", @@ -6074,7 +6004,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Russian", + "name": "ABP Anti-Circumvention Filter List - Russian Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T13:42:21", @@ -6088,40 +6018,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Spanish", + "name": "ABP Anti-Circumvention Filter List - Spanish Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-27T10:11:17", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/spanish.txt" }, - { - "id": 587, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Swedish", - "publishedDate": "2018-08-02T13:07:55", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/swedish.txt" - }, - { - "id": 588, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Turkish", - "publishedDate": "2018-08-02T13:08:09", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/turkish.txt" - }, { "id": 589, "description": "A occasionally updated collection gambling domains in hosts file format.", @@ -6462,7 +6364,7 @@ "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, + "licenseId": 40, "name": "Peter Lowe's List (Hosts)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 1, @@ -6900,7 +6802,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Little Snitch)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 18, @@ -6912,7 +6814,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Internet Explorer)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 10, @@ -6924,7 +6826,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Domains)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 2, @@ -6936,7 +6838,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (IPs)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 9, @@ -6950,7 +6852,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Privoxy)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 19, @@ -6962,7 +6864,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Domains with wildcards)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 16, @@ -8696,7 +8598,7 @@ "id": 842, "donateUrl": "https://www.patreon.com/blocklist", "homeUrl": " https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (dnsmasq)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 20, @@ -12212,7 +12114,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "LatvianList (Domains)", + "name": "Latvian List (Domains)", "publishedDate": "2017-09-05T08:14:36", "syntaxId": 2, "updatedDate": "2018-05-28T14:02:55", @@ -15890,7 +15792,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Unbound)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 24, @@ -15903,7 +15805,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (BIND)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 26, @@ -15917,7 +15819,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://github.com/AdguardTeam/AdguardFilters", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 12, + "licenseId": 40, "name": "AdGuard Base Filter without EasyList", "policyUrl": "https://kb.adguard.com/en/general/adguard-filter-policy", "syntaxId": 6, @@ -19298,5 +19200,18 @@ "submissionUrl": "https://app.energized.pro", "syntaxId": 9, "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/ips/formats/list.txt" - } + }, + { + "id": 1799, + "description": "Filter list designed to fight circumvention ads in Adblock Plus", + "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", + "emailAddress": "filters+cv@adblockplus.org", + "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", + "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "licenseId": 4, + "name": "ABP Anti-Circumvention Filter List - Arabic Only", + "publishedDate": "2018-05-15T09:50:43", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/arabic.txt" + }, ] From a96a11f1790822f2ddabe7d2f63deed2a9bf1996 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 17:51:43 +0200 Subject: [PATCH 04/58] Update FilterListTag.json --- data/FilterListTag.json | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 550256362..aa6514e47 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -2639,14 +2639,6 @@ "filterListId": 570, "tagId": 5 }, - { - "filterListId": 571, - "tagId": 5 - }, - { - "filterListId": 572, - "tagId": 5 - }, { "filterListId": 573, "tagId": 5 @@ -2659,18 +2651,6 @@ "filterListId": 575, "tagId": 5 }, - { - "filterListId": 577, - "tagId": 5 - }, - { - "filterListId": 579, - "tagId": 5 - }, - { - "filterListId": 582, - "tagId": 5 - }, { "filterListId": 583, "tagId": 5 @@ -2683,14 +2663,6 @@ "filterListId": 586, "tagId": 5 }, - { - "filterListId": 587, - "tagId": 5 - }, - { - "filterListId": 588, - "tagId": 5 - }, { "filterListId": 589, "tagId": 17 @@ -8882,5 +8854,33 @@ { "filterListId": 1797, "tagId": 2 -} +}, + { + "filterListId": 1759, + "tagId": 1 + }, + { + "filterListId": 1759, + "tagId": 2 + }, + { + "filterListId": 1759, + "tagId": 3 + }, + { + "filterListId": 1759, + "tagId": 6 + }, + { + "filterListId": 1759, + "tagId": 7 + }, + { + "filterListId": 1759, + "tagId": 9 + }, + { + "filterListId": 1799, + "tagId": 5 + } ] From 9a347043cfe2a8327fcae51be16e6554baa95269 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 17:54:22 +0200 Subject: [PATCH 05/58] Update License.json --- data/License.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/License.json b/data/License.json index d587af89d..164e91c46 100644 --- a/data/License.json +++ b/data/License.json @@ -215,7 +215,7 @@ }, { "id": 32, - "name": "Permissive but non-commercial", + "name": "Permissive non-commercial", "permissiveAdaptation": true, "permissiveCommercial": false }, @@ -265,5 +265,12 @@ "name": "Generic copyleft", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 40, + "descriptionUrl": "https://pgl.yoyo.org/license/", + "name": "McRae General Public License", + "permissiveAdaptation": true, + "permissiveCommercial": false } ] From 2dea71f8cf1d8df67d0913e0a529a9621e2b79f2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 17:58:56 +0200 Subject: [PATCH 06/58] Update Language.json --- data/Language.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Language.json b/data/Language.json index 4077e48e2..ac1263b30 100644 --- a/data/Language.json +++ b/data/Language.json @@ -216,7 +216,7 @@ "iso6392B": "snd", "iso6392T": "snd", "iso6393": "snd", - "localName": "سنڌي‎", + "localName": "سنڌي", "name": "Sindhi" }, { @@ -1799,4 +1799,4 @@ "localName": "isiZulu", "name": "Zulu" } -] \ No newline at end of file +] From 1e601f51d9d03c7e9d6861667888584dd7c2c42c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 18:00:51 +0200 Subject: [PATCH 07/58] Update FilterListLanguage.json --- data/FilterListLanguage.json | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 93744a761..b49f86966 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -703,14 +703,6 @@ "filterListId": 570, "languageId": 105 }, - { - "filterListId": 571, - "languageId": 106 - }, - { - "filterListId": 572, - "languageId": 108 - }, { "filterListId": 573, "languageId": 110 @@ -723,18 +715,6 @@ "filterListId": 575, "languageId": 167 }, - { - "filterListId": 577, - "languageId": 177 - }, - { - "filterListId": 579, - "languageId": 159 - }, - { - "filterListId": 582, - "languageId": 11 - }, { "filterListId": 583, "languageId": 13 @@ -747,14 +727,6 @@ "filterListId": 586, "languageId": 79 }, - { - "filterListId": 587, - "languageId": 83 - }, - { - "filterListId": 588, - "languageId": 48 - }, { "filterListId": 593, "languageId": 110 @@ -2362,5 +2334,33 @@ { "filterListId": 1739, "languageId": 141 + }, + { + "filterListId": 1108, + "languageId": 179 + }, + { + "filterListId": 1144, + "languageId": 108 + }, + { + "filterListId": 1153, + "languageId": 79 + }, + { + "filterListId": 1154, + "languageId": 139 + }, + { + "filterListId": 1165, + "languageId": 27 + }, + { + "filterListId": 1167, + "languageId": 122 + }, + { + "filterListId": 1799, + "languageId": 122 } ] From cb49ba76c219cf7027d1c364f308d24837d76324 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 18:01:33 +0200 Subject: [PATCH 08/58] Update FilterListMaintainer.json --- data/FilterListMaintainer.json | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 7ada4586a..831fd4910 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -483,14 +483,6 @@ "filterListId": 570, "maintainerId": 15 }, - { - "filterListId": 571, - "maintainerId": 15 - }, - { - "filterListId": 572, - "maintainerId": 15 - }, { "filterListId": 573, "maintainerId": 15 @@ -503,18 +495,6 @@ "filterListId": 575, "maintainerId": 15 }, - { - "filterListId": 577, - "maintainerId": 15 - }, - { - "filterListId": 579, - "maintainerId": 15 - }, - { - "filterListId": 582, - "maintainerId": 15 - }, { "filterListId": 583, "maintainerId": 15 @@ -528,11 +508,7 @@ "maintainerId": 15 }, { - "filterListId": 587, - "maintainerId": 15 - }, - { - "filterListId": 588, + "filterListId": 1799, "maintainerId": 15 }, { From 9b70049cdab162c9047eb8b18ee2a3084c93048d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 18:11:51 +0200 Subject: [PATCH 09/58] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 52e319d2d..2efeb11ac 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,6 +8,11 @@ Check out the FilterLists Hub, a place To submit a new list or update data about an existing list, please submit a pull request to [data](https://github.com/collinbarrett/FilterLists/tree/master/data) in conjunction with the data model described [here](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). Alternatively, you can [open a new issue](https://github.com/collinbarrett/FilterLists/issues/new) providing information for all of the fields described in the [data model](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). +While we are generally very open and welcoming of any new or changed lists, a few condition apply (although loosely): + +* Adding the smaller text files that make up one complete list, e.g. *[EasyList General Block Popup](https://raw.githubusercontent.com/easylist/easylist/master/easylist/easylist_general_block_popup.txt)*, is not usually done. We do however do it for the language files of *[ABP Anti-Circumvention Filter List](https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt)*; but due to its often-changing entries, those files should have ≥5 entries that cover ≥3 sites at the time of addition. +* Since `CHEF-KOCH` has a registered history of behaving aggressively and unfairly towards other filterlist makers and the FilterLists.com community, a case to add any of his lists would have had to be very strong, and mass additions are out of the question. + ## Adding or Updating Rules FilterLists does not maintain any of these lists. It serves only as a discovery tool to direct users to lists that they may want to use. If you want to request addition, modification, or removal of a rule from a list, you will need to contact the maintainers of that list directly. FilterLists provides a variety of ways you can get in contact with the maintainers to do so. @@ -84,4 +89,4 @@ The Agent takes the following command line arguments: ### Debugging 1. Execute `docker container ls -a` to find the `CONTAINER ID` of the container in question. -2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container. \ No newline at end of file +2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container. From 7e6d13dbe552a5f910235e8e191352610e264e01 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 18:16:51 +0200 Subject: [PATCH 10/58] Tiny grammar correction --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2efeb11ac..796f379fa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,7 +8,7 @@ Check out the FilterLists Hub, a place To submit a new list or update data about an existing list, please submit a pull request to [data](https://github.com/collinbarrett/FilterLists/tree/master/data) in conjunction with the data model described [here](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). Alternatively, you can [open a new issue](https://github.com/collinbarrett/FilterLists/issues/new) providing information for all of the fields described in the [data model](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). -While we are generally very open and welcoming of any new or changed lists, a few condition apply (although loosely): +While we are generally very open and welcoming of any new or changed lists, a few conditions apply (although loosely): * Adding the smaller text files that make up one complete list, e.g. *[EasyList General Block Popup](https://raw.githubusercontent.com/easylist/easylist/master/easylist/easylist_general_block_popup.txt)*, is not usually done. We do however do it for the language files of *[ABP Anti-Circumvention Filter List](https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt)*; but due to its often-changing entries, those files should have ≥5 entries that cover ≥3 sites at the time of addition. * Since `CHEF-KOCH` has a registered history of behaving aggressively and unfairly towards other filterlist makers and the FilterLists.com community, a case to add any of his lists would have had to be very strong, and mass additions are out of the question. From b3875a044ed4213925764434993ab9cef563e3e7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 19:05:22 +0200 Subject: [PATCH 11/58] Fixed the Merge stuff --- data/Merge.json | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/data/Merge.json b/data/Merge.json index 5d95260dc..d5d5a0afb 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -315,14 +315,6 @@ "mergeFilterListId": 566, "upstreamFilterListId": 570 }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 571 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 572 - }, { "mergeFilterListId": 566, "upstreamFilterListId": 573 @@ -335,18 +327,6 @@ "mergeFilterListId": 566, "upstreamFilterListId": 575 }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 577 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 579 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 582 - }, { "mergeFilterListId": 566, "upstreamFilterListId": 583 @@ -358,13 +338,5 @@ { "mergeFilterListId": 566, "upstreamFilterListId": 586 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 587 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 588 } -] \ No newline at end of file +] From 34ea0a09bdd35defec2f46d62ad6ab25b6ddefe4 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 6 Aug 2019 19:08:12 +0200 Subject: [PATCH 12/58] Removed an erreneous comma --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 400e9bfbf..d79497754 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -19213,5 +19213,5 @@ "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/arabic.txt" - }, + } ] From be3f053b9ace07eefc37605231746e98796bd7a6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2019 13:14:03 +0000 Subject: [PATCH 13/58] Bump @types/node from 12.6.9 to 12.7.0 in /src/FilterLists.Web Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.6.9 to 12.7.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520899 -> 520899 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index ef2c9f861756bfb226e73863fef943a5b43b8bf3..4d20e2ba25b7a3547be69d1424f2671416f17316 100644 GIT binary patch delta 153 zcmX^7RQ~W&`Gzfw0&LS6PcoZKcVJ~?pYF}Z$UptkJa*NvvclvnL*KAmqu`uGlYj!> zv`Fs^L*GglKNAW-lR$&W%<}0E*%`&#->@+PF%u9o12GE_vjQ>O_BU+o*IxqwWsWpk delta 154 zcmX^7RQ~W&`Gzfw0&L7?dX`fkGFnXcW@F?BaV9JBDuroBI$64vR8~Z|SGt&*6j&5R zl!qt!8M=nMRwfpi`j}d{=eUQbmv|U?S{AwI`nWp Date: Thu, 8 Aug 2019 13:05:27 +0000 Subject: [PATCH 14/58] Bump @types/node from 12.7.0 to 12.7.1 in /src/FilterLists.Web Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.7.0 to 12.7.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520899 -> 520899 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 4d20e2ba25b7a3547be69d1424f2671416f17316..0c50cbdfa2dcd6b204aeba3e9c51974b92a04c20 100644 GIT binary patch delta 148 zcmX^7RQ~W&`GzfwLTuB8*cmOSd$TbLPB&>}Q4UM=w#=&Vtt?0lF3QM^%ufpscS_R_ zG56Q@E>FyK^r-SRDK1NOP6-dlGdIks3Jvzn%ni!(uF8mT@lNwD4>QaT&v(i<3NTD` tPfzrWboWWK)X&K(pZ<`YQM~;P8zT@i0WmWWvj8zG5VLK6!^VF7H2}F*G&leN delta 153 zcmX^7RQ~W&`GzfwLTuBSPcj=#cVJ~?pYF}ZC^-GfJa*- zv`Fs^L*GglKNAW-lR$&W%<}0E*%`&#->@+PF%u9o12GE_vjQ>O_BU+o*IxqwXSy_B diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 1ddf20d1c..6c6b8206c 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@types/jest": "24.0.17", - "@types/node": "12.7.0", + "@types/node": "12.7.1", "@types/react": "16.8.24", "@types/react-dom": "16.8.5", "@types/react-router-dom": "^4.3.4", From 325e82a470be8235ecdddd582f63de3782bcbb72 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2019 13:11:09 +0000 Subject: [PATCH 15/58] Bump @types/react from 16.8.24 to 16.8.25 in /src/FilterLists.Web Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.8.24 to 16.8.25. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520899 -> 520899 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 0c50cbdfa2dcd6b204aeba3e9c51974b92a04c20..4e90135df7d8f84f54929676ea0f17a8f5f27a65 100644 GIT binary patch delta 163 zcmX^7RQ~W&`GzfwoSc&<<{MAG@Plpod@e@T>F%72{F4<|DTh|3I67wg8E5QW;g}Act@J~2O5?pmOF-<6}jr0 zXQz22Cs&l_MEV3fdPap61s57jUdW^}eLfE(+w?bVjJ)lvT#P`>1jNih%mT!$K+LwC Jm5Y7f3jjvNGxq=h delta 166 zcmX^7RQ~W&`GzfwoSf5(+8K?eJFqgcPoK}l$U5DflaYV=MIR>R(69nGkI;MB7N;-^Fkl}lBitIF*6Xe05K~N Mvu$VPV&C@y0Jd*4djJ3c diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 6c6b8206c..ba4cf6432 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -5,7 +5,7 @@ "dependencies": { "@types/jest": "24.0.17", "@types/node": "12.7.1", - "@types/react": "16.8.24", + "@types/react": "16.8.25", "@types/react-dom": "16.8.5", "@types/react-router-dom": "^4.3.4", "@types/react-table": "^6.8.5", From 0bda59728ac7d81965fdd254a8a36ca61c94a358 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2019 13:30:40 +0000 Subject: [PATCH 16/58] Bump react from 16.8.6 to 16.9.0 in /src/FilterLists.Web Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.8.6 to 16.9.0. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.9.0/packages/react) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520899 -> 520867 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 4e90135df7d8f84f54929676ea0f17a8f5f27a65..0735315f1d8457b91542adf60689ebd8e20d8761 100644 GIT binary patch delta 157 zcmV;O0Al~cIg=41BvmUn zOi^w|LU(IvcPm0~VtP+THcl@uLS%1FcQ9{tcWqNjR7Gt$V`pqnPi=E&FH}uwMo3yr zWioR`Z%#E$H%wD21_p|WIR{0#hI=#S delta 140 zcmV;70CWGNS4O>1aO zVMuK;FoQCW3vPHA{SL3V0xLo0J`N<(KbSW#GR uIaWz?baYm8Vp>oyNH1k~dS`QFHD-8ASd*c`BbHAFmWN(B2De^02SvFdoiLjK diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index ba4cf6432..7989bc145 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -12,7 +12,7 @@ "bootstrap": "^4.3.1", "es6-promise": "^4.2.8", "moment": "^2.24.0", - "react": "^16.8.6", + "react": "^16.9.0", "react-bootstrap": "^1.0.0-beta.10", "react-dom": "^16.8.6", "react-router-dom": "^5.0.1", From a2388719760f59392eff85fcfb97535c495a1da9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2019 13:31:18 +0000 Subject: [PATCH 17/58] Bump @types/react from 16.8.25 to 16.9.0 in /src/FilterLists.Web Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.8.25 to 16.9.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520867 -> 520865 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 0735315f1d8457b91542adf60689ebd8e20d8761..18026cdbd1263a1a5a28d8c3f875f1f251f2f050 100644 GIT binary patch delta 161 zcmZ4dRDR)8`GzfwY@E~CEZ9t@JFqgcPoK}l$U5ELg3T~A)jzq!FrzZc(=swDO+U5J zFDJ6pJgdUdvam9w+|boMqNvo-E5jqh$;GK4*}x#&z}c{@JSQ(hJ0sga%{g0D&^41 z6i3HwpFF=1XOsNM;0iC}s&a3AlfdM#T-VfOM`tgSsFaEb&yb{wD*cp<#0;lk7w>FPI01!Gm7XSbN diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 7989bc145..f85c0061a 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -5,7 +5,7 @@ "dependencies": { "@types/jest": "24.0.17", "@types/node": "12.7.1", - "@types/react": "16.8.25", + "@types/react": "16.9.0", "@types/react-dom": "16.8.5", "@types/react-router-dom": "^4.3.4", "@types/react-table": "^6.8.5", From b69064aa82f692041e6f23bd4aa8f669ff7371ba Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2019 13:37:05 +0000 Subject: [PATCH 18/58] Bump react-dom from 16.8.6 to 16.9.0 in /src/FilterLists.Web Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.6 to 16.9.0. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.9.0/packages/react-dom) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520865 -> 520865 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 18026cdbd1263a1a5a28d8c3f875f1f251f2f050..64828c573e1bb0aa30255695bf6138b75e247090 100644 GIT binary patch delta 284 zcmV+%0ptFm;G%HDZSwea@HA7KHY(s2OQ87YzaWHOZ zNJchKbW>t!bSptgVQ6(~N@rp(Lr_v_Vn%CCPD+!Ju_KrMP6l@YHIukfH%oPKH%v)N zSukREK~P6Ccx*#zFi1^BLQ!imY<+PElf5VJl~2 iH)DEGYgTVDF?4Q2m+|@nC6-SHIEP=o2De|m2SPOom|sKy delta 277 zcmZ4ZRDR)8`Gyw87N!>F7M2#)Eo>rw(~k$RSxxuzV-ub(6v(C;YMAF^9^hGM=@a5( zoK}(%P*|Q_R%BEaXZj$0|Vi*=yo~d7+mhYUG znxB(eSmYOBp6TeKT@aC)^VH24CHH=wg z`woA$=A7vZjhIZP=kH;Yoc_^>Nj20nJkLMLqr}9}xHQ=@(!1Ej(#tR~I3v_MJIUK8 zFwi5VBB-+5+_<>h#LdshEHk{w*d Date: Sun, 11 Aug 2019 15:05:17 +0200 Subject: [PATCH 19/58] Added 16 lists --- data/FilterList.json | 137 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index d79497754..4683671b6 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -19213,5 +19213,142 @@ "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/arabic.txt" + }, +{ +"id": 1800, +"name": "Rixcloud Rules", +"syntaxId": 29, +"viewUrl": "https://cdn.rixcloud.io/Quantumult/Rules/Default.conf" +}, +{ +"id": 1801, +"name": "Lhie1's Auto Rules", +"homeUrl": "https://github.com/lhie1/Rules/", +"issuesUrl": "https://github.com/lhie1/Rules/issues", +"syntaxId": 29, +"licenseId": 19, +"viewUrl": "https://raw.githubusercontent.com/lhie1/Rules/master/Auto/REJECT.conf" +}, +{ +"id": 1802, +"name": "SSEncrypt Adblock", +"homeUrl": "https://github.com/HParis/SSEncrypt/", +"issuesUrl": "https://github.com/HParis/SSEncrypt/issues", +"syntaxId": 29, +"viewUrl": "https://raw.githubusercontent.com/HParis/SSEncrypt/master/adblock-reject.list" +}, +{ +"id": 1803, +"name": "Scomper Surge List Reject", +"homeUrl": "https://github.com/scomper/surge-list/", +"issuesUrl": "https://github.com/scomper/surge-list/issues", +"syntaxId": 29, +"viewUrl": "https://raw.githubusercontent.com/scomper/surge-list/master/reject.list" +}, +{ +"id": 1804, +"name": "ConnersHua Advertising Ruleset", +"homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", +"issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", +"syntaxId": 29, +"viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list" +}, +{ +"id": 1805, +"name": "ConnersHua Pro Ruleset", +"homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", +"issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", +"syntaxId": 29, +"viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" +}, +{ +"id": 1806, +"name": "BlocklistDE All", +"description": "The mission is to report any and all attacks to the respective abuse departments of the infected PCs/servers, to ensure that the responsible provider can inform their customer about the infection and disable the attacker. ", +"homeUrl": "https://www.blocklist.de/en/index.html", +"syntaxId": 9, +"viewUrl": "https://lists.blocklist.de/lists/all.txt", +"donateUrl": "https://flattr.com/@blocklist.de" +}, +{ +"id": 1807, +"name": "DangerRulezSK Brute Force Blocker", +"description": "Its main purpose is to block SSH bruteforce attacks via firewall.", +"homeUrl": "http://danger.rulez.sk/index.php/bruteforceblocker/", +"syntaxId": 9, +"viewUrl": "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" +}, +{ +"id": 1808, +"name": "EmergingThreats Compromised IPs", +"homeUrl": "https://rules.emergingthreats.net/", +"syntaxId": 9, +"viewUrl": "https://rules.emergingthreats.net/blockrules/compromised-ips.txt" +}, +{ +"id": 1809, +"name": "EmergingThreats Block IPs", +"homeUrl": "https://rules.emergingthreats.net/", +"syntaxId": 9, +"viewUrl": "https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt" +}, +{ +"id": 1810, +"name": "Greensnow Blocklist", +"description": "GreenSnow is a team consisting of the best specialists in computer security, we harvest a large number of IPs from different computers located around the world.", +"homeUrl": "https://greensnow.co/", +"syntaxId": 9, +"viewUrl": "https://blocklist.greensnow.co/greensnow.txt" +}, +{ +"id": 1811, +"name": "Binary Defense Systems Artillery Threat Intelligence Feed and Banlist Feed", +"homeUrl": "https://www.binarydefense.com/", +"syntaxId": 9, +"licenseId": 32, +"viewUrl": "https://www.binarydefense.com/banlist.txt" +}, +{ +"id": 1812, +"name": "NoThink SSH Blacklist", +"homeUrl": "https://www.nothink.org/", +"syntaxId": 9, +"viewUrl": "https://www.nothink.org/blacklist/blacklist_ssh_all.txt" +}, +{ +"id": 1813, +"name": "CINS Army Bad Guys", +"description": "CINS Army is a way for our company to give back to the community by sharing valuable threat intelligence harvested from our CINS system. The CINS Army list is a subset of the CINS Active Threat Intelligence ruleset, and consists of IP addresses that meet one of two basic criteria: 1) The IP's recent Rogue Packet score factor is very poor, or 2) The IP has tripped a designated number of 'trusted' alerts across a given number of our Sentinels deployed around the world.", +"homeUrl": "https://cinsscore.com/", +"syntaxId": 9, +"viewUrl": "https://cinsscore.com/list/ci-badguys.txt" +}, + { + "id": 1814, + "description": "This list target huge international websites that clutter search engine results with misinformation, unfounded articles, and/or contempt for humanity. While designed for use with «Google Hit Hider by Domain» to remove search results, it can also be used with other domains-list tools if you want more thorough blocking of them.", + "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": 35, + "name": "Remover for Mainstream Tabloid and Alt-Right Sites", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/TabloidRemover.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/TabloidRemover.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/TabloidRemover.txt" + }, + { + "id": 1815, + "description": "Have you ever been searching for rare PC parts, but a lot the sites you visit refuse to tell you the murderous prices they charge unless you sign up as a member with them? Now you won't feel infuriated by it anymore! While this list is designed for «Google Hit Hider by Domain» to remove search results, it can also be used with other domains-list tools if you want more thorough blocking of them.", + "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": 35, + "name": "Anti-'PC component price hiders' List", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPCPriceHiderList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPCPriceHiderList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPCPriceHiderList.txt" } ] From edc73cacdf6e9b58be4749dc4465b576b45c8028 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:25:18 +0200 Subject: [PATCH 20/58] Update Software.json --- data/Software.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/data/Software.json b/data/Software.json index 86ec88027..683d4f4d5 100644 --- a/data/Software.json +++ b/data/Software.json @@ -217,5 +217,26 @@ "id": 34, "isAbpSubscribable": false, "name": "Windows command line" + }, + { + "id": 35, + "downloadUrl": "https://shadowsocks.org/en/download/clients.html", + "homeUrl": "https://shadowsocks.org/en/index.html", + "isAbpSubscribable": false, + "name": "Shadowsocks" + }, + { + "id": 36, + "downloadUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp/releases", + "homeUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp", + "isAbpSubscribable": false, + "name": "ShadowsocksR" + }, + { + "id": 37, + "downloadUrl": "https://apps.apple.com/app/shadowrocket/id932747118", + "homeUrl": "https://liguangming.com/Shadowrocket", + "isAbpSubscribable": false, + "name": "Shadowrocket" } -] \ No newline at end of file +] From 4fc16b348738199bf1d357ba4b0d415057448200 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:26:16 +0200 Subject: [PATCH 21/58] Update SoftwareSyntax.json --- data/SoftwareSyntax.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index d88a25d18..8bba92cde 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -370,5 +370,17 @@ { "softwareId": 32, "syntaxId": 28 + }, + { + "softwareId": 35, + "syntaxId": 29 + }, + { + "softwareId": 36, + "syntaxId": 29 + }, + { + "softwareId": 37, + "syntaxId": 29 } -] \ No newline at end of file +] From bec46a136d7bb62d7030c689da5a849eec7237d0 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:29:19 +0200 Subject: [PATCH 22/58] Update FilterListTag.json --- data/FilterListTag.json | 88 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index aa6514e47..2a946a98b 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -8882,5 +8882,93 @@ { "filterListId": 1799, "tagId": 5 + }, + { + "filterListId": 1800, + "tagId": 2 + }, + { + "filterListId": 1800, + "tagId": 3 + }, + { + "filterListId": 1800, + "tagId": 12 + }, + { + "filterListId": 1801, + "tagId": 2 + }, + { + "filterListId": 1801, + "tagId": 3 + }, + { + "filterListId": 1802, + "tagId": 2 + }, + { + "filterListId": 1803, + "tagId": 2 + }, + { + "filterListId": 1803, + "tagId": 3 + }, + { + "filterListId": 1804, + "tagId": 2 + }, + { + "filterListId": 1805, + "tagId": 2 + }, + { + "filterListId": 1805, + "tagId": 12 + }, + { + "filterListId": 1806, + "tagId": 6 + }, + { + "filterListId": 1807, + "tagId": 6 + }, + { + "filterListId": 1808, + "tagId": 6 + }, + { + "filterListId": 1809, + "tagId": 6 + }, + { + "filterListId": 1810, + "tagId": 6 + }, + { + "filterListId": 1811, + "tagId": 6 + }, + { + "filterListId": 1812, + "tagId": 6 + }, + { + "filterListId": 1813, + "tagId": 6 + }, + { + "filterListId": 1814, + "tagId": 21 + }, + { + "filterListId": 1814, + "tagId": 25 + }, + { + "filterListId": 1815, + "tagId": 15 } ] From 7c595c3ba76f5c615e34868f6abb875887f22328 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:33:34 +0200 Subject: [PATCH 23/58] Update FilterListMaintainer.json --- data/FilterListMaintainer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 831fd4910..e22a7231e 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -851,6 +851,14 @@ "filterListId": 1738, "maintainerId": 22 }, + { + "filterListId": 1814, + "maintainerId": 22 + }, + { + "filterListId": 1815, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 From d67d97d1b90f106ccc3a3878e4946438a8a9c41d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:34:13 +0200 Subject: [PATCH 24/58] Add files via upload --- .../softwareIcon/imgs/35-Shadowsocks.png | Bin 0 -> 583 bytes .../softwareIcon/imgs/36-ShadowsocksR.png | Bin 0 -> 693 bytes .../softwareIcon/imgs/37-Shadowrocket.png | Bin 0 -> 633 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/35-Shadowsocks.png create mode 100644 src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/36-ShadowsocksR.png create mode 100644 src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/37-Shadowrocket.png diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/35-Shadowsocks.png b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/35-Shadowsocks.png new file mode 100644 index 0000000000000000000000000000000000000000..62cc490d44fbbd4c07635680fe1206addc5d3c80 GIT binary patch literal 583 zcmV-N0=WH&P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0o+MMK~y+Tt&=}U z96=PuHw04zErS1U=Jcu{K~zK$AzGwR(pcDtMbe0c5VRD;ow)%UD-o=;3M3*%QG!GS zg?+nsrV&XRZBnHYs}L(SiJsr;)7y1VJ-vMJVE3E%e(%l9uJu19N2!q?3sYP>tx~&d zLOI0N!xYnQi_o+RSjG>b-7#LepM>$6grXHdPA_2$?BtaEBn>r6MW3an5a>LV`?uUs zF{j?HxJflg?JWUz1;RAHg>nzGK-%K;n^k3~4uy+B5W~L1TMl`OCb%rBm`T;*us>lN zC&40)4^lhtuKNIXb9q+6&;hWF~&daR1M5oEdC26 zasad^bgB)oYFx;EBuCLMqX0`%AG#k$lCqIbjCw+t?WX{L%dze^oMzmGD$Uo5nC%Rp z)4G5Cf#j*?ne8GglX-+2T?qK05J~S1qoR@{8>PZ_`eoAVWy_MvF}XmOAxt{KsduY% zc(VjYGLPvGa={QkIrV<3H9Jr6r*z;*CUIsz0>F=)lAo%STaVA=Jtpk3dKMnD?SJ&o zMUsYuc3!iUpM*{A{v_D;7q$vh+@@E6{i-&blC8po?RLf#z2(=!l^9PyPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!m3lK~y+Tt&>Y= z)KCu3XXDtJ zQM5%-@kPblWTtMUC_>%3kWvIe>Z-nvC+TUE7@Zj(KO8vsJic=uiS|Fm`;<=ZzbR?i zo4MsYWWrVy`a2~or-NDQKEl8=W;y+o`ZF=<8ce9W2>Ct-BVZ?$)F&>L&V{XxHg35$5jGFP-Aps#%mhI7jLLtnCaKn8<471puooD+6^RLTmfGS< z$Z{)Q_6RBI7(4X4LI*zg&L9Ob6F1$X!{lE)KZ?@GdW zmt9_i!4f9FMheLgG{vm)R)jU(sD6mRPpUapWUy9)8zsP$7 z2MIT;)$(a$!n6cTl>z@VK1`p$^c}7YqeJe_b$M;!g8^vX)x1l@;Vh1Zw*ta(#bx bt!Y01v5}{Q%d9Fr00000NkvXXu0mjfw`MoO literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/37-Shadowrocket.png b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/37-Shadowrocket.png new file mode 100644 index 0000000000000000000000000000000000000000..816f0fd51777a4ce6ea2b73b4b32c2de84d82299 GIT binary patch literal 633 zcmV-<0*3vGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0uD(;K~y+Tg^$Z? z6Hye#$Jb85jVu2G-HC486!wOljgpzRlxY=AEK;XY zQ%wT_ZEI1}Mg_6f$ENgVGMSrsWdf5P=W!*iH1P)m=X~e;xZhA4aX4MN*gS?J2f3S&7D(eIOp2F_Od@b-VV^+=H zUU`>ewvwCs?+UZBY!$CVsZ@ntq=>q?{5{DORMn9(muV@A#x*si;7-dxz73!&-hS~^`lc(dsGZ)r(ly5$uP5UDZkPozVmIUTrp z9ZtmYej?YWYfwCxo-e~xRtL|Zw2#P*dBBL-`;7RJtp6uUqa*kH%LmB128#LvDT>9D T7~`tB00000NkvXXu0mjfG(sO` literal 0 HcmV?d00001 From 3b21bcc5eb65556e529db9c1a9cc85aefef8515a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:35:30 +0200 Subject: [PATCH 25/58] Update index.ts --- .../src/modules/home/components/softwareIcon/imgs/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts index d3055c53e..ff77ce9ff 100644 --- a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts @@ -31,6 +31,9 @@ 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"; +import img35 from "./35-Shadowsocks.png"; +import img36 from "./36-ShadowsocksR.png"; +import img37 from "./37-Shadowrocket.png"; -export { img1, img2, img3, img4, img5, img6, img7, img8, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img30, img31, img32, img33, img34 }; +export { img1, img2, img3, img4, img5, img6, img7, img8, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img30, img31, img32, img33, img34, img35, img36, img37 }; From 80dbbc5f37cd3d56d08d28a6435b49c64d7f2d33 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:36:47 +0200 Subject: [PATCH 26/58] Update SoftwareIcon.tsx --- .../modules/home/components/softwareIcon/SoftwareIcon.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx index 8b7b94ec0..9a043bcff 100644 --- a/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { img1, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img2, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img3, img30, img31, img32, img33, img34, img4, img5, img6, img7, img8 } from "./imgs"; +import { img1, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img2, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img3, img30, img31, img32, img33, img34, img35, img36, img37, img4, img5, img6, img7, img8 } from "./imgs"; interface Props { id: number; @@ -52,4 +52,7 @@ const icons: { [id: number]: IIcon; } = { 32: { image: img32, imageTitle: "AdNauseam" }, 33: { image: img33, imageTitle: "Legacy Unix derivatives" }, 34: { image: img34, imageTitle: "Windows command line" }, + 35: { image: img35, imageTitle: "Shadowsocks" }, + 36: { image: img36, imageTitle: "ShadowsocksR" }, + 37: { image: img37, imageTitle: "Shadowrocket" }, }; From 35ff07aa1ea556331d0249fb2db2b05bdcf64010 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 11 Aug 2019 15:38:16 +0200 Subject: [PATCH 27/58] Update Syntax.json --- data/Syntax.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/Syntax.json b/data/Syntax.json index 7402a1b50..aa941244b 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -119,5 +119,9 @@ { "id": 28, "name": "Adblocker-syntax domains" + }, + { + "id": 29, + "name": "Socks5" } ] From 1cd6a2e910c4b46f26b6cb1bb4c31646ff8a669e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 14:06:39 +0000 Subject: [PATCH 28/58] Bump @types/react from 16.9.0 to 16.9.1 in /src/FilterLists.Web Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.9.0 to 16.9.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520865 -> 520865 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 64828c573e1bb0aa30255695bf6138b75e247090..9094492220cdd8f6c25dc2e18969ae920efa1d4f 100644 GIT binary patch delta 150 zcmZ4ZRDR)8`Gzfw9GugI*cdIRKj33zo$kiT$T!*OrgCVOyRT7&g`0V>FPI0EzK4?*IS* delta 156 zcmZ4ZRDR)8`Gzfw9GuhHEZB^uJFqgcPk+G2$U5DPlaX(_w*{MWXsUm5iD5=%l&586 zRGNNjp Date: Mon, 12 Aug 2019 14:08:19 +0000 Subject: [PATCH 29/58] Bump react-scripts from 3.0.1 to 3.1.0 in /src/FilterLists.Web Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@3.1.0/packages/react-scripts) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 520865 -> 527502 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 9094492220cdd8f6c25dc2e18969ae920efa1d4f..e55ba94269d83fc66a946106d4ee08f580a3d4dd 100644 GIT binary patch delta 20869 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 AY5)KL delta 18531 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 r{(cWMiB3yz+_`wP7< Date: Mon, 12 Aug 2019 14:08:11 +0000 Subject: [PATCH 30/58] Bump Microsoft.AspNetCore.Mvc.Versioning from 3.1.4 to 3.1.5 Bumps [Microsoft.AspNetCore.Mvc.Versioning](https://github.com/Microsoft/aspnet-api-versioning) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/Microsoft/aspnet-api-versioning/releases) - [Commits](https://github.com/Microsoft/aspnet-api-versioning/commits) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Api/FilterLists.Api.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index 3187b604b..bd3a9c21c 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -43,7 +43,7 @@ - + From 725e145e98e2826b96cc974b740e89560a78d91c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 14:13:48 +0000 Subject: [PATCH 31/58] Bump react-bootstrap in /src/FilterLists.Web Bumps [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) from 1.0.0-beta.10 to 1.0.0-beta.11. - [Release notes](https://github.com/react-bootstrap/react-bootstrap/releases) - [Changelog](https://github.com/react-bootstrap/react-bootstrap/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-bootstrap/react-bootstrap/compare/v1.0.0-beta.10...v1.0.0-beta.11) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527502 -> 527505 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index e55ba94269d83fc66a946106d4ee08f580a3d4dd..965b776d0d146beee550ccd3bf9cf32cf7a0ccd0 100644 GIT binary patch delta 418 zcmW;GJ#(610KoCn#D}p>o24Cc>DkS@0LqJuD2Vc6B!C*bR1Ba30U{CGEterfdcF1- zp5}6weuDPAX7F3|uA?sLl&w?0K)DXT`TzfTv;X;Ke|f*o;pwk$mGp7_68^X=yzcTN z$@CRo5o2hbG6*$GWpC_W_z{V6uuv46J_{`00;2?u23|% z>KS`@x9!xD#+_+v^VemJ`nyOONrSLWb;+XT#1y73K`#ah0wcz3bcM zp%R^GLNcCFd>7^9VIY~Z1~1k~6_%cDJ%KMM@Cr%_cn*>4?H%~=2JBwldSG?yA%DOA E1G)Q_5&!@I delta 419 zcmbO@Q=xCB!iLQ^r?+-68BKn6Q+oQx0CxGw3DPWK29Ew_1?HLlh2g0_rIy;-fmMb9 z2B~R5xsK*}E+NLHz7-}(iFvM}Sq9!wK7RgA+1{2GRVgXO-X%d<IE>2`i>Y}03$uxU)+T)?gznh{(US`?O)t8G;3T2Son6PD!Y?UkzU;qMe;kzcCq z7-8X`Zye^46A_%`u5X#*k)K!Y7ocArQEKRyTg$r{ zSuy?KI%bRM1*U9uj0W33n6ep|PIqu&gxVdE&89a!MT|{3)H9+epvclVtjal{w4glK z$lol_%-Ja0%QHXCOFyW<)TbmfBO})`G|kl_C%ZH(!YD6YKR7frM?XJ2D=DWk$=lMc z(8x32+{Zo9EH^Q%Fu=*&%xLn&jVjX@yki%ct}DdMKV8O*O>z32csAko${e=sl{xGZ F3jh*@l5YS2 diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 583614f88..1b2a9051e 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -13,7 +13,7 @@ "es6-promise": "^4.2.8", "moment": "^2.24.0", "react": "^16.9.0", - "react-bootstrap": "^1.0.0-beta.10", + "react-bootstrap": "^1.0.0-beta.11", "react-dom": "^16.9.0", "react-router-dom": "^5.0.1", "react-scripts": "3.1.0", From 27d67c37b7f0bf10ac0ecedf896fcf5c6c4310a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2019 13:16:49 +0000 Subject: [PATCH 32/58] Bump react-scripts from 3.1.0 to 3.1.1 in /src/FilterLists.Web Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@3.1.1/packages/react-scripts) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527505 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 965b776d0d146beee550ccd3bf9cf32cf7a0ccd0..6c866609ab51a4d9f122d0ac0a8b8a9173954ce2 100644 GIT binary patch delta 2749 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 Date: Wed, 14 Aug 2019 13:23:13 +0000 Subject: [PATCH 33/58] Bump LibGit2Sharp from 0.26.0 to 0.26.1 Bumps [LibGit2Sharp](https://github.com/libgit2/libgit2sharp) from 0.26.0 to 0.26.1. - [Release notes](https://github.com/libgit2/libgit2sharp/releases) - [Changelog](https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md) - [Commits](https://github.com/libgit2/libgit2sharp/compare/v0.26...v0.26.1) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index be2d98a26..0b43bf83f 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -36,7 +36,7 @@ - + From 2f8c40b9d71bf4a072473d70e8aca532610f32b1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2019 13:22:49 +0000 Subject: [PATCH 34/58] Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets Bumps Microsoft.VisualStudio.Azure.Containers.Tools.Targets from 1.7.12 to 1.9.2. Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- src/FilterLists.Api/FilterLists.Api.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index 0b43bf83f..b5c344a22 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -51,7 +51,7 @@ - + diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index bd3a9c21c..e8b0413f2 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -46,7 +46,7 @@ - + \ No newline at end of file From 9b929169d1fe9cca06df084d3ecadff9dc9fa14a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2019 13:12:17 +0000 Subject: [PATCH 35/58] Bump @types/node from 12.7.1 to 12.7.2 in /src/FilterLists.Web Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.7.1 to 12.7.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 6c866609ab51a4d9f122d0ac0a8b8a9173954ce2..44818f1d5a6ba94a0a2a6414d152b79e3953e38e 100644 GIT binary patch delta 153 zcmbO-Q(?+Xg@!4NQ>M2ZVK$n6fsc`G>KR6%=~s?0D~G03M*3@~nPp}~xt90^xFm=B z1sSGg=ZCnY8CN-a8|OGWI=NJ(8s}D-1^8EbrWPf8805HyCYFb~MdY|!R3rvQ<>nez xx;pv$>6?TUN0#a5B)UXS=Km$pp2x@t#7scU48$xz%nHP8K+L{9kC8)-8vtDBGEx8l delta 149 zcmbO-Q(?+Xg@!4NQ>IU0WVD=mmQirJ%26ie&_r*`tP0=Cg4E!mjLgXVwD54JH2n~B ze{Jvb#7swzDqoZ0vQ+1k@PIsX!Ur+lLT!$kM= sM9)ZfpEOJToUG}A%#0H4d5nxe%ml>DK+FQftU$~L#O&Mi7&+9q0U@3*l>h($ diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 8e69047ad..9d7523e5c 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@types/jest": "24.0.17", - "@types/node": "12.7.1", + "@types/node": "12.7.2", "@types/react": "16.9.1", "@types/react-dom": "16.8.5", "@types/react-router-dom": "^4.3.4", From cde254913d7bf8d684dd8b3e9a6ec6398a78868b Mon Sep 17 00:00:00 2001 From: hawkeye116477 Date: Thu, 15 Aug 2019 17:29:30 +0200 Subject: [PATCH 36/58] Add new Polish lists --- data/Dependent.json | 12 ++++--- data/FilterList.json | 60 ++++++++++++++++++++++++---------- data/FilterListMaintainer.json | 12 +++++++ data/SoftwareSyntax.json | 4 +++ data/Syntax.json | 5 +++ 5 files changed, 71 insertions(+), 22 deletions(-) diff --git a/data/Dependent.json b/data/Dependent.json index a9ddcc698..ce3203bbf 100644 --- a/data/Dependent.json +++ b/data/Dependent.json @@ -1,8 +1,4 @@ [ - { - "dependentFilterListId": 344, - "dependencyFilterListId": 30 - }, { "dependentFilterListId": 344, "dependencyFilterListId": 301 @@ -22,5 +18,13 @@ { "dependentFilterListId": 853, "dependencyFilterListId": 97 + }, + { + "dependentFilterListId": 1816, + "dependencyFilterListId": 60 + }, + { + "dependentFilterListId": 1817, + "dependencyFilterListId": 347 } ] \ No newline at end of file diff --git a/data/FilterList.json b/data/FilterList.json index 4683671b6..7b675c7cd 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -662,7 +662,7 @@ "homeUrl": "https://kadantiscam.netlify.com/", "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", "licenseId": 8, - "name": "KAD Hosts File", + "name": "KADhosts", "publishedDate": "2016-11-20T11:41:02", "submissionUrl": "https://kadantiscam.netlify.com/#contact", "syntaxId": 1, @@ -4035,18 +4035,17 @@ }, { "id": 349, - "chatUrl": "https://discord.me/polskiefiltry", - "description": "Supplement list for Polish Annoyance Filters, only for uBlock & AdGuard.", - "descriptionSourceUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters", - "homeUrl": "https://polishannoyancefilters.netlify.com", - "issuesUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters/issues", - "licenseId": 9, - "name": "Polish Annoyance Filters - Supplement for uBlock & AdGuard", - "publishedDate": "2017-10-23T00:00:00", - "submissionUrl": "https://polishannoyancefilters.netlify.com/issues", - "syntaxId": 4, - "updatedDate": "2019-04-12T18:00:23", - "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PPB_uBlock_AdGuard.txt" + "description": "Polish hosts file for blocking scams (without controversial pages => https://github.com/PolishFiltersTeam/KAD/issues/649).", + "emailAddress": "polishjarvis@gmail.com", + "homeUrl": "https://kadantiscam.netlify.com/", + "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", + "licenseId": 8, + "name": "KADHosts (without controversies)", + "submissionUrl": "https://kadantiscam.netlify.com/#contact", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt", + "viewUrlMirror1": "https://gitcdn.xyz/repo/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt", + "viewUrlMirror2": "https://rawcdn.githack.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt" }, { "id": 350, @@ -5644,15 +5643,15 @@ }, { "id": 508, - "description": "Whitelist of section with promotion of fake science/news. More at: https://github.com/azet12/KAD/issues/649.", + "description": "Whitelist of section with promotion of fake science/news. More at: https://github.com/PolishFiltersTeam/KAD/issues/649.", "descriptionSourceUrl": "https://github.com/PolishFiltersTeam/KAD", - "emailAddress": "kadrep@outlook.com", + "emailAddress": "polishjarvis@gmail.com", "homeUrl": "https://kadantiscam.netlify.com/", "issuesUrl": "https://github.com/PolishFiltersTeam/KAD/issues", "licenseId": 8, "name": "KAD - The Whitelist of the Controversial Pages", "syntaxId": 28, - "viewUrl": "https://raw.githubusercontent.com/azet12/KAD/gh-pages/assets/other/kadfakewhitelist.txt", + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KAD/gh-pages/assets/other/kadfakewhitelist.txt", "viewUrlMirror1": "https://raw.githubusercontent.com/PolishFiltersTeam/KAD/gh-pages/assets/other/kadfakewhitelist.txt" }, { @@ -6347,12 +6346,12 @@ { "id": 616, "chatUrl": "https://discord.me/polskiefiltry", - "description": "Filters that hide and block various other widgets.", + "description": "Filters that hide and block various other elements.", "descriptionSourceUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PAF_other_widgets.txt", "homeUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters", "issuesUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters/issues", "licenseId": 9, - "name": "Polish Annoyance Filters - Other Widgets", + "name": "Polish Annoyance Filters - Other Elements", "publishedDate": "2018-06-30T16:19:08", "syntaxId": 3, "updatedDate": "2019-04-13T22:00:20", @@ -19350,5 +19349,30 @@ "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPCPriceHiderList.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPCPriceHiderList.txt", "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPCPriceHiderList.txt" + }, + { + "id": 1816, + "description": "Additional regex list blocking scam and phising Polish sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "emailAddress": "polishjarvis@gmail.com", + "homeUrl": "https://kadantiscam.netlify.com/", + "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", + "licenseId": 8, + "name": "KADhole", + "submissionUrl": "https://kadantiscam.netlify.com/#contact", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhole.txt" + }, + { + "id": 1817, + "chatUrl": "https://discord.me/polskiefiltry", + "description": "Polish regex list for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "donateUrl": "https://patronite.pl/polskiefiltry", + "emailAddress": "errors@certyficate.it", + "homeUrl": "https://www.certyficate.it/", + "issuesUrl": "https://github.com/MajkiIT/polish-ads-filter/issues", + "licenseId": 9, + "name": "Polish Regex Filters for Pi-hole", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt" } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index e22a7231e..57c0b6091 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -4770,5 +4770,17 @@ { "filterListid": 1798, "maintainerid": 84 +}, +{ + "filterListid": 508, + "maintainerid": 34 +}, +{ + "filterListid": 1816, + "maintainerid": 34 +}, +{ + "filterListid": 1816, + "maintainerid": 32 } ] diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 8bba92cde..b2752b892 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -382,5 +382,9 @@ { "softwareId": 37, "syntaxId": 29 + }, + { + "softwareId": 14, + "syntaxId": 30 } ] diff --git a/data/Syntax.json b/data/Syntax.json index aa941244b..2403ddf5d 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -123,5 +123,10 @@ { "id": 29, "name": "Socks5" + }, + { + "id": 30, + "definitionUrl": "https://docs.pi-hole.net/ftldns/regex/tutorial/", + "name": "Pi-hole regular expressions" } ] From 6c35bf5c8639b6478a725bedfc92d4c7f3a43a6a Mon Sep 17 00:00:00 2001 From: hawkeye116477 Date: Fri, 16 Aug 2019 11:25:08 +0200 Subject: [PATCH 37/58] New list and small fixes --- data/FilterList.json | 11 ++++++++++- data/FilterListLanguage.json | 8 ++++++++ data/FilterListMaintainer.json | 6 +++++- data/FilterListTag.json | 24 ++++++++++++++++++++++-- data/Maintainer.json | 5 +++++ 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 7b675c7cd..9e04460d6 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -19365,7 +19365,7 @@ { "id": 1817, "chatUrl": "https://discord.me/polskiefiltry", - "description": "Polish regex list for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "description": "Polish regex list blocking ads and tracking sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", "donateUrl": "https://patronite.pl/polskiefiltry", "emailAddress": "errors@certyficate.it", "homeUrl": "https://www.certyficate.it/", @@ -19374,5 +19374,14 @@ "name": "Polish Regex Filters for Pi-hole", "syntaxId": 30, "viewUrl": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt" + }, + { + "id": 1818, + "description": "Mmotti's regex list blocking ads and tracking sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "homeUrl": "https://github.com/mmotti/pihole-regex", + "issuesUrl": "https://github.com/mmotti/pihole-regex/issues", + "name": "Mmoti's Regex Filters for Pi-hole", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list" } ] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index b49f86966..0b2c08423 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -2362,5 +2362,13 @@ { "filterListId": 1799, "languageId": 122 + }, + { + "filterListId": 1816, + "languageId": 11 + }, + { + "filterListId": 1817, + "languageId": 11 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 57c0b6091..7ec36e715 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -4780,7 +4780,11 @@ "maintainerid": 34 }, { - "filterListid": 1816, + "filterListid": 1817, "maintainerid": 32 +}, +{ + "filterListid": 1818, + "maintainerid": 140 } ] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 2a946a98b..af267cb8b 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1829,7 +1829,7 @@ }, { "filterListId": 349, - "tagId": 9 + "tagId": 7 }, { "filterListId": 350, @@ -8967,8 +8967,28 @@ "filterListId": 1814, "tagId": 25 }, - { + { "filterListId": 1815, "tagId": 15 + }, + { + "filterListId": 1816, + "tagId": 7 + }, + { + "filterListId": 1817, + "tagId": 2 + }, + { + "filterListId": 1817, + "tagId": 3 + }, + { + "filterListId": 1818, + "tagId": 2 + }, + { + "filterListId": 1818, + "tagId": 3 } ] diff --git a/data/Maintainer.json b/data/Maintainer.json index 3cf302eb6..c0101ea57 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -733,5 +733,10 @@ "id": 139, "homeUrl": "https://www.github.developerdan.com/hosts/", "name": "lightswitch05" + }, + { + "id": 140, + "homeUrl": "https://github.com/mmotti", + "name": "mmotti" } ] From 7cb3b9ee5f591d580d34cf5f5458ceee86304f3e Mon Sep 17 00:00:00 2001 From: hawkeye116477 Date: Fri, 16 Aug 2019 11:34:53 +0200 Subject: [PATCH 38/58] Reindent lines --- data/FilterList.json | 400 +++++----- data/FilterListTag.json | 1678 +++++++++++++++++++-------------------- 2 files changed, 1039 insertions(+), 1039 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9e04460d6..84e387e03 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -17512,7 +17512,7 @@ "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-kill-filters.txt" }, -{ + { "id": 1673, "description": "Completely block Google and its services .", "descriptionSourceUrl": "https://github.com/nickspaargaren/pihole-google", @@ -17882,39 +17882,39 @@ "syntaxId": 1, "homeUrl": "https://asc.hk/", "viewUrl": "https://asc.hk/adplus.txt" -}, -{ + }, + { "id": 1702, "name": "NPC 0AM Hosts", "syntaxId": 1, "homeUrl": "https://npc.0am.jp/", "licenseId": 7, "viewUrl": "https://npc.0am.jp/hosts.php?dl=1" -}, -{ + }, + { "id": 1703, "name": "Synology's pwn", "syntaxId": 28, "homeUrl": "https://in0de.synology.me", "description": "Domain name filters.", "viewUrl": "https://in0de.synology.me/pwn.txt" -}, -{ + }, + { "id": 1704, "name": "Synology's own", "syntaxId": 2, "homeUrl": "https://in0de.synology.me", "description": "Domain name hosts for Pi-hole.", "viewUrl": "https://in0de.synology.me/own.txt" -}, -{ + }, + { "id": 1705, "name": "ChinaList 2.0", "syntaxId": 3, "homeUrl": "https://www.yiclear.com/", "viewUrl": "http://tools.yiclear.com/ChinaList2.0.txt" -}, -{ + }, + { "id": 1706, "name": "GameIndustryDE Hosts", "syntaxId": 1, @@ -17922,254 +17922,254 @@ "description": "Hosts file for blocking spyware, ads, analytics and tracking on German websites and domains.", "licenseId": 9, "viewUrl": "https://gameindustry.de/files/staedte/hosts" -}, -{ + }, + { "id": 1707, "name": "hosts-jp Ads", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/ads" -}, -{ + }, + { "id": 1708, "name": "hosts-jp Porn", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/porn" -}, -{ + }, + { "id": 1709, "name": "hosts-jp Social", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/social" -}, -{ + }, + { "id": 1710, "name": "Botvrij IOC List", "syntaxId": 2, "homeUrl": "https://www.botvrij.eu/", "viewUrl": "https://www.botvrij.eu/data/ioclist.hostname.raw" -}, -{ + }, + { "id": 1711, "name": "Zonefiles Compromised Domains Live", "syntaxId": 2, "homeUrl": "https://zonefiles.io/", "viewUrl": "https://zonefiles.io/f/compromised/domains/live/" -}, -{ + }, + { "id": 1712, "name": "abc45628 Hosts", "syntaxId": 1, "homeUrl": "https://github.com/abc45628/hosts/", -"issuesUrl": "https://github.com/abc45628/hosts//issues", + "issuesUrl": "https://github.com/abc45628/hosts//issues", "viewUrl": "https://raw.githubusercontent.com/abc45628/hosts/master/hosts" -}, -{ + }, + { "id": 1713, "name": "Ad Wars Hosts", "syntaxId": 1, "homeUrl": "https://github.com/jdlingyu/ad-wars/", -"issuesUrl": "https://github.com/jdlingyu/ad-wars//issues", + "issuesUrl": "https://github.com/jdlingyu/ad-wars//issues", "viewUrl": "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" -}, -{ + }, + { "id": 1714, "name": "PiHole Lists - Quad9", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Quad9.txt" -}, -{ + }, + { "id": 1715, "name": "PiHole Lists - Yahoo Ad Servers", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Yahoo_Ad_Servers.txt" -}, -{ + }, + { "id": 1716, "name": "PiHole Lists - Spyware", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/PiHole_HOSTS_Spyware.txt" -}, -{ + }, + { "id": 1717, "name": "PiHole Lists - Cerber Ransomware", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Cerber_Ransomware.txt" -}, -{ + }, + { "id": 1718, "name": "PiHole Lists - Blocklist", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Blocklist.txt" -}, -{ + }, + { "id": 1719, "name": "kurzBlock", "syntaxId": 2, "homeUrl": "https://github.com/KurzGedanke/kurzBlock/", -"issuesUrl": "https://github.com/KurzGedanke/kurzBlock//issues", + "issuesUrl": "https://github.com/KurzGedanke/kurzBlock//issues", "description": "A personal blocklist curated by KurzGedanke.", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/KurzGedanke/kurzBlock/master/kurzBlock.txt", "donateUrl": "https://blog.kurzgedanke.me/donate/" -}, -{ + }, + { "id": 1720, "name": "Grayware Filterlist", "syntaxId": 4, "homeUrl": "https://github.com/VernonStow/Filterlist/", -"issuesUrl": "https://github.com/VernonStow/Filterlist//issues", + "issuesUrl": "https://github.com/VernonStow/Filterlist//issues", "description": "Blocklist for suspicious websites involved with possible tracking, spam, or malware; meant to supplement mainstream blocklists.", "viewUrl": "https://raw.githubusercontent.com/VernonStow/Filterlist/master/Filterlist.txt" -}, -{ + }, + { "id": 1721, "name": "iOS Tracker Blocklist", "syntaxId": 2, "homeUrl": "https://github.com/jakejarvis/ios-trackers/", -"issuesUrl": "https://github.com/jakejarvis/ios-trackers//issues", + "issuesUrl": "https://github.com/jakejarvis/ios-trackers//issues", "description": "My personal blocklist of iOS tracking, telemetry, and advertising domains.", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/jakejarvis/ios-trackers/master/blocklist.txt" -}, -{ + }, + { "id": 1722, "name": "Evil Domains", "syntaxId": 2, "homeUrl": "https://github.com/hell-sh/Evil-Domains", -"issuesUrl": "https://github.com/hell-sh/Evil-Domains/issues", + "issuesUrl": "https://github.com/hell-sh/Evil-Domains/issues", "description": "Evil domains for our Collective Hosts File Project that are not present in any other lists.", "licenseId": 11, "viewUrl": "https://raw.githubusercontent.com/hell-sh/Evil-Domains/master/evil-domains.txt" -}, -{ + }, + { "id": 1723, "name": "I Hate Tracker", "syntaxId": 2, "homeUrl": "https://github.com/pirat28/IHateTracker/", -"issuesUrl": "https://github.com/pirat28/IHateTracker//issues", + "issuesUrl": "https://github.com/pirat28/IHateTracker//issues", "description": "Ads and Tracker which other lists may not found", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/pirat28/IHateTracker/master/iHateTracker.txt" -}, -{ + }, + { "id": 1724, "name": "Nolovia Supplemental Bad Host Index blacklist file", "syntaxId": 2, "homeUrl": "https://github.com/parseword/nolovia/", -"issuesUrl": "https://github.com/parseword/nolovia//issues", + "issuesUrl": "https://github.com/parseword/nolovia//issues", "viewUrl": "https://raw.githubusercontent.com/parseword/nolovia/master/skel/hosts-nolovia.txt" -}, -{ + }, + { "id": 1725, "name": "Nolovia state-sponsored malware blacklist file", "syntaxId": 2, "homeUrl": "https://github.com/parseword/nolovia/", -"issuesUrl": "https://github.com/parseword/nolovia//issues", + "issuesUrl": "https://github.com/parseword/nolovia//issues", "description": "The following servers have been identified as part of various state-sponsored malware campaigns.", "viewUrl": "https://raw.githubusercontent.com/parseword/nolovia/master/skel/hosts-government-malware.txt" -}, -{ + }, + { "id": 1726, "name": "DodgySiteBlocker", "syntaxId": 3, "homeUrl": "https://github.com/callmenemo491/DodgySiteBlocker/", -"issuesUrl": "https://github.com/callmenemo491/DodgySiteBlocker//issues", + "issuesUrl": "https://github.com/callmenemo491/DodgySiteBlocker//issues", "description": "This filter disables 'dodgy' sites My Way!", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/callmenemo491/DodgySiteBlocker/master/DodgySiteBlocker.txt" -}, -{ + }, + { "id": 1727, "name": "Magento Malware Skanner - Burner Domains", "syntaxId": 2, "homeUrl": "https://github.com/gwillem/magento-malware-scanner/", -"issuesUrl": "https://github.com/gwillem/magento-malware-scanner//issues", + "issuesUrl": "https://github.com/gwillem/magento-malware-scanner//issues", "description": "Burner domains are short-lived domains, registered by criminals (under a phony name). Don't put legitimate domains here, even if they contain malware.", "licenseId": 4, "viewUrl": "https://raw.githubusercontent.com/gwillem/magento-malware-scanner/master/rules/burner-domains.txt" -}, -{ + }, + { "id": 1728, "name": "Soteria nou's domain list - Ads", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/ads.txt" -}, -{ + }, + { "id": 1729, "name": "Soteria nou's domain list - Affiliates", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/affiliate.txt" -}, -{ + }, + { "id": 1730, "name": "Soteria nou's domain list - Analytics", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/analytics.txt" -}, -{ + }, + { "id": 1731, "name": "Soteria nou's domain list - Enrichments", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/enrichments.txt" -}, -{ + }, + { "id": 1732, "name": "Soteria nou's domain list - Fake sites", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/fake.txt" -}, -{ + }, + { "id": 1733, "name": "Soteria nou's domain list - Widgets", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/widgets.txt" -}, + }, { "id": 1734, "description": "A merged hosts file from a variety of other lists.", @@ -19213,115 +19213,115 @@ "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/arabic.txt" }, -{ -"id": 1800, -"name": "Rixcloud Rules", -"syntaxId": 29, -"viewUrl": "https://cdn.rixcloud.io/Quantumult/Rules/Default.conf" -}, -{ -"id": 1801, -"name": "Lhie1's Auto Rules", -"homeUrl": "https://github.com/lhie1/Rules/", -"issuesUrl": "https://github.com/lhie1/Rules/issues", -"syntaxId": 29, -"licenseId": 19, -"viewUrl": "https://raw.githubusercontent.com/lhie1/Rules/master/Auto/REJECT.conf" -}, -{ -"id": 1802, -"name": "SSEncrypt Adblock", -"homeUrl": "https://github.com/HParis/SSEncrypt/", -"issuesUrl": "https://github.com/HParis/SSEncrypt/issues", -"syntaxId": 29, -"viewUrl": "https://raw.githubusercontent.com/HParis/SSEncrypt/master/adblock-reject.list" -}, -{ -"id": 1803, -"name": "Scomper Surge List Reject", -"homeUrl": "https://github.com/scomper/surge-list/", -"issuesUrl": "https://github.com/scomper/surge-list/issues", -"syntaxId": 29, -"viewUrl": "https://raw.githubusercontent.com/scomper/surge-list/master/reject.list" -}, -{ -"id": 1804, -"name": "ConnersHua Advertising Ruleset", -"homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", -"issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", -"syntaxId": 29, -"viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list" -}, -{ -"id": 1805, -"name": "ConnersHua Pro Ruleset", -"homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", -"issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", -"syntaxId": 29, -"viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" -}, -{ -"id": 1806, -"name": "BlocklistDE All", -"description": "The mission is to report any and all attacks to the respective abuse departments of the infected PCs/servers, to ensure that the responsible provider can inform their customer about the infection and disable the attacker. ", -"homeUrl": "https://www.blocklist.de/en/index.html", -"syntaxId": 9, -"viewUrl": "https://lists.blocklist.de/lists/all.txt", -"donateUrl": "https://flattr.com/@blocklist.de" -}, -{ -"id": 1807, -"name": "DangerRulezSK Brute Force Blocker", -"description": "Its main purpose is to block SSH bruteforce attacks via firewall.", -"homeUrl": "http://danger.rulez.sk/index.php/bruteforceblocker/", -"syntaxId": 9, -"viewUrl": "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" -}, -{ -"id": 1808, -"name": "EmergingThreats Compromised IPs", -"homeUrl": "https://rules.emergingthreats.net/", -"syntaxId": 9, -"viewUrl": "https://rules.emergingthreats.net/blockrules/compromised-ips.txt" -}, -{ -"id": 1809, -"name": "EmergingThreats Block IPs", -"homeUrl": "https://rules.emergingthreats.net/", -"syntaxId": 9, -"viewUrl": "https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt" -}, -{ -"id": 1810, -"name": "Greensnow Blocklist", -"description": "GreenSnow is a team consisting of the best specialists in computer security, we harvest a large number of IPs from different computers located around the world.", -"homeUrl": "https://greensnow.co/", -"syntaxId": 9, -"viewUrl": "https://blocklist.greensnow.co/greensnow.txt" -}, -{ -"id": 1811, -"name": "Binary Defense Systems Artillery Threat Intelligence Feed and Banlist Feed", -"homeUrl": "https://www.binarydefense.com/", -"syntaxId": 9, -"licenseId": 32, -"viewUrl": "https://www.binarydefense.com/banlist.txt" -}, -{ -"id": 1812, -"name": "NoThink SSH Blacklist", -"homeUrl": "https://www.nothink.org/", -"syntaxId": 9, -"viewUrl": "https://www.nothink.org/blacklist/blacklist_ssh_all.txt" -}, -{ -"id": 1813, -"name": "CINS Army Bad Guys", -"description": "CINS Army is a way for our company to give back to the community by sharing valuable threat intelligence harvested from our CINS system. The CINS Army list is a subset of the CINS Active Threat Intelligence ruleset, and consists of IP addresses that meet one of two basic criteria: 1) The IP's recent Rogue Packet score factor is very poor, or 2) The IP has tripped a designated number of 'trusted' alerts across a given number of our Sentinels deployed around the world.", -"homeUrl": "https://cinsscore.com/", -"syntaxId": 9, -"viewUrl": "https://cinsscore.com/list/ci-badguys.txt" -}, + { + "id": 1800, + "name": "Rixcloud Rules", + "syntaxId": 29, + "viewUrl": "https://cdn.rixcloud.io/Quantumult/Rules/Default.conf" + }, + { + "id": 1801, + "name": "Lhie1's Auto Rules", + "homeUrl": "https://github.com/lhie1/Rules/", + "issuesUrl": "https://github.com/lhie1/Rules/issues", + "syntaxId": 29, + "licenseId": 19, + "viewUrl": "https://raw.githubusercontent.com/lhie1/Rules/master/Auto/REJECT.conf" + }, + { + "id": 1802, + "name": "SSEncrypt Adblock", + "homeUrl": "https://github.com/HParis/SSEncrypt/", + "issuesUrl": "https://github.com/HParis/SSEncrypt/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/HParis/SSEncrypt/master/adblock-reject.list" + }, + { + "id": 1803, + "name": "Scomper Surge List Reject", + "homeUrl": "https://github.com/scomper/surge-list/", + "issuesUrl": "https://github.com/scomper/surge-list/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/scomper/surge-list/master/reject.list" + }, + { + "id": 1804, + "name": "ConnersHua Advertising Ruleset", + "homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", + "issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list" + }, + { + "id": 1805, + "name": "ConnersHua Pro Ruleset", + "homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", + "issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" + }, + { + "id": 1806, + "name": "BlocklistDE All", + "description": "The mission is to report any and all attacks to the respective abuse departments of the infected PCs/servers, to ensure that the responsible provider can inform their customer about the infection and disable the attacker. ", + "homeUrl": "https://www.blocklist.de/en/index.html", + "syntaxId": 9, + "viewUrl": "https://lists.blocklist.de/lists/all.txt", + "donateUrl": "https://flattr.com/@blocklist.de" + }, + { + "id": 1807, + "name": "DangerRulezSK Brute Force Blocker", + "description": "Its main purpose is to block SSH bruteforce attacks via firewall.", + "homeUrl": "http://danger.rulez.sk/index.php/bruteforceblocker/", + "syntaxId": 9, + "viewUrl": "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" + }, + { + "id": 1808, + "name": "EmergingThreats Compromised IPs", + "homeUrl": "https://rules.emergingthreats.net/", + "syntaxId": 9, + "viewUrl": "https://rules.emergingthreats.net/blockrules/compromised-ips.txt" + }, + { + "id": 1809, + "name": "EmergingThreats Block IPs", + "homeUrl": "https://rules.emergingthreats.net/", + "syntaxId": 9, + "viewUrl": "https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt" + }, + { + "id": 1810, + "name": "Greensnow Blocklist", + "description": "GreenSnow is a team consisting of the best specialists in computer security, we harvest a large number of IPs from different computers located around the world.", + "homeUrl": "https://greensnow.co/", + "syntaxId": 9, + "viewUrl": "https://blocklist.greensnow.co/greensnow.txt" + }, + { + "id": 1811, + "name": "Binary Defense Systems Artillery Threat Intelligence Feed and Banlist Feed", + "homeUrl": "https://www.binarydefense.com/", + "syntaxId": 9, + "licenseId": 32, + "viewUrl": "https://www.binarydefense.com/banlist.txt" + }, + { + "id": 1812, + "name": "NoThink SSH Blacklist", + "homeUrl": "https://www.nothink.org/", + "syntaxId": 9, + "viewUrl": "https://www.nothink.org/blacklist/blacklist_ssh_all.txt" + }, + { + "id": 1813, + "name": "CINS Army Bad Guys", + "description": "CINS Army is a way for our company to give back to the community by sharing valuable threat intelligence harvested from our CINS system. The CINS Army list is a subset of the CINS Active Threat Intelligence ruleset, and consists of IP addresses that meet one of two basic criteria: 1) The IP's recent Rogue Packet score factor is very poor, or 2) The IP has tripped a designated number of 'trusted' alerts across a given number of our Sentinels deployed around the world.", + "homeUrl": "https://cinsscore.com/", + "syntaxId": 9, + "viewUrl": "https://cinsscore.com/list/ci-badguys.txt" + }, { "id": 1814, "description": "This list target huge international websites that clutter search engine results with misinformation, unfounded articles, and/or contempt for humanity. While designed for use with «Google Hit Hider by Domain» to remove search results, it can also be used with other domains-list tools if you want more thorough blocking of them.", diff --git a/data/FilterListTag.json b/data/FilterListTag.json index af267cb8b..070854f61 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -7663,7 +7663,7 @@ "filterListId": 1668, "tagId": 15 }, - { + { "filterListId": 1669, "tagId": 3 }, @@ -7671,7 +7671,7 @@ "filterListId": 1670, "tagId": 2 }, - { + { "filterListId": 1670, "tagId": 3 }, @@ -7679,7 +7679,7 @@ "filterListId": 1671, "tagId": 2 }, - { + { "filterListId": 1672, "tagId": 2 }, @@ -7695,95 +7695,95 @@ "filterListId": 1673, "tagId": 19 }, - { + { "filterListId": 1674, "tagId": 19 }, - { + { "filterListId": 1675, "tagId": 19 }, - { + { "filterListId": 1676, "tagId": 19 }, - { + { "filterListId": 1677, "tagId": 19 }, - { + { "filterListId": 1678, "tagId": 19 }, - { + { "filterListId": 1679, "tagId": 19 }, - { + { "filterListId": 1680, "tagId": 19 }, - { + { "filterListId": 1681, "tagId": 19 }, - { + { "filterListId": 1682, "tagId": 19 }, - { + { "filterListId": 1683, "tagId": 19 }, - { + { "filterListId": 1684, "tagId": 19 }, - { + { "filterListId": 1685, "tagId": 19 }, - { + { "filterListId": 1686, "tagId": 19 }, - { + { "filterListId": 1687, "tagId": 19 }, - { + { "filterListId": 1688, "tagId": 19 }, - { + { "filterListId": 1689, "tagId": 19 }, - { + { "filterListId": 1690, "tagId": 19 }, - { + { "filterListId": 1691, "tagId": 19 }, - { + { "filterListId": 1692, "tagId": 19 }, - { + { "filterListId": 1693, "tagId": 19 }, - { + { "filterListId": 1694, "tagId": 19 }, - { + { "filterListId": 1695, "tagId": 19 }, - { + { "filterListId": 1696, "tagId": 19 }, @@ -7791,182 +7791,182 @@ "filterListId": 1697, "tagId": 19 }, - { + { "filterListId": 1698, "tagId": 19 }, - { + { "filterListId": 1699, "tagId": 19 }, - { + { "filterListId": 1700, "tagId": 19 }, { "filterListid": 1711, "tagid": 6 -}, -{ + }, + { "filterListid": 1712, "tagid": 12 -}, -{ + }, + { "filterListid": 1712, "tagid": 3 -}, -{ + }, + { "filterListid": 1713, "tagid": 2 -}, -{ + }, + { "filterListid": 1714, "tagid": 6 -}, -{ + }, + { "filterListid": 1715, "tagid": 2 -}, -{ + }, + { "filterListid": 1716, "tagid": 6 -}, -{ + }, + { "filterListid": 1717, "tagid": 6 -}, -{ + }, + { "filterListid": 1718, "tagid": 6 -}, -{ + }, + { "filterListid": 1719, "tagid": 6 -}, -{ + }, + { "filterListid": 1720, "tagid": 3 -}, -{ + }, + { "filterListid": 1720, "tagid": 6 -}, -{ + }, + { "filterListid": 1721, "tagid": 3 -}, -{ + }, + { "filterListid": 1722, "tagid": 6 -}, -{ + }, + { "filterListid": 1723, "tagid": 3 -}, -{ + }, + { "filterListid": 1724, "tagid": 6 -}, -{ + }, + { "filterListid": 1724, "tagid": 7 -}, -{ + }, + { "filterListid": 1725, "tagid": 3 -}, -{ + }, + { "filterListid": 1725, "tagid": 6 -}, -{ + }, + { "filterListid": 1726, "tagid": 6 -}, -{ + }, + { "filterListid": 1727, "tagid": 6 -}, -{ + }, + { "filterListid": 1728, "tagid": 2 -}, -{ + }, + { "filterListid": 1729, "tagid": 2 -}, -{ + }, + { "filterListid": 1730, "tagid": 3 -}, -{ + }, + { "filterListid": 1731, "tagid": 9 -}, -{ + }, + { "filterListid": 1732, "tagid": 6 -}, -{ + }, + { "filterListid": 1733, "tagid": 3 -}, -{ + }, + { "filterListid": 1736, "tagid": 2 -}, -{ + }, + { "filterListid": 1737, "tagid": 15 -}, -{ + }, + { "filterListid": 1738, "tagid": 6 -}, -{ + }, + { "filterListid": 1701, "tagid": 2 -}, -{ + }, + { "filterListid": 1702, "tagid": 2 -}, -{ + }, + { "filterListid": 1703, "tagid": 2 -}, -{ + }, + { "filterListid": 1704, "tagid": 2 -}, -{ + }, + { "filterListid": 1705, "tagid": 2 -}, -{ + }, + { "filterListid": 1706, "tagid": 2 -}, -{ + }, + { "filterListid": 1706, "tagid": 3 -}, -{ + }, + { "filterListid": 1706, "tagid": 6 -}, -{ + }, + { "filterListid": 1707, "tagid": 2 -}, -{ + }, + { "filterListid": 1708, "tagid": 11 -}, -{ + }, + { "filterListid": 1709, "tagid": 4 -}, + }, { "filterListId": 1734, "tagId": 1 @@ -8136,725 +8136,725 @@ "tagId": 6 }, { -"filterListId": 1743, -"tagId": 2 -}, -{ -"filterListId": 1754, -"tagId": 2 -}, -{ -"filterListId": 1765, -"tagId": 2 -}, -{ -"filterListId": 1776, -"tagId": 2 -}, -{ -"filterListId": 1787, -"tagId": 2 -}, -{ -"filterListId": 1743, -"tagId": 3 -}, -{ -"filterListId": 1754, -"tagId": 3 -}, -{ -"filterListId": 1765, -"tagId": 3 -}, -{ -"filterListId": 1776, -"tagId": 3 -}, -{ -"filterListId": 1787, -"tagId": 3 -}, -{ -"filterListId": 1743, -"tagId": 6 -}, -{ -"filterListId": 1754, -"tagId": 6 -}, -{ -"filterListId": 1765, -"tagId": 6 -}, -{ -"filterListId": 1776, -"tagId": 6 -}, -{ -"filterListId": 1787, -"tagId": 6 -}, -{ -"filterListId": 1744, -"tagId": 1 -}, -{ -"filterListId": 1755, -"tagId": 1 -}, -{ -"filterListId": 1766, -"tagId": 1 -}, -{ -"filterListId": 1777, -"tagId": 1 -}, -{ -"filterListId": 1788, -"tagId": 1 -}, -{ -"filterListId": 1744, -"tagId": 2 -}, -{ -"filterListId": 1755, -"tagId": 2 -}, -{ -"filterListId": 1766, -"tagId": 2 -}, -{ -"filterListId": 1777, -"tagId": 2 -}, -{ -"filterListId": 1788, -"tagId": 2 -}, -{ -"filterListId": 1744, -"tagId": 3 -}, -{ -"filterListId": 1755, -"tagId": 3 -}, -{ -"filterListId": 1766, -"tagId": 3 -}, -{ -"filterListId": 1777, -"tagId": 3 -}, -{ -"filterListId": 1788, -"tagId": 3 -}, -{ -"filterListId": 1744, -"tagId": 6 -}, -{ -"filterListId": 1755, -"tagId": 6 -}, -{ -"filterListId": 1766, -"tagId": 6 -}, -{ -"filterListId": 1777, -"tagId": 6 -}, -{ -"filterListId": 1788, -"tagId": 6 -}, -{ -"filterListId": 1745, -"tagId": 1 -}, -{ -"filterListId": 1756, -"tagId": 1 -}, -{ -"filterListId": 1767, -"tagId": 1 -}, -{ -"filterListId": 1778, -"tagId": 1 -}, -{ -"filterListId": 1789, -"tagId": 1 -}, -{ -"filterListId": 1745, -"tagId": 2 -}, -{ -"filterListId": 1756, -"tagId": 2 -}, -{ -"filterListId": 1767, -"tagId": 2 -}, -{ -"filterListId": 1778, -"tagId": 2 -}, -{ -"filterListId": 1789, -"tagId": 2 -}, -{ -"filterListId": 1745, -"tagId": 3 -}, -{ -"filterListId": 1756, -"tagId": 3 -}, -{ -"filterListId": 1767, -"tagId": 3 -}, -{ -"filterListId": 1778, -"tagId": 3 -}, -{ -"filterListId": 1789, -"tagId": 3 -}, -{ -"filterListId": 1745, -"tagId": 6 -}, -{ -"filterListId": 1756, -"tagId": 6 -}, -{ -"filterListId": 1767, -"tagId": 6 -}, -{ -"filterListId": 1778, -"tagId": 6 -}, -{ -"filterListId": 1789, -"tagId": 6 -}, -{ -"filterListId": 1745, -"tagId": 7 -}, -{ -"filterListId": 1756, -"tagId": 7 -}, -{ -"filterListId": 1767, -"tagId": 7 -}, -{ -"filterListId": 1778, -"tagId": 7 -}, -{ -"filterListId": 1789, -"tagId": 7 -}, -{ -"filterListId": 1746, -"tagId": 1 -}, -{ -"filterListId": 1757, -"tagId": 1 -}, -{ -"filterListId": 1768, -"tagId": 1 -}, -{ -"filterListId": 1779, -"tagId": 1 -}, -{ -"filterListId": 1790, -"tagId": 1 -}, -{ -"filterListId": 1746, -"tagId": 2 -}, -{ -"filterListId": 1757, -"tagId": 2 -}, -{ -"filterListId": 1768, -"tagId": 2 -}, -{ -"filterListId": 1779, -"tagId": 2 -}, -{ -"filterListId": 1790, -"tagId": 2 -}, -{ -"filterListId": 1746, -"tagId": 3 -}, -{ -"filterListId": 1757, -"tagId": 3 -}, -{ -"filterListId": 1768, -"tagId": 3 -}, -{ -"filterListId": 1779, -"tagId": 3 -}, -{ -"filterListId": 1790, -"tagId": 3 -}, -{ -"filterListId": 1746, -"tagId": 6 -}, -{ -"filterListId": 1757, -"tagId": 6 -}, -{ -"filterListId": 1768, -"tagId": 6 -}, -{ -"filterListId": 1779, -"tagId": 6 -}, -{ -"filterListId": 1790, -"tagId": 6 -}, -{ -"filterListId": 1746, -"tagId": 7 -}, -{ -"filterListId": 1757, -"tagId": 7 -}, -{ -"filterListId": 1768, -"tagId": 7 -}, -{ -"filterListId": 1779, -"tagId": 7 -}, -{ -"filterListId": 1790, -"tagId": 7 -}, -{ -"filterListId": 1747, -"tagId": 11 -}, -{ -"filterListId": 1758, -"tagId": 11 -}, -{ -"filterListId": 1769, -"tagId": 11 -}, -{ -"filterListId": 1780, -"tagId": 11 -}, -{ -"filterListId": 1791, -"tagId": 11 -}, -{ -"filterListId": 1748, -"tagId": 1 -}, -{ -"filterListId": 1758, -"tagId": 1 -}, -{ -"filterListId": 1770, -"tagId": 1 -}, -{ -"filterListId": 1781, -"tagId": 1 -}, -{ -"filterListId": 1792, -"tagId": 1 -}, -{ -"filterListId": 1748, -"tagId": 2 -}, -{ -"filterListId": 1758, -"tagId": 2 -}, -{ -"filterListId": 1770, -"tagId": 2 -}, -{ -"filterListId": 1781, -"tagId": 2 -}, -{ -"filterListId": 1792, -"tagId": 2 -}, -{ -"filterListId": 1748, -"tagId": 3 -}, -{ -"filterListId": 1758, -"tagId": 3 -}, -{ -"filterListId": 1770, -"tagId": 3 -}, -{ -"filterListId": 1781, -"tagId": 3 -}, -{ -"filterListId": 1792, -"tagId": 3 -}, -{ -"filterListId": 1748, -"tagId": 6 -}, -{ -"filterListId": 1758, -"tagId": 6 -}, -{ -"filterListId": 1770, -"tagId": 6 -}, -{ -"filterListId": 1781, -"tagId": 6 -}, -{ -"filterListId": 1792, -"tagId": 6 -}, -{ -"filterListId": 1748, -"tagId": 7 -}, -{ -"filterListId": 1758, -"tagId": 7 -}, -{ -"filterListId": 1770, -"tagId": 7 -}, -{ -"filterListId": 1781, -"tagId": 7 -}, -{ -"filterListId": 1792, -"tagId": 7 -}, -{ -"filterListId": 1748, -"tagId": 9 -}, -{ -"filterListId": 1758, -"tagId": 9 -}, -{ -"filterListId": 1770, -"tagId": 9 -}, -{ -"filterListId": 1781, -"tagId": 9 -}, -{ -"filterListId": 1792, -"tagId": 9 -}, -{ -"filterListId": 1749, -"tagId": 1 -}, -{ -"filterListId": 1760, -"tagId": 1 -}, -{ -"filterListId": 1771, -"tagId": 1 -}, -{ -"filterListId": 1782, -"tagId": 1 -}, -{ -"filterListId": 1793, -"tagId": 1 -}, -{ -"filterListId": 1749, -"tagId": 2 -}, -{ -"filterListId": 1760, -"tagId": 2 -}, -{ -"filterListId": 1771, -"tagId": 2 -}, -{ -"filterListId": 1782, -"tagId": 2 -}, -{ -"filterListId": 1793, -"tagId": 2 -}, -{ -"filterListId": 1749, -"tagId": 3 -}, -{ -"filterListId": 1760, -"tagId": 3 -}, -{ -"filterListId": 1771, -"tagId": 3 -}, -{ -"filterListId": 1782, -"tagId": 3 -}, -{ -"filterListId": 1793, -"tagId": 3 -}, -{ -"filterListId": 1749, -"tagId": 6 -}, -{ -"filterListId": 1760, -"tagId": 6 -}, -{ -"filterListId": 1771, -"tagId": 6 -}, -{ -"filterListId": 1782, -"tagId": 6 -}, -{ -"filterListId": 1793, -"tagId": 6 -}, -{ -"filterListId": 1749, -"tagId": 7 -}, -{ -"filterListId": 1760, -"tagId": 7 -}, -{ -"filterListId": 1771, -"tagId": 7 -}, -{ -"filterListId": 1782, -"tagId": 7 -}, -{ -"filterListId": 1793, -"tagId": 7 -}, -{ -"filterListId": 1749, -"tagId": 9 -}, -{ -"filterListId": 1760, -"tagId": 9 -}, -{ -"filterListId": 1771, -"tagId": 9 -}, -{ -"filterListId": 1782, -"tagId": 9 -}, -{ -"filterListId": 1793, -"tagId": 9 -}, -{ -"filterListId": 1749, -"tagId": 11 -}, -{ -"filterListId": 1760, -"tagId": 11 -}, -{ -"filterListId": 1771, -"tagId": 11 -}, -{ -"filterListId": 1782, -"tagId": 11 -}, -{ -"filterListId": 1793, -"tagId": 11 -}, -{ -"filterListId": 1750, -"tagId": 3 -}, -{ -"filterListId": 1761, -"tagId": 3 -}, -{ -"filterListId": 1772, -"tagId": 3 -}, -{ -"filterListId": 1783, -"tagId": 3 -}, -{ -"filterListId": 1794, -"tagId": 3 -}, -{ -"filterListId": 1750, -"tagId": 6 -}, -{ -"filterListId": 1761, -"tagId": 6 -}, -{ -"filterListId": 1772, -"tagId": 6 -}, -{ -"filterListId": 1783, -"tagId": 6 -}, -{ -"filterListId": 1794, -"tagId": 6 -}, -{ -"filterListId": 1751, -"tagId": 4 -}, -{ -"filterListId": 1762, -"tagId": 4 -}, -{ -"filterListId": 1773, -"tagId": 4 -}, -{ -"filterListId": 1784, -"tagId": 4 -}, -{ -"filterListId": 1795, -"tagId": 4 -}, -{ -"filterListId": 1752, -"tagId": 11 -}, -{ -"filterListId": 1763, -"tagId": 11 -}, -{ -"filterListId": 1774, -"tagId": 11 -}, -{ -"filterListId": 1785, -"tagId": 11 -}, -{ -"filterListId": 1796, -"tagId": 11 -}, -{ -"filterListId": 1753, -"tagId": 2 -}, -{ -"filterListId": 1764, -"tagId": 2 -}, -{ -"filterListId": 1775, -"tagId": 2 -}, -{ -"filterListId": 1786, -"tagId": 2 -}, -{ -"filterListId": 1797, -"tagId": 2 -}, + "filterListId": 1743, + "tagId": 2 + }, + { + "filterListId": 1754, + "tagId": 2 + }, + { + "filterListId": 1765, + "tagId": 2 + }, + { + "filterListId": 1776, + "tagId": 2 + }, + { + "filterListId": 1787, + "tagId": 2 + }, + { + "filterListId": 1743, + "tagId": 3 + }, + { + "filterListId": 1754, + "tagId": 3 + }, + { + "filterListId": 1765, + "tagId": 3 + }, + { + "filterListId": 1776, + "tagId": 3 + }, + { + "filterListId": 1787, + "tagId": 3 + }, + { + "filterListId": 1743, + "tagId": 6 + }, + { + "filterListId": 1754, + "tagId": 6 + }, + { + "filterListId": 1765, + "tagId": 6 + }, + { + "filterListId": 1776, + "tagId": 6 + }, + { + "filterListId": 1787, + "tagId": 6 + }, + { + "filterListId": 1744, + "tagId": 1 + }, + { + "filterListId": 1755, + "tagId": 1 + }, + { + "filterListId": 1766, + "tagId": 1 + }, + { + "filterListId": 1777, + "tagId": 1 + }, + { + "filterListId": 1788, + "tagId": 1 + }, + { + "filterListId": 1744, + "tagId": 2 + }, + { + "filterListId": 1755, + "tagId": 2 + }, + { + "filterListId": 1766, + "tagId": 2 + }, + { + "filterListId": 1777, + "tagId": 2 + }, + { + "filterListId": 1788, + "tagId": 2 + }, + { + "filterListId": 1744, + "tagId": 3 + }, + { + "filterListId": 1755, + "tagId": 3 + }, + { + "filterListId": 1766, + "tagId": 3 + }, + { + "filterListId": 1777, + "tagId": 3 + }, + { + "filterListId": 1788, + "tagId": 3 + }, + { + "filterListId": 1744, + "tagId": 6 + }, + { + "filterListId": 1755, + "tagId": 6 + }, + { + "filterListId": 1766, + "tagId": 6 + }, + { + "filterListId": 1777, + "tagId": 6 + }, + { + "filterListId": 1788, + "tagId": 6 + }, + { + "filterListId": 1745, + "tagId": 1 + }, + { + "filterListId": 1756, + "tagId": 1 + }, + { + "filterListId": 1767, + "tagId": 1 + }, + { + "filterListId": 1778, + "tagId": 1 + }, + { + "filterListId": 1789, + "tagId": 1 + }, + { + "filterListId": 1745, + "tagId": 2 + }, + { + "filterListId": 1756, + "tagId": 2 + }, + { + "filterListId": 1767, + "tagId": 2 + }, + { + "filterListId": 1778, + "tagId": 2 + }, + { + "filterListId": 1789, + "tagId": 2 + }, + { + "filterListId": 1745, + "tagId": 3 + }, + { + "filterListId": 1756, + "tagId": 3 + }, + { + "filterListId": 1767, + "tagId": 3 + }, + { + "filterListId": 1778, + "tagId": 3 + }, + { + "filterListId": 1789, + "tagId": 3 + }, + { + "filterListId": 1745, + "tagId": 6 + }, + { + "filterListId": 1756, + "tagId": 6 + }, + { + "filterListId": 1767, + "tagId": 6 + }, + { + "filterListId": 1778, + "tagId": 6 + }, + { + "filterListId": 1789, + "tagId": 6 + }, + { + "filterListId": 1745, + "tagId": 7 + }, + { + "filterListId": 1756, + "tagId": 7 + }, + { + "filterListId": 1767, + "tagId": 7 + }, + { + "filterListId": 1778, + "tagId": 7 + }, + { + "filterListId": 1789, + "tagId": 7 + }, + { + "filterListId": 1746, + "tagId": 1 + }, + { + "filterListId": 1757, + "tagId": 1 + }, + { + "filterListId": 1768, + "tagId": 1 + }, + { + "filterListId": 1779, + "tagId": 1 + }, + { + "filterListId": 1790, + "tagId": 1 + }, + { + "filterListId": 1746, + "tagId": 2 + }, + { + "filterListId": 1757, + "tagId": 2 + }, + { + "filterListId": 1768, + "tagId": 2 + }, + { + "filterListId": 1779, + "tagId": 2 + }, + { + "filterListId": 1790, + "tagId": 2 + }, + { + "filterListId": 1746, + "tagId": 3 + }, + { + "filterListId": 1757, + "tagId": 3 + }, + { + "filterListId": 1768, + "tagId": 3 + }, + { + "filterListId": 1779, + "tagId": 3 + }, + { + "filterListId": 1790, + "tagId": 3 + }, + { + "filterListId": 1746, + "tagId": 6 + }, + { + "filterListId": 1757, + "tagId": 6 + }, + { + "filterListId": 1768, + "tagId": 6 + }, + { + "filterListId": 1779, + "tagId": 6 + }, + { + "filterListId": 1790, + "tagId": 6 + }, + { + "filterListId": 1746, + "tagId": 7 + }, + { + "filterListId": 1757, + "tagId": 7 + }, + { + "filterListId": 1768, + "tagId": 7 + }, + { + "filterListId": 1779, + "tagId": 7 + }, + { + "filterListId": 1790, + "tagId": 7 + }, + { + "filterListId": 1747, + "tagId": 11 + }, + { + "filterListId": 1758, + "tagId": 11 + }, + { + "filterListId": 1769, + "tagId": 11 + }, + { + "filterListId": 1780, + "tagId": 11 + }, + { + "filterListId": 1791, + "tagId": 11 + }, + { + "filterListId": 1748, + "tagId": 1 + }, + { + "filterListId": 1758, + "tagId": 1 + }, + { + "filterListId": 1770, + "tagId": 1 + }, + { + "filterListId": 1781, + "tagId": 1 + }, + { + "filterListId": 1792, + "tagId": 1 + }, + { + "filterListId": 1748, + "tagId": 2 + }, + { + "filterListId": 1758, + "tagId": 2 + }, + { + "filterListId": 1770, + "tagId": 2 + }, + { + "filterListId": 1781, + "tagId": 2 + }, + { + "filterListId": 1792, + "tagId": 2 + }, + { + "filterListId": 1748, + "tagId": 3 + }, + { + "filterListId": 1758, + "tagId": 3 + }, + { + "filterListId": 1770, + "tagId": 3 + }, + { + "filterListId": 1781, + "tagId": 3 + }, + { + "filterListId": 1792, + "tagId": 3 + }, + { + "filterListId": 1748, + "tagId": 6 + }, + { + "filterListId": 1758, + "tagId": 6 + }, + { + "filterListId": 1770, + "tagId": 6 + }, + { + "filterListId": 1781, + "tagId": 6 + }, + { + "filterListId": 1792, + "tagId": 6 + }, + { + "filterListId": 1748, + "tagId": 7 + }, + { + "filterListId": 1758, + "tagId": 7 + }, + { + "filterListId": 1770, + "tagId": 7 + }, + { + "filterListId": 1781, + "tagId": 7 + }, + { + "filterListId": 1792, + "tagId": 7 + }, + { + "filterListId": 1748, + "tagId": 9 + }, + { + "filterListId": 1758, + "tagId": 9 + }, + { + "filterListId": 1770, + "tagId": 9 + }, + { + "filterListId": 1781, + "tagId": 9 + }, + { + "filterListId": 1792, + "tagId": 9 + }, + { + "filterListId": 1749, + "tagId": 1 + }, + { + "filterListId": 1760, + "tagId": 1 + }, + { + "filterListId": 1771, + "tagId": 1 + }, + { + "filterListId": 1782, + "tagId": 1 + }, + { + "filterListId": 1793, + "tagId": 1 + }, + { + "filterListId": 1749, + "tagId": 2 + }, + { + "filterListId": 1760, + "tagId": 2 + }, + { + "filterListId": 1771, + "tagId": 2 + }, + { + "filterListId": 1782, + "tagId": 2 + }, + { + "filterListId": 1793, + "tagId": 2 + }, + { + "filterListId": 1749, + "tagId": 3 + }, + { + "filterListId": 1760, + "tagId": 3 + }, + { + "filterListId": 1771, + "tagId": 3 + }, + { + "filterListId": 1782, + "tagId": 3 + }, + { + "filterListId": 1793, + "tagId": 3 + }, + { + "filterListId": 1749, + "tagId": 6 + }, + { + "filterListId": 1760, + "tagId": 6 + }, + { + "filterListId": 1771, + "tagId": 6 + }, + { + "filterListId": 1782, + "tagId": 6 + }, + { + "filterListId": 1793, + "tagId": 6 + }, + { + "filterListId": 1749, + "tagId": 7 + }, + { + "filterListId": 1760, + "tagId": 7 + }, + { + "filterListId": 1771, + "tagId": 7 + }, + { + "filterListId": 1782, + "tagId": 7 + }, + { + "filterListId": 1793, + "tagId": 7 + }, + { + "filterListId": 1749, + "tagId": 9 + }, + { + "filterListId": 1760, + "tagId": 9 + }, + { + "filterListId": 1771, + "tagId": 9 + }, + { + "filterListId": 1782, + "tagId": 9 + }, + { + "filterListId": 1793, + "tagId": 9 + }, + { + "filterListId": 1749, + "tagId": 11 + }, + { + "filterListId": 1760, + "tagId": 11 + }, + { + "filterListId": 1771, + "tagId": 11 + }, + { + "filterListId": 1782, + "tagId": 11 + }, + { + "filterListId": 1793, + "tagId": 11 + }, + { + "filterListId": 1750, + "tagId": 3 + }, + { + "filterListId": 1761, + "tagId": 3 + }, + { + "filterListId": 1772, + "tagId": 3 + }, + { + "filterListId": 1783, + "tagId": 3 + }, + { + "filterListId": 1794, + "tagId": 3 + }, + { + "filterListId": 1750, + "tagId": 6 + }, + { + "filterListId": 1761, + "tagId": 6 + }, + { + "filterListId": 1772, + "tagId": 6 + }, + { + "filterListId": 1783, + "tagId": 6 + }, + { + "filterListId": 1794, + "tagId": 6 + }, + { + "filterListId": 1751, + "tagId": 4 + }, + { + "filterListId": 1762, + "tagId": 4 + }, + { + "filterListId": 1773, + "tagId": 4 + }, + { + "filterListId": 1784, + "tagId": 4 + }, + { + "filterListId": 1795, + "tagId": 4 + }, + { + "filterListId": 1752, + "tagId": 11 + }, + { + "filterListId": 1763, + "tagId": 11 + }, + { + "filterListId": 1774, + "tagId": 11 + }, + { + "filterListId": 1785, + "tagId": 11 + }, + { + "filterListId": 1796, + "tagId": 11 + }, + { + "filterListId": 1753, + "tagId": 2 + }, + { + "filterListId": 1764, + "tagId": 2 + }, + { + "filterListId": 1775, + "tagId": 2 + }, + { + "filterListId": 1786, + "tagId": 2 + }, + { + "filterListId": 1797, + "tagId": 2 + }, { "filterListId": 1759, "tagId": 1 @@ -8887,7 +8887,7 @@ "filterListId": 1800, "tagId": 2 }, - { + { "filterListId": 1800, "tagId": 3 }, @@ -8895,7 +8895,7 @@ "filterListId": 1800, "tagId": 12 }, - { + { "filterListId": 1801, "tagId": 2 }, @@ -8903,7 +8903,7 @@ "filterListId": 1801, "tagId": 3 }, - { + { "filterListId": 1802, "tagId": 2 }, @@ -8911,7 +8911,7 @@ "filterListId": 1803, "tagId": 2 }, - { + { "filterListId": 1803, "tagId": 3 }, @@ -8919,7 +8919,7 @@ "filterListId": 1804, "tagId": 2 }, - { + { "filterListId": 1805, "tagId": 2 }, @@ -8927,7 +8927,7 @@ "filterListId": 1805, "tagId": 12 }, - { + { "filterListId": 1806, "tagId": 6 }, @@ -8935,7 +8935,7 @@ "filterListId": 1807, "tagId": 6 }, - { + { "filterListId": 1808, "tagId": 6 }, @@ -8943,7 +8943,7 @@ "filterListId": 1809, "tagId": 6 }, - { + { "filterListId": 1810, "tagId": 6 }, @@ -8951,7 +8951,7 @@ "filterListId": 1811, "tagId": 6 }, - { + { "filterListId": 1812, "tagId": 6 }, @@ -8959,7 +8959,7 @@ "filterListId": 1813, "tagId": 6 }, - { + { "filterListId": 1814, "tagId": 21 }, From 1ca3c674b46eede901d00e04f27be6c610b7ac85 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2019 13:19:25 +0000 Subject: [PATCH 39/58] Bump @types/react from 16.9.1 to 16.9.2 in /src/FilterLists.Web Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.9.1 to 16.9.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 44818f1d5a6ba94a0a2a6414d152b79e3953e38e..38eae222ddace7e35264eb17dc40e3d834d4063f 100644 GIT binary patch delta 158 zcmbO-Q(?+Xg@!GRUCfh{UKmeS_{cV0o|Tbx`Uz%6zUhZPvnYpVMFtr8gqP=JXuE|J zx~Eu{nOEk8dPh}dWm#H;SX7utCg)U{m|F&>1Z8-nm4;hZ25K8*W#zdT8>U7CN0gT2 zIu#TYWSIs;`uRlq1f}Igd6gxnO%}YQ)n38E2*gZ4%nZaVK+FonY(UJuy@G{9h64ah CG&F4h delta 164 zcmbO-Q(?+Xg@!GRUCh&k<}w;hzre@HHeHStNSt71 Date: Tue, 20 Aug 2019 13:51:05 +0000 Subject: [PATCH 40/58] Bump @types/react-dom from 16.8.5 to 16.9.0 in /src/FilterLists.Web Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 16.8.5 to 16.9.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 38eae222ddace7e35264eb17dc40e3d834d4063f..85ec5a023c3761bcb710d21c44eab83a6a2b1678 100644 GIT binary patch delta 161 zcmbO-Q(?+Xg@!GRPgtg>`>>fzzre@HHeHUDQEK`YA2!uce;=cqY;&JT_pFLMlO%)G zv~c5qvNR)ar?3EnO2aba^2`E5rvmdlM{`TRZ2tn+91ly2LgVlhXV(;$EKB1gqa=f> z#8fADOP8{u%u??xPjAx-m+65!*i@#=voo@_-(h70VkRJF24WT Date: Tue, 20 Aug 2019 13:57:11 +0000 Subject: [PATCH 41/58] Bump @types/jest from 24.0.17 to 24.0.18 in /src/FilterLists.Web Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.17 to 24.0.18. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 85ec5a023c3761bcb710d21c44eab83a6a2b1678..08c822f361e2c8fab0c988cf245957cd2f69cabb 100644 GIT binary patch delta 157 zcmbO-Q(?+Xg$-_hr+=KoYBc=G zR%M3zmINAC1f~=vWffLVp14tEx;#50TeI=McH@7HK+FWh%s|Wn#H>Kfw%zz2dmv+=)nDK+FQftU%1R-S{7SA|C)K CL^~S* diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 2eb779b12..713ba4198 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@types/jest": "24.0.17", + "@types/jest": "24.0.18", "@types/node": "12.7.2", "@types/react": "16.9.2", "@types/react-dom": "16.9.0", From d6f9cb86894452c4cc37d6fe8de1dd7be4f6c87c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 13:56:33 +0000 Subject: [PATCH 42/58] Bump Serilog.Extensions.Logging from 2.0.4 to 3.0.0 Bumps [Serilog.Extensions.Logging](https://github.com/serilog/serilog-extensions-logging) from 2.0.4 to 3.0.0. - [Release notes](https://github.com/serilog/serilog-extensions-logging/releases) - [Changelog](https://github.com/serilog/serilog-extensions-logging/blob/dev/CHANGES.md) - [Commits](https://github.com/serilog/serilog-extensions-logging/compare/v2.0.4...v3.0.0) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index b5c344a22..103ce2958 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -55,7 +55,7 @@ - + From 5fba62dc378eae06597516d1b5e52ece75452575 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 13:36:35 +0000 Subject: [PATCH 43/58] Bump SharpCompress from 0.23.0 to 0.24.0 Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0. - [Release notes](https://github.com/adamhathcock/sharpcompress/releases) - [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- src/FilterLists.Services/FilterLists.Services.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index 103ce2958..9b255436c 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -58,7 +58,7 @@ - + diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj index 3d0f5784a..59db0ea0c 100644 --- a/src/FilterLists.Services/FilterLists.Services.csproj +++ b/src/FilterLists.Services/FilterLists.Services.csproj @@ -31,7 +31,7 @@ - + \ No newline at end of file From 0485413b5802463583bea42ba74627e105edb533 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 13:21:36 +0000 Subject: [PATCH 44/58] Bump @types/react-router-dom from 4.3.4 to 4.3.5 in /src/FilterLists.Web Bumps [@types/react-router-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-router-dom) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-router-dom) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527508 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 08c822f361e2c8fab0c988cf245957cd2f69cabb..400053ba3907f996a3aa868e30e27bf7d0a0ca7e 100644 GIT binary patch delta 317 zcmbO-Q(?+Xg$=SlrYD6l8cn~z$H+E0^oRI#l{4(hp~=Cf`Q?QrzTQ>275PRUo{rf@<^C?dnQ89j{ze8V zW=0iJfj*H{+Ce^P5xLU?nHeP}=U(ERZ19U^@`XR#(=GT|B&JW8$O^T-_ZJ^fm}7I* zPZ_?+pID72D|}>|ex99CV|tM|qjG4fTVhslsAF(sQh-Ogk&}zBp}U1sNriS~p?i8+ zkbi(@x>>PPMvk$+Np_M;N@PTeTS{6{dZ1gHenGNRX<(RtQdU}srK692N{XRrR%T9+ zsf(xU^uQf#D%0iJ84ac{<6sn@Uck=C-u{q-5r~<9m>Gy!fS47C*?^dR`$GU*Kb8o80@04=BvBx$373-{ec;#*-C3 zvQ0nF&ZsfH$%R=tw4$gyG2EjdufjW9KO`h5)x01#-@Ve<)g-vmO+P=&tB~46#itjrGqSfo Date: Thu, 22 Aug 2019 13:24:25 +0000 Subject: [PATCH 45/58] Bump Serilog.Extensions.Logging from 3.0.0 to 3.0.1 Bumps [Serilog.Extensions.Logging](https://github.com/serilog/serilog-extensions-logging) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/serilog/serilog-extensions-logging/releases) - [Changelog](https://github.com/serilog/serilog-extensions-logging/blob/dev/CHANGES.md) - [Commits](https://github.com/serilog/serilog-extensions-logging/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Agent/FilterLists.Agent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index 9b255436c..64f889b00 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -55,7 +55,7 @@ - + From a221abe3d0d3b89c4519f0930b0d569f1b33b15f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 13:23:55 +0000 Subject: [PATCH 46/58] Bump Microsoft.AspNetCore.Mvc.Versioning from 3.1.5 to 3.1.6 Bumps [Microsoft.AspNetCore.Mvc.Versioning](https://github.com/Microsoft/aspnet-api-versioning) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/Microsoft/aspnet-api-versioning/releases) - [Commits](https://github.com/Microsoft/aspnet-api-versioning/commits) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Api/FilterLists.Api.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index e8b0413f2..770804bfd 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -43,7 +43,7 @@ - + From 71a92b0f9cf2a9d866950af8253b6956c232ba6f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 13:11:28 +0000 Subject: [PATCH 47/58] Bump react-bootstrap in /src/FilterLists.Web Bumps [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) from 1.0.0-beta.11 to 1.0.0-beta.12. - [Release notes](https://github.com/react-bootstrap/react-bootstrap/releases) - [Changelog](https://github.com/react-bootstrap/react-bootstrap/blob/master/CHANGELOG-pre1.md) - [Commits](https://github.com/react-bootstrap/react-bootstrap/compare/v1.0.0-beta.11...v1.0.0-beta.12) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527508 -> 527510 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 400053ba3907f996a3aa868e30e27bf7d0a0ca7e..e20020f3fa6adfd9cbdbb61ccc1b07d54e2b965f 100644 GIT binary patch delta 589 zcmXYt&1=(e9LBL(e-)kXMZp)u72H9H*fxDhbJC8Wm#E~zYCgHN_E4&+O02DS~a4{p}b9K5)O zPQa}gns>*a69DtrF&FChWQ%Au6&WAuC(P`K{@123!-=3ozy8_zT6@2gC F`~kma()<7b delta 580 zcmXBO&1=(e9LI6mb-#I-PeTtnVI4gvMAkIT!wM5g(>7_7G-=ngX<>&xCC&Pf#B^J? z!2~_*4~Y0>?BHJ@J`Dz5#G9v~7iILI2T^tq)SEYp9$tKopZDW~@S}t9^P^M$!_&C` z{d68)?x9FI-4q*rIW6asd|vMn8&pMdw)%yEKr)!NnyZjo*+OrtyE^Q9tzpzMT`aBT zbY|$_MyHPRe70xh?2$<)GOKNzwy0>5797@p|2g8T->&$7#%q(k{4hM;503*A!HKDf z&~bP?%~hekhe%Kr6oNw%-TK$0rIzopO0k`IiA(BYTV&@DeqCsO@mcU zk!I}Ph%x$-gRw2AhGV>4z^ryARgdnF%~qM-U_8qfXmFqXe_okcxq~keO9VJHTJXmo zIe@vT^FH=z7A_W14DJu6XJEICF2R#(@EojF&>Y-7L$k2^Hgp@#szDqUe}ryoV%Mol zY*FrbCC_y57LjM8#RQp&wo_80qo<3ltQ(g$b)sQ$tlms*3RPQi1*5_VMhsJ=bxaVG v_E6&EqFYxK1LI;G2ETqI4328SYw%`1G!1(?x&SvIu(*GsqvI2O=H08mH~Gni diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 6e0e8eb95..5408a849d 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -13,7 +13,7 @@ "es6-promise": "^4.2.8", "moment": "^2.24.0", "react": "^16.9.0", - "react-bootstrap": "^1.0.0-beta.11", + "react-bootstrap": "^1.0.0-beta.12", "react-dom": "^16.9.0", "react-router-dom": "^5.0.1", "react-scripts": "3.1.1", From ff37f90aae1985288533c507634385f98640f3be Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 18:36:51 +0000 Subject: [PATCH 48/58] [Security] Bump eslint-utils from 1.4.0 to 1.4.2 in /src/FilterLists.Web Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2. **This update includes a security fix.** - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527510 -> 527510 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index e20020f3fa6adfd9cbdbb61ccc1b07d54e2b965f..982d75abae33513648f4c188128559da9df16bf0 100644 GIT binary patch delta 147 zcmbO>Q(@Xng@zW!7N#xC`7+ZNU1l<#{y~JI(Y<^2Y7^6Iwgk~h6P7Dnde(pScV4$6?#`xhURBRR=EU)SD3j6m`t9yQMo-vmKlgyfS47C*|x{XvRl0e04g>!00000 delta 146 zcmbO>Q(@Xng@zW!7N#xC`7+ZtII|i}e=p0-K7EA@v*cv4waTI9sTp}y0f_;oo}R85 zhDC-Y*;%EYMHPh^e%V!_UWt}f#zB@wB|cs$QJ!Hb;fcvrt{Fwfu1Oj0CB?o)VHKH% u-l;(rg^uR_X=!G`;mM}qeu0IRlP7LeZjX^=24WT Date: Mon, 26 Aug 2019 16:06:10 -0400 Subject: [PATCH 49/58] Add my new facebook/messenger/instagram block list --- data/FilterList.json | 13 +++++++++++++ data/FilterListMaintainer.json | 4 ++++ data/FilterListTag.json | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 84e387e03..772df7fcf 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -19383,5 +19383,18 @@ "name": "Mmoti's Regex Filters for Pi-hole", "syntaxId": 30, "viewUrl": "https://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list" + }, + { + "id": 1819, + "description": "A programmatically expanded block list for Facebook, Messenger, and Instagram.", + "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt", + "homeUrl": "https://www.github.developerdan.com/hosts/", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Facebook Hosts", + "publishedDate": "2019-08-26T19:49:00", + "syntaxId": 1, + "updatedDate": "2019-08-26T19:49:00", + "viewUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt" } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 7ec36e715..2cefb5d34 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -4531,6 +4531,10 @@ "filterListId": 1639, "maintainerId": 139 }, + { + "filterListId": 1819, + "maintainerId": 139 + }, { "filterListid": 1470, "maintainerid": 84 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 070854f61..88e2fa6d8 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -8990,5 +8990,13 @@ { "filterListId": 1818, "tagId": 3 + }, + { + "filterListId": 1819, + "tagId": 15 + }, + { + "filterListId": 1819, + "tagId": 19 } ] From 3e16bac1720700aa0941b3ae38ab628b7dfe5306 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 26 Aug 2019 18:12:31 -0400 Subject: [PATCH 50/58] Add WhatsApp the the description --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 772df7fcf..950d477af 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -19386,7 +19386,7 @@ }, { "id": 1819, - "description": "A programmatically expanded block list for Facebook, Messenger, and Instagram.", + "description": "A programmatically expanded block list for Facebook, Messenger, Instagram, and WhatsApp", "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt", "homeUrl": "https://www.github.developerdan.com/hosts/", "issuesUrl": "https://github.com/lightswitch05/hosts/issues", From e14e71fa9ad5268e045cd9d29e4025048a29a222 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:15:31 +0000 Subject: [PATCH 51/58] Bump typescript from 3.5.3 to 3.6.2 in /src/FilterLists.Web Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.5.3 to 3.6.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.5.3...v3.6.2) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527510 -> 527510 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 982d75abae33513648f4c188128559da9df16bf0..281cdd0b30ace9e0043b03876e4456ca0b3ec036 100644 GIT binary patch delta 154 zcmbO>Q(@Xng@zW!7N!>F7M2#)7Pc+ynR$$6lM`PUPoJB|F2!gz{orR7mBgIfKocKr zFSFddQsav9)Bp?ZBLAY$@~T`vZQmfrEc1}`60Z`M#0Xc@0N=_8qipA*?3|2ryxzf{L?-@tHxBR50$fMmmLUl*e?AIG$ETU#YA1t6%^;hGl3EHb?`g-L9CdOo}U FTmbuqGLHZN delta 154 zcmbO>Q(@Xng@zW!7N!>F7M2#)7Pc+ynR$$+(-XrOji=AeW0ztyoxIUoCDGBj%Bdt* zKOiH*$;C6pEYYmk#Vf5SKg6iOKfFXg-#;(gL_ftf$KBN3*f`3^+}zC1IMPhtEXg~{ z%gL=EMLWsB)Xmtr#In#O%Qw|4Hz>Ts)kr_x)>es20SIb!xTZxhi%c&~VG`S(p3km7 F7XZWHF9QGo diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 5408a849d..ed80d9386 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -18,7 +18,7 @@ "react-router-dom": "^5.0.1", "react-scripts": "3.1.1", "react-table": "^6.10.0", - "typescript": "3.5.3" + "typescript": "3.6.2" }, "scripts": { "start": "react-scripts start", From 6bb9039777a6ef970ad3629955164f157355e666 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 12:51:10 +0000 Subject: [PATCH 52/58] Bump @types/node from 12.7.2 to 12.7.3 in /src/FilterLists.Web Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.7.2 to 12.7.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- src/FilterLists.Web/package-lock.json | Bin 527510 -> 527510 bytes src/FilterLists.Web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 281cdd0b30ace9e0043b03876e4456ca0b3ec036..c553cc344cb52fec36f3752225be005297f07db4 100644 GIT binary patch delta 154 zcmbO>Q(@Xng@!4NQ>G_{F&a(3z{kio^$erX^vNsOmBWmKGkqLAow8lRUDD0U-0}^y zO(VT3Jp#f*ElbNwO$-84wac^(d_646gS;c1GIKr3${hVGvyEM=e2ZN4LyA0ed?M2# yiV9r{i_$F(jRPw4ihR8SCky-%Z_i_71Y#y2W(HywAZ7((HXvr-p2x_c!3_Y)!7)n! delta 153 zcmbO>Q(@Xng@!4NQ>M2ZVK$n6fsc`G>KR6%=~s?0D~G03M*3@~nPp}~xt90^xFm=B z1sSGg=ZCnY8CN-a8|OGWI=NJ(8s}D-1^8EbrWPf8805HyCYFb~MdY|!R3rvQ<>nez xx;pv$>6?TUN0#a5B)UXS=Km$pp2x@t#7scU48$xz%nHP8K+L{9kC8)z8vtKQGFSir diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index ed80d9386..bb2a23593 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@types/jest": "24.0.18", - "@types/node": "12.7.2", + "@types/node": "12.7.3", "@types/react": "16.9.2", "@types/react-dom": "16.9.0", "@types/react-router-dom": "^4.3.5", From 983db8607ecce7d3ce70163c268a9fe4456daa2b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 31 Aug 2019 09:29:18 +0200 Subject: [PATCH 53/58] Added 13 lists --- data/FilterList.json | 106 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 950d477af..24c1ca095 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8303,7 +8303,7 @@ }, { "id": 819, - "description": "This list is mostly meant to be used on top of \"YouTube: Pure Video Experience\", and it removes even more (number-wise) distracting or uncomfortable things on YouTube.", + "description": "This list removes even more (number-wise) distracting or uncomfortable things on YouTube.", "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/YouTubeEvenMorePureVideoExperience.txt", "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", @@ -19396,5 +19396,109 @@ "syntaxId": 1, "updatedDate": "2019-08-26T19:49:00", "viewUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt" + }, + { + "id": 1820, + "name": "Bulgarian Host File (Adblock Plus)", + "homeUrl": "https://github.com/stilyanmihalev/BulgarianHostFile", + "issuesUrl": "https://github.com/stilyanmihalev/BulgarianHostFile/issues", + "licenseId": 2, + "syntaxId": 28, + "viewUrl": "https://raw.githubusercontent.com/stilyanmihalev/BulgarianHostFile/master/file.txt" +}, +{ + "id": 1821, + "name": "Bulgarian Host File (Hosts)", + "homeUrl": "https://github.com/stilyanmihalev/BulgarianHostFile", + "issuesUrl": "https://github.com/stilyanmihalev/BulgarianHostFile/issues", + "licenseId": 2, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/stilyanmihalev/BulgarianHostFile/master/hosts.txt" +}, +{ + "id": 1822, + "name": "Cruzit Server Blocklist", + "description": "The following list is individual IP Addresses that have attempted to attack our servers. These IP addresses are currently recommended as a DENY, REJECT or BLOCK on your firewalls.", + "homeUrl": "https://www.cruzit.com/wbl.php", + "syntaxId": 9, + "viewUrl": "https://www.cruzit.com/xxwbl2txt.php", + "donateUrl": "https://www.cruzit.com/hth.php" +}, +{ + "id": 1823, + "name": "Unsubscore Blacklist", + "syntaxId": 9, + "viewUrl": "http://www.unsubscore.com/blacklist.txt" +}, +{ + "id": 1824, + "name": "MyIP Blacklist", + "homeUrl": "https://myip.ms/", + "syntaxId": 9, + "viewUrl": "https://myip.ms/files/blacklist/general/latest_blacklist.txt", + "donateUrl": "bitcoin:1FzxJBxy3fJDv5PLGqbdN9TrQ79LE9UEtB" +}, +{ + "id": 1825, + "name": "hpHosts PHA (IPs)", + "description": "Sites engaged in illegal pharmacy activities.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_pha.ipset" +}, +{ + "id": 1826, + "name": "hpHosts HJK (IPs)", + "description": "Sites engaged in browser hijacking or other forms of hijacking (OS services, bandwidth, DNS, etc.).", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_HJK.ipset" +}, +{ + "id": 1827, + "name": "hpHosts FSA (IPs)", + "description": "Sites engaged in the selling or distribution of bogus or fraudulent applications and/or provision of fraudulent services.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_fsa.ipset" +}, +{ + "id": 1828, + "name": "hpHosts GRM (IPs)", + "description": "Sites engaged in astroturfing (otherwise known as grass roots marketing) or spamming.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_grm.ipset" +}, +{ + "id": 1829, + "name": "hpHosts EXP (IPs)", + "description": "Sites engaged in the housing, development or distribution of exploits, including but not limited to exploitation of browser, software (inclusive of website software such as CMS), operating system exploits as well as those engaged in exploits via social engineering.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_exp.ipset" +}, +{ + "id": 1830, + "name": "hpHosts EMD (IPs)", + "description": "Sites engaged in malware distribution.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_emd.ipset" +}, +{ + "id": 1831, + "name": "hpHosts ATS (IPs)", + "description": "This classification is assigned for domains being used for advert or tracking purposes.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_exp.ipset" +}, + { + "id": 1832, + "description": "Pepe the Frog, while beloved by many internet memers, has also become the go-to symbol of many horrendous alt-right movements, culminating in Frenworld and Clown World. If you're worried that people who use him do not have the best intentions, this is how to avoid both him and them.", + "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": 35, + "name": "Anti-Pepe List", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPepeList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPepeList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPepeList.txt" } ] From 3d6359244030256d7ff1c6ca75f51bc8e6295675 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 31 Aug 2019 09:32:05 +0200 Subject: [PATCH 54/58] Update FilterListTag.json --- data/FilterListTag.json | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 88e2fa6d8..96c5b5f9c 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -8998,5 +8998,65 @@ { "filterListId": 1819, "tagId": 19 + }, + { + "filterListId": 1820, + "tagId": 2 + }, + { + "filterListId": 1821, + "tagId": 2 + }, + { + "filterListId": 1822, + "tagId": 6 + }, + { + "filterListId": 1823, + "tagId": 6 + }, + { + "filterListId": 1824, + "tagId": 6 + }, + { + "filterListId": 1825, + "tagId": 7 + }, + { + "filterListId": 1826, + "tagId": 6 + }, + { + "filterListId": 1827, + "tagId": 6 + }, + { + "filterListId": 1828, + "tagId": 7 + }, + { + "filterListId": 1829, + "tagId": 6 + }, + { + "filterListId": 1830, + "tagId": 6 + }, + { + "filterListId": 1831, + "tagId": 2 + }, + { + "filterListId": 1831, + "tagId": 3 + }, + { + "filterListId": 1832, + "tagId": 18 + }, + { + "filterListId": 1832, + "tagId": 30 } ] From cb76ed79e7581e7ec43c0d5be8144ad92b175960 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 31 Aug 2019 09:32:55 +0200 Subject: [PATCH 55/58] Update FilterListLanguage.json --- data/FilterListLanguage.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 0b2c08423..6d1013f97 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -2370,5 +2370,13 @@ { "filterListId": 1817, "languageId": 11 + }, + { + "filterListId": 1820, + "languageId": 113 + }, + { + "filterListId": 1821, + "languageId": 113 } ] From b9cde7ad25fffe51437100847a407e08ef0d4187 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 31 Aug 2019 09:34:31 +0200 Subject: [PATCH 56/58] Update FilterListMaintainer.json --- data/FilterListMaintainer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 2cefb5d34..3f7cacc4f 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -859,6 +859,10 @@ "filterListId": 1815, "maintainerId": 22 }, + { + "filterListId": 1832, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 From 384f907cd7fba1253be6f926b1fe395d265dea89 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 2 Sep 2019 14:32:30 -0500 Subject: [PATCH 57/58] try new docker account ref #929 --- docker-compose.agent.tests.yml | 4 ++-- docker-compose.data.tests.yml | 4 ++-- docker-compose.services.tests.yml | 4 ++-- docker-compose.yml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.agent.tests.yml b/docker-compose.agent.tests.yml index aa53c2b07..f3c6cfd2c 100644 --- a/docker-compose.agent.tests.yml +++ b/docker-compose.agent.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: agent: - image: collinbarrett/filterlists.agent:test-agent + image: collinbarrett2/filterlists.agent:test-agent build: context: . dockerfile: src/FilterLists.Agent/Dockerfile @@ -14,7 +14,7 @@ services: networks: test-agent: - + volumes: test-agent-results: external: true diff --git a/docker-compose.data.tests.yml b/docker-compose.data.tests.yml index 3e45a5d68..0544bf5a3 100644 --- a/docker-compose.data.tests.yml +++ b/docker-compose.data.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: api: - image: collinbarrett/filterlists.api:test-data + image: collinbarrett2/filterlists.api:test-data build: context: . dockerfile: src/FilterLists.Api/Dockerfile @@ -27,7 +27,7 @@ services: [ "mysqld", "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_520_ci" + "--collation-server=utf8mb4_unicode_520_ci", ] networks: diff --git a/docker-compose.services.tests.yml b/docker-compose.services.tests.yml index 52f472ec5..9dd00b976 100644 --- a/docker-compose.services.tests.yml +++ b/docker-compose.services.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: api: - image: collinbarrett/filterlists.api:test-services + image: collinbarrett2/filterlists.api:test-services build: context: . dockerfile: src/FilterLists.Api/Dockerfile @@ -14,7 +14,7 @@ services: networks: test-services: - + volumes: test-services-results: external: true diff --git a/docker-compose.yml b/docker-compose.yml index 37d8826e7..ff7afac2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - ./ops/nginx/svr-includes:/etc/nginx/svr-includes:ro web: - image: collinbarrett/filterlists.web:latest + image: collinbarrett2/filterlists.web:latest restart: always build: context: . @@ -23,7 +23,7 @@ services: - reverse-proxy api: - image: collinbarrett/filterlists.api:latest + image: collinbarrett2/filterlists.api:latest restart: always build: context: . @@ -53,11 +53,11 @@ services: [ "mysqld", "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_520_ci" + "--collation-server=utf8mb4_unicode_520_ci", ] agent: - image: collinbarrett/filterlists.agent:latest + image: collinbarrett2/filterlists.agent:latest build: context: . dockerfile: src/FilterLists.Agent/Dockerfile From fc3f234c71926023b8f9f983566953307f130c0a Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 2 Sep 2019 14:41:19 -0500 Subject: [PATCH 58/58] update docker account in readme --- .github/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/README.md b/.github/README.md index 590d35a0f..0729a5070 100644 --- a/.github/README.md +++ b/.github/README.md @@ -12,20 +12,20 @@ Azure DevOps builds Azure DevOps tests Azure DevOps releases -Docker Pulls +Docker Pulls
An ASP.NET Core API CRUD-ing with a MariaDB instance via EF Core.

Website: Website Azure DevOps builds Azure DevOps releases -Docker Pulls +Docker Pulls
A React & TypeScript UI primarily featuring a react-table instance.

Agent: Azure DevOps builds Azure DevOps tests Azure DevOps releases -Docker Pulls +Docker Pulls
A .NET Core console application performing crawling, archiving, and URL validation.

# Background @@ -128,10 +128,10 @@ The Agent takes the following command line arguments: # Acknowledgements - - Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor - - Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists - - Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists - - [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors) +- Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor +- Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists +- Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists +- [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors) # Miscellany @@ -152,4 +152,4 @@ We respect your privacy. That is the whole point of this project. The only minor ## Internet Explorer -FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. \ No newline at end of file +FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9.