Merge pull request #562 from DandelionSprout/patch-41

Thursday daytime pull
This commit is contained in:
Collin M. Barrett 2018-10-04 13:07:32 +00:00 committed by GitHub
commit 8723ef5717
7 changed files with 443 additions and 3 deletions

View file

@ -2715,12 +2715,14 @@
{
"id": 251,
"description": "Blocks English and Spanish regional advertisements and trackers.",
"discontinuedDate": "2013-10-26T00:00:00",
"homeUrl": "https://nauscopio.wordpress.com/2010/07/05/filtrado-bloqueo-y-ocultacion-de-la-publicidad-en-google-chrome/",
"issuesUrl": "https://github.com/mozillahispano/nauscopio-filtros/issues",
"licenseId": 6,
"name": "Filtros Nauscopicos",
"syntaxId": 3,
"viewUrl": "https://raw.githubusercontent.com/mozillahispano/nauscopio-filtros/master/filtros.txt"
"viewUrl": "http://abp.mozilla-hispano.org/nauscopio/filtros.txt",
"viewUrlMirror1": "https://raw.githubusercontent.com/mozillahispano/nauscopio-filtros/master/filtros.txt"
},
{
"id": 252,
@ -8553,5 +8555,25 @@
"syntaxId": 4,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt",
"viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt"
},
{
"id": 817,
"description": "This file is in hosts file format and works best when used in for example pi-hole, routers, etc. It aims to reduce your exposure to ads, tracking, scams & badware, and occasionally some annoyances on (mostly) Swedish websites. As always with hosts file, use at your own risk and make sure that you know what you're doing. This is not as powerful as the filter list for uBO.",
"descriptionSourceUrl": "https://github.com/lassekongo83/Frellwits-filter-lists#available-lists",
"homeUrl": "https://github.com/lassekongo83/Frellwits-filter-lists",
"issuesUrl": "https://github.com/lassekongo83/Frellwits-filter-lists/issues",
"licenseId": 4,
"name": "Frellwit's Swedish Filter",
"syntaxId": 1,
"viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Hosts-File.txt"
},
{
"id": 818,
"homeUrl": "https://github.com/mediumkreation/IndianList",
"issuesUrl": "https://github.com/mediumkreation/IndianList/issues",
"licenseId": 3,
"name": "IndianList",
"syntaxId": 3,
"viewUrl": "https://easylist-downloads.adblockplus.org/indianlist.txt"
}
]

View file

@ -1094,5 +1094,21 @@
{
"filterListId": 815,
"languageId": 141
},
{
"filterListId": 817,
"languageId": 83
},
{
"filterListId": 818,
"languageId": 85
},
{
"filterListId": 818,
"languageId": 144
},
{
"filterListId": 818,
"languageId": 175
}
]

View file

@ -1854,5 +1854,313 @@
{
"filterListId": 686,
"maintainerId": 82
}
},
{
"filterListId": 11,
"maintainerId": 7
},
{
"filterListId": 11,
"maintainerId": 13
},
{
"filterListId": 11,
"maintainerId": 12
},
{
"filterListId": 11,
"maintainerId": 11
},
{
"filterListId": 13,
"maintainerId": 7
},
{
"filterListId": 13,
"maintainerId": 13
},
{
"filterListId": 13,
"maintainerId": 12
},
{
"filterListId": 39,
"maintainerId": 102
},
{
"filterListId": 56,
"maintainerId": 7
},
{
"filterListId": 56,
"maintainerId": 102
},
{
"filterListId": 116,
"maintainerId": 96
},
{
"filterListId": 117,
"maintainerId": 7
},
{
"filterListId": 117,
"maintainerId": 96
},
{
"filterListId": 118,
"maintainerId": 96
},
{
"filterListId": 133,
"maintainerId": 7
},
{
"filterListId": 133,
"maintainerId": 92
},
{
"filterListId": 184,
"maintainerId": 14
},
{
"filterListId": 197,
"maintainerId": 7
},
{
"filterListId": 219,
"maintainerId": 101
},
{
"filterListId": 230,
"maintainerId": 101
},
{
"filterListId": 231,
"maintainerId": 101
},
{
"filterListId": 248,
"maintainerId": 7
},
{
"filterListId": 248,
"maintainerId": 99
},
{
"filterListId": 267,
"maintainerId": 99
},
{
"filterListId": 269,
"maintainerId": 7
},
{
"filterListId": 283,
"maintainerId": 7
},
{
"filterListId": 283,
"maintainerId": 100
},
{
"filterListId": 284,
"maintainerId": 100
},
{
"filterListId": 290,
"maintainerId": 7
},
{
"filterListId": 290,
"maintainerId": 97
},
{
"filterListId": 291,
"maintainerId": 97
},
{
"filterListId": 292,
"maintainerId": 7
},
{
"filterListId": 294,
"maintainerId": 7
},
{
"filterListId": 296,
"maintainerId": 101
},
{
"filterListId": 297,
"maintainerId": 7
},
{
"filterListId": 297,
"maintainerId": 52
},
{
"filterListId": 299,
"maintainerId": 7
},
{
"filterListId": 299,
"maintainerId": 98
},
{
"filterListId": 300,
"maintainerId": 98
},
{
"filterListId": 449,
"maintainerId": 105
},
{
"filterListId": 450,
"maintainerId": 105
},
{
"filterListId": 451,
"maintainerId": 105
},
{
"filterListId": 507,
"maintainerId": 7
},
{
"filterListId": 734,
"maintainerId": 38
},
{
"filterListId": 756,
"maintainerId": 102
},
{
"filterListId": 773,
"maintainerId": 7
},
{
"filterListId": 775,
"maintainerId": 7
},
{
"filterListId": 775,
"maintainerId": 99
},
{
"filterListId": 776,
"maintainerId": 7
},
{
"filterListId": 776,
"maintainerId": 100
},
{
"filterListId": 777,
"maintainerId": 7
},
{
"filterListId": 777,
"maintainerId": 102
},
{
"filterListId": 778,
"maintainerId": 7
},
{
"filterListId": 779,
"maintainerId": 7
},
{
"filterListId": 780,
"maintainerId": 7
},
{
"filterListId": 780,
"maintainerId": 97
},
{
"filterListId": 781,
"maintainerId": 7
},
{
"filterListId": 781,
"maintainerId": 98
},
{
"filterListId": 782,
"maintainerId": 7
},
{
"filterListId": 783,
"maintainerId": 7
},
{
"filterListId": 783,
"maintainerId": 96
},
{
"filterListId": 784,
"maintainerId": 7
},
{
"filterListId": 786,
"maintainerId": 7
},
{
"filterListId": 786,
"maintainerId": 13
},
{
"filterListId": 786,
"maintainerId": 12
},
{
"filterListId": 787,
"maintainerId": 7
},
{
"filterListId": 787,
"maintainerId": 92
},
{
"filterListId": 788,
"maintainerId": 13
},
{
"filterListId": 788,
"maintainerId": 12
},
{
"filterListId": 792,
"maintainerId": 7
},
{
"filterListId": 794,
"maintainerId": 98
},
{
"filterListId": 798,
"maintainerId": 7
},
{
"filterListId": 798,
"maintainerId": 13
},
{
"filterListId": 798,
"maintainerId": 12
},
{
"filterListId": 798,
"maintainerId": 11
},
{
"filterListId": 800,
"maintainerId": 7
},
{
"filterListId": 817,
"maintainerId": 64
}
]

View file

@ -1093,7 +1093,7 @@
},
{
"filterListId": 226,
"tagId": 4
"tagId": 2
},
{
"filterListId": 227,
@ -3794,5 +3794,25 @@
{
"filterListId": 816,
"tagId": 15
},
{
"filterListId": 817,
"tagId": 2
},
{
"filterListId": 817,
"tagId": 3
},
{
"filterListId": 817,
"tagId": 6
},
{
"filterListId": 817,
"tagId": 7
},
{
"filterListId": 818,
"tagId": 2
}
]

View file

@ -495,5 +495,57 @@
{
"id": 95,
"name": "k2japan"
},
{
"id": 96,
"emailAddress": "blog@zoso.ro",
"homeUrl": "https://www.zoso.ro/",
"name": "Zoso",
"twitterHandle": "zoso"
},
{
"id": 97,
"name": "BsT"
},
{
"id": 98,
"name": "John and Li"
},
{
"id": 99,
"homeUrl": "https://margevicius.lt/",
"name": "gymka"
},
{
"id": 100,
"homeUrl": "https://stanev.org/",
"name": "Alex Stanev"
},
{
"id": 101,
"homeUrl": "https://blogram.net/",
"name": "BLOGRAM"
},
{
"id": 102,
"homeUrl": "https://notabug.org/anonymous74100?tab=activity",
"name": "anonymous74100"
},
{
"id": 103,
"emailAddress": "costa@firehol.org",
"homeUrl": "https://firehol.org/",
"name": "FireHOL"
},
{
"id": 104,
"emailAddress": "mail@perflyst.de",
"homeUrl": "https://github.com/Perflyst",
"name": "Perflyst"
},
{
"id": 105,
"homeUrl": "https://github.com/crazy-max",
"name": "CrazyMax"
}
]

View file

@ -151,5 +151,19 @@
"homeUrl": "http://www.thekelleys.org.uk/dnsmasq/doc.html",
"isAbpSubscribable": false,
"name": "dnsmasq"
},
{
"id": 24,
"downloadUrl": "https://www.slimjet.com/en/dlpage.php",
"homeUrl": "https://www.slimjet.com",
"isAbpSubscribable": true,
"name": "Slimjet"
},
{
"id": 25,
"downloadUrl": "https://github.com/gorhill/uMatrix#umatrix",
"homeUrl": "https://github.com/gorhill/uMatrix",
"isAbpSubscribable": true,
"name": "uMatrix"
}
]

View file

@ -87,6 +87,10 @@
"softwareId": 15,
"syntaxId": 3
},
{
"softwareId": 24,
"syntaxId": 3
},
{
"softwareId": 1,
"syntaxId": 4
@ -119,6 +123,10 @@
"softwareId": 5,
"syntaxId": 7
},
{
"softwareId": 25,
"syntaxId": 7
},
{
"softwareId": 1,
"syntaxId": 8