Merge pull request #489 from DandelionSprout/patch-20

Sunday afternoon pull
This commit is contained in:
Collin M. Barrett 2018-09-16 16:06:25 +00:00 committed by GitHub
commit 1af5a78085
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 13 deletions

View file

@ -5601,7 +5601,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"syntaxId": 4,
"viewUrl": "https://mirror1.malwaredomains.com/files/bulk_registrars.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
@ -5916,7 +5916,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"syntaxId": 2,
"viewUrl": "https://mirror1.malwaredomains.com/files/dynamic_dns.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
@ -5937,7 +5937,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"syntaxId": 2,
"viewUrl": "https://mirror1.malwaredomains.com/files/freewebhosts.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
@ -5958,7 +5958,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"syntaxId": 2,
"viewUrl": "https://mirror1.malwaredomains.com/files/justdomains",
"viewUrlMirror1": "https://mirror.cedia.org.ec/malwaredomains/justdomains",
"viewUrlMirror2": null
@ -5979,7 +5979,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"syntaxId": 2,
"viewUrl": "https://mirror1.malwaredomains.com/files/immortal_domains.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
@ -7071,7 +7071,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 1,
"syntaxId": 14,
"viewUrl": "https://raw.githubusercontent.com/Lerist/Go-Hosts/master/hosts",
"viewUrlMirror1": null,
"viewUrlMirror2": null
@ -8919,7 +8919,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 1,
"syntaxId": 14,
"viewUrl": "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts",
"viewUrlMirror1": "https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts-files/hosts",
"viewUrlMirror2": null

View file

@ -38,7 +38,7 @@
"id": 6,
"downloadUrl": "https://getadblock.com/",
"homeUrl": "https://getadblock.com/",
"isAbpSubscribable": false,
"isAbpSubscribable": true,
"name": "AdBlock"
},
{
@ -94,7 +94,7 @@
"id": 15,
"downloadUrl": "https://www.ublock.org/",
"homeUrl": "https://www.ublock.org/",
"isAbpSubscribable": false,
"isAbpSubscribable": true,
"name": "uBlock"
},
{
@ -110,5 +110,12 @@
"homeUrl": "https://www.jeffersonscher.com/gm/google-hit-hider/",
"isAbpSubscribable": false,
"name": "Google Hit Hider by Domain"
},
{
"id": 18,
"downloadUrl": "https://firehol.org/installing/",
"homeUrl": "https://firehol.org/",
"isAbpSubscribable": false,
"name": "FireHOL"
}
]
]

View file

@ -103,6 +103,14 @@
"softwareId": 5,
"syntaxId": 6
},
{
"softwareId": 1,
"syntaxId": 7
},
{
"softwareId": 5,
"syntaxId": 7
},
{
"softwareId": 1,
"syntaxId": 8
@ -119,6 +127,10 @@
"softwareId": 5,
"syntaxId": 9
},
{
"softwareId": 18,
"syntaxId": 9
},
{
"softwareId": 16,
"syntaxId": 10
@ -134,5 +146,21 @@
{
"softwareId": 13,
"syntaxId": 13
},
{
"softwareId": 7,
"syntaxId": 14
},
{
"softwareId": 11,
"syntaxId": 14
},
{
"softwareId": 12,
"syntaxId": 14
},
{
"softwareId": 18,
"syntaxId": 15
}
]

View file

@ -2,7 +2,7 @@
{
"id": 1,
"definitionUrl": "https://en.wikipedia.org/wiki/Hosts_(file)",
"name": "Hosts"
"name": "Hosts (localhost)"
},
{
"id": 2,
@ -37,7 +37,7 @@
{
"id": 9,
"definitionUrl": null,
"name": "IPs"
"name": "IPs (Singular or singular+range)"
},
{
"id": 10,
@ -58,5 +58,15 @@
"id": 13,
"definitionUrl": "https://github.com/xd4rker/MinerBlock",
"name": "MinerBlock"
},
{
"id": 14,
"definitionUrl": "https://en.wikipedia.org/wiki/Hosts_(file)",
"name": "Non-localhost hosts"
},
{
"id": 15,
"definitionUrl": null,
"name": "IPs (Range-only)"
}
]
]