From e9daee4d067fd0c1a3cc8d536e0b02aa435c9b72 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 15:50:15 +0200 Subject: [PATCH 1/8] Updating some values --- data/FilterList.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 8751ea6fc..628386bba 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1107,7 +1107,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 1, "viewUrl": "https://gmbksfilters.googlecode.com/hg/hosts_adonly.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -2829,7 +2829,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 4, + "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -3102,7 +3102,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "http://www.sa-blacklist.stearns.org/sa-blacklist/sa-blacklist.current.domains", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -8268,7 +8268,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 4, + "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -8940,7 +8940,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 4, + "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/i-dont-want-your-app.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -9087,7 +9087,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 4, + "syntaxId": 2, "viewUrl": "https://blocklist.kowabit.de/list.txt", "viewUrlMirror1": "https://v.firebog.net/hosts/Kowabit.txt", "viewUrlMirror2": null @@ -10229,8 +10229,8 @@ { "id": 511, "chatUrl": null, - "description": "Custom filters allow you to block popular trackers, banners, download and display ads on site pages and in search results", - "descriptionSourceUrl": "https://raw.githubusercontent.com/bogachenko/personalfilters/master/personalfilters.txt", + "description": "Custom filters allow you to block popular trackers, banners, download and do not display ads on site pages and in search results", + "descriptionSourceUrl": "https://raw.githubusercontent.com/bogachenko/personalfilters/master/repository.txt", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, @@ -10243,7 +10243,7 @@ "publishedDate": "2017-12-03T00:00:00", "submissionUrl": null, "syntaxId": 4, - "viewUrl": "https://raw.githubusercontent.com/bogachenko/personalfilters/master/personalfilters.txt", + "viewUrl": "https://raw.githubusercontent.com/bogachenko/personalfilters/master/repository.txt", "viewUrlMirror1": null, "viewUrlMirror2": null }, @@ -13203,9 +13203,9 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/nmtrung/FMSF-2.0/master/fmsf_2.0.txt", "viewUrlMirror1": null, "viewUrlMirror2": null } -] \ No newline at end of file +] From 5e777dba7bec17f4e0a7470d32b137fab0600b62 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 16:04:19 +0200 Subject: [PATCH 2/8] Added 6 new lists --- data/FilterList.json | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 628386bba..8e4226608 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -13207,5 +13207,131 @@ "viewUrl": "https://raw.githubusercontent.com/nmtrung/FMSF-2.0/master/fmsf_2.0.txt", "viewUrlMirror1": null, "viewUrlMirror2": null + }, + { + "id": 664, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/r-a-y/mobile-hosts", + "issuesUrl": "https://github.com/r-a-y/mobile-hosts/issues", + "licenseId": 4, + "name": "Adguard Mobile Ads (hosts)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardMobileAds.txt", + "viewUrlMirror1": null, + "viewUrlMirror2": null + }, + { + "id": 665, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/r-a-y/mobile-hosts", + "issuesUrl": "https://github.com/r-a-y/mobile-hosts/issues", + "licenseId": 4, + "name": "Adguard Mobile Tracking and Spyware (hosts)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardMobileSpyware.txt", + "viewUrlMirror1": null, + "viewUrlMirror2": null + }, + { + "id": 666, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/r-a-y/mobile-hosts", + "issuesUrl": "https://github.com/r-a-y/mobile-hosts/issues", + "licenseId": 4, + "name": "Adguard Specific Apps (hosts)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardApps.txt", + "viewUrlMirror1": null, + "viewUrlMirror2": null + }, + { + "id": 667, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/r-a-y/mobile-hosts", + "issuesUrl": "https://github.com/r-a-y/mobile-hosts/issues", + "licenseId": 4, + "name": "Adguard DNS (hosts)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardDNS.txt", + "viewUrlMirror1": null, + "viewUrlMirror2": null + }, + { + "id": 668, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/10ZiN/10ZiN.github.io", + "issuesUrl": null, + "licenseId": 5, + "name": "iOS/Mobile Host Database", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://tgc.cloud/downloads/iOSAds.txt", + "viewUrlMirror1": "https://raw.githubusercontent.com/10ZiN/10ZiN.github.io/master/downloads/iOSAds.txt", + "viewUrlMirror2": null + }, + { + "id": 669, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/10ZiN/10ZiN.github.io", + "issuesUrl": null, + "licenseId": 5, + "name": "10ZiN Host Database (Full)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://tgc.cloud/downloads/hosts.txt", + "viewUrlMirror1": "https://raw.githubusercontent.com/10ZiN/10ZiN.github.io/master/downloads/hosts.txt", + "viewUrlMirror2": null } ] From dc49ced0087346fbc83aa559570208f0a2e6c690 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 16:19:57 +0200 Subject: [PATCH 3/8] Added logos for two software tools --- .../components/softwareIcon/imgs/12-Gas-Mask.png | Bin 0 -> 3212 bytes .../softwareIcon/imgs/19-Samsung-Knox.png | Bin 0 -> 3189 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png new file mode 100644 index 0000000000000000000000000000000000000000..2fcd90a06514f641c2f36e3c4e33c1fc9ea7b4a2 GIT binary patch literal 3212 zcmV;740H2|P)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000Uv 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 byF~y$elbz%D7hvt00000NkvXXu0mjf7IN+p literal 0 HcmV?d00001 From 634179dea3b2f6d9e782fed3d31877fda96fdd14 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 16:21:47 +0200 Subject: [PATCH 4/8] Update index.ts --- .../modules/home/components/softwareIcon/imgs/index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts index 108ab0b84..4c845ba56 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts @@ -7,11 +7,13 @@ import img6 from "./06-AdBlock.png"; import img7 from "./07-AdAway.png"; import img8 from "./08-Personal-Blocklist.png"; import img10 from "./10-Redirector.png"; +import img12 from "./12-Gas-Mask.png"; import img13 from "./13-MinerBlock.svg"; import img14 from "./14-Pi-hole.png"; import img15 from "./15-uBlock.svg"; import img16 from "./16-Internet-Explorer-TPL.png"; import img18 from "./18-FireHOL.png"; +import img19 from "./19-Samsung-Knox.png"; export { img1, @@ -23,9 +25,11 @@ export { img7, img8, img10, + img12, img13, img14, img15, img16, - img18 - }; \ No newline at end of file + img18, + img19 + }; From 065c7b010204c761a6c2bd7ead5e6ee171cf0482 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 16:26:10 +0200 Subject: [PATCH 5/8] Adding non-contentious parts of #493, part 1 --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 8e4226608..32a9e4361 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7260,7 +7260,7 @@ "policyUrl": null, "publishedDate": "2017-10-23T00:00:00", "submissionUrl": "https://polishannoyancefilters.netlify.com/issues", - "syntaxId": 6, + "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PPB_uBlock_AdGuard.txt", "viewUrlMirror1": null, "viewUrlMirror2": null From 8da2a0651c92ecc615243ff867c4580268a6188b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 16:33:37 +0200 Subject: [PATCH 6/8] I feel slightly embarrassed right now --- data/SoftwareSyntax.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 9b56a4b25..25a6464be 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -3,6 +3,10 @@ "softwareId": 1, "syntaxId": 1 }, + { + "softwareId": 4, + "syntaxId": 1 + }, { "softwareId": 5, "syntaxId": 1 @@ -67,10 +71,6 @@ "softwareId": 3, "syntaxId": 3 }, - { - "softwareId": 4, - "syntaxId": 3 - }, { "softwareId": 5, "syntaxId": 3 From 9de8f18579bfbac47a4e07e146d308c9e207dc90 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 18:32:55 +0200 Subject: [PATCH 7/8] Corrected one description --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 32a9e4361..3370fc1ec 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -10229,7 +10229,7 @@ { "id": 511, "chatUrl": null, - "description": "Custom filters allow you to block popular trackers, banners, download and do not display ads on site pages and in search results", + "description": "Custom filters allow you to block malicious sites, popular trackers, banners, delete and do not display ads on the site and in search results", "descriptionSourceUrl": "https://raw.githubusercontent.com/bogachenko/personalfilters/master/repository.txt", "discontinuedDate": null, "donateUrl": null, From 20761fb167c806c0a232a924e58fe220c45ab58c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Sep 2018 19:57:40 +0200 Subject: [PATCH 8/8] Attempted to add them to SoftwareIcon.tsx --- .../home/components/softwareIcon/SoftwareIcon.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index ec9d6bef8..8895e8175 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -9,11 +9,13 @@ import { img7, img8, img10, + img12, img13, img14, img15, img16, - img18 + img18, + img19 } from "./imgs"; interface IProps { @@ -44,9 +46,11 @@ const icons: { [id: number]: IIcon; } = { 7: { image: img7, imageTitle: "AdAway" }, 8: { image: img8, imageTitle: "Personal Blocklist" }, 10: { image: img10, imageTitle: "Redirector" }, + 12: { image: img12, imageTitle: "Gas Mask" }, 13: { image: img13, imageTitle: "MinerBlock" }, 14: { image: img14, imageTitle: "Pi-hole" }, 15: { image: img15, imageTitle: "uBlock" }, 16: { image: img16, imageTitle: "Internet Explorer (TPL)" }, - 18: { image: img18, imageTitle: "FireHOL" } -}; \ No newline at end of file + 18: { image: img18, imageTitle: "FireHOL" }, + 19: { image: img19, imageTitle: "Samsung Knox" } +};