Merge pull request #383 from DandelionSprout/patch-7

Thursday night pull
This commit is contained in:
Collin M. Barrett 2018-08-24 00:06:26 +00:00 committed by GitHub
commit 246e8d2018
3 changed files with 297 additions and 6 deletions

View file

@ -8902,7 +8902,7 @@
"forumUrl": null,
"homeUrl": "https://easylist.to",
"issuesUrl": "easylist.polish@gmail.com",
"licenseId": 3,
"licenseId": 4,
"name": "EasyList Polish",
"policyUrl": null,
"publishedDate": null,
@ -8926,7 +8926,7 @@
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
"syntaxId": 4,
"viewUrl": "https://github.com/yecarrillo/adblock-colombia/raw/master/adblock_co.txt"
},
{
@ -9365,5 +9365,62 @@
"submissionUrl": null,
"syntaxId": 1,
"viewUrl": "https://adzhosts.eu/hosts/adzhosts-as-mac-linux.txt"
},
{
"id": 504,
"chatUrl": null,
"description": "This serves as a template and guidance for people who want to learn how to make their own adblock lists. This template contains the bare-bones necessities; the 'Novice' version has more tags and explanations.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"forumUrl": null,
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 10,
"name": "Adblock List Template (Beginner)",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Adblock%20list%20templates/Adblock%20list%20template%20-Beginner-.txt"
},
{
"id": 505,
"chatUrl": null,
"description": "This serves as a template and guidance for people who want to learn how to make their own adblock lists. This template contains all conventionally used tags; the 'Beginner' version is easier to deal with.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"forumUrl": null,
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 10,
"name": "Adblock List Template (Novice)",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Adblock%20list%20templates/Adblock%20list%20template%20-Novice-.txt"
},
{
"id": 506,
"chatUrl": null,
"description": "Allow nonintrusive advertising without third-party tracking",
"descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt",
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "info@eyeo.com",
"forumUrl": null,
"homeUrl": "https://acceptableads.com/",
"issuesUrl": null,
"licenseId": 5,
"name": "Acceptable Ads",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt"
}
]
]

View file

@ -1,8 +1,32 @@
[
{
"filterListId": 5,
"tagId": 15
},
{
"filterListId": 19,
"tagId": 1
},
{
"filterListId": 33,
"tagId": 16
},
{
"filterListId": 38,
"tagId": 15
},
{
"filterListId": 70,
"tagId": 8
},
{
"filterListId": 71,
"tagId": 8
},
{
"filterListId": 83,
"tagId": 5
},
{
"filterListId": 94,
"tagId": 10
@ -23,6 +47,62 @@
"filterListId": 145,
"tagId": 10
},
{
"filterListId": 151,
"tagId": 10
},
{
"filterListId": 153,
"tagId": 4
},
{
"filterListId": 155,
"tagId": 10
},
{
"filterListId": 159,
"tagId": 4
},
{
"filterListId": 175,
"tagId": 8
},
{
"filterListId": 184,
"tagId": 4
},
{
"filterListId": 207,
"tagId": 5
},
{
"filterListId": 214,
"tagId": 5
},
{
"filterListId": 223,
"tagId": 4
},
{
"filterListId": 224,
"tagId": 4
},
{
"filterListId": 225,
"tagId": 4
},
{
"filterListId": 226,
"tagId": 4
},
{
"filterListId": 227,
"tagId": 10
},
{
"filterListId": 229,
"tagId": 4
},
{
"filterListId": 238,
"tagId": 10
@ -31,18 +111,102 @@
"filterListId": 270,
"tagId": 14
},
{
"filterListId": 285,
"tagId": 14
},
{
"filterListId": 286,
"tagId": 14
},
{
"filterListId": 303,
"tagId": 14
},
{
"filterListId": 306,
"tagId": 15
},
{
"filterListId": 308,
"tagId": 1
},
{
"filterListId": 318,
"tagId": 1
},
{
"filterListId": 327,
"tagId": 9
},
{
"filterListId": 332,
"tagId": 16
},
{
"filterListId": 333,
"tagId": 13
},
{
"filterListId": 339,
"filterListId": 340,
"tagId": 12
},
{
"filterListId": 343,
"tagId": 8
},
{
"filterListId": 356,
"tagId": 9
},
{
"filterListId": 357,
"tagId": 1
},
{
"filterListId": 358,
"tagId": 1
},
{
"filterListId": 359,
"tagId": 1
},
{
"filterListId": 360,
"tagId": 1
},
{
"filterListId": 361,
"tagId": 1
},
{
"filterListId": 362,
"tagId": 1
},
{
"filterListId": 363,
"tagId": 1
},
{
"filterListId": 365,
"tagId": 4
},
{
"filterListId": 371,
"tagId": 13
},
{
"filterListId": 373,
"tagId": 4
},
{
"filterListId": 379,
"tagId": 4
},
{
"filterListId": 381,
"tagId": 15
},
{
"filterListId": 384,
"tagId": 10
@ -51,12 +215,72 @@
"filterListId": 389,
"tagId": 13
},
{
"filterListId": 390,
"tagId": 15
},
{
"filterListId": 391,
"tagId": 15
},
{
"filterListId": 392,
"tagId": 16
},
{
"filterListId": 402,
"tagId": 10
},
{
"filterListId": 403,
"tagId": 15
},
{
"filterListId": 422,
"tagId": 13
},
{
"filterListId": 432,
"tagId": 15
},
{
"filterListId": 433,
"tagId": 15
},
{
"filterListId": 435,
"tagId": 12
},
{
"filterListId": 436,
"tagId": 9
},
{
"filterListId": 472,
"tagId": 4
},
{
"filterListId": 474,
"tagId": 4
},
{
"filterListId": 500,
"tagId": 4
},
{
"filterListId": 501,
"tagId": 4
},
{
"filterListId": 502,
"tagId": 4
},
{
"filterListId": 503,
"tagId": 4
},
{
"filterListId": 506,
"tagId": 10
}
]
]

View file

@ -68,5 +68,15 @@
"id": 14,
"description": "Intended for research only",
"name": "research"
},
{
"id": 15,
"description": "Blocks specific topics/things",
"name": "topical"
},
{
"id": 16,
"description": "Removes obstructing or annoying overlays",
"name": "overlay"
}
]
]