diff --git a/data/FilterList.json b/data/FilterList.json index 54fcb5fd2..8f37f4431 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 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, "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,135 @@ "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 + }, + { + "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 } -] \ No newline at end of file +] 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" } +}; 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 000000000..2fcd90a06 Binary files /dev/null and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/12-Gas-Mask.png differ diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png new file mode 100644 index 000000000..2a8b4b9d4 Binary files /dev/null and b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/19-Samsung-Knox.png differ 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 + };