mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cherry-pick: all: filters json 

Merge in DNS/adguard-home from 4581-filters-json to master

Squashed commit of the following:

commit da0b86983432ac1791645da328df5848daac5ea6
Merge: 62fa4fc6 a82ec09a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed May 25 12:58:25 2022 +0200

    Merge remote-tracking branch 'origin/master' into 4581-filters-json

commit 62fa4fc6ff150ebb8dbd8888a58819fb644d43ad
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed May 25 11:55:52 2022 +0200

    all: filters json

commit 96486ffbb41947b5e748f6e35eb96ee73867eba1
Merge: 9956f0af c0ac82be
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue May 24 15:57:52 2022 +0200

    Merge branch 'master' into 4581-filters-json

commit 9956f0aff1b7029f336d22013a62f2871a964322
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue May 24 15:53:43 2022 +0200

    all: filters json
This commit is contained in:
Dimitry Kolyshev 2022-05-25 14:31:32 +03:00 committed by Ainar Garipov
parent 66f53803af
commit bccbecc6ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/helpers/filters/filters.json
View File

@ -81,8 +81,8 @@
"urlhaus-filter-online": { "urlhaus-filter-online": {
"name": "Online Malicious URL Blocklist", "name": "Online Malicious URL Blocklist",
"categoryId": "security", "categoryId": "security",
"homepage": "https://gitlab.com/curben/urlhaus-filter", "homepage": "https://gitlab.com/malware-filter/urlhaus-filter",
"source": "https://curben.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt" "source": "https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
}, },
"dandelion-sprouts-anti-malware-list": { "dandelion-sprouts-anti-malware-list": {
"name": "Dandelion Sprout's Anti-Malware List", "name": "Dandelion Sprout's Anti-Malware List",