Merge pull request #396 from DandelionSprout/patch-8

Saturday night pull
This commit is contained in:
Collin M. Barrett 2018-08-26 01:06:55 +00:00 committed by GitHub
commit d459920cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 144 additions and 13 deletions

View file

@ -9416,11 +9416,30 @@
"homeUrl": "https://acceptableads.com/",
"issuesUrl": null,
"licenseId": 5,
"name": "Acceptable Ads",
"name": "Acceptable Ads without third-party tracking",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt"
},
{
"id": 507,
"chatUrl": null,
"description": "EasyList is the primary filter list that removes most adverts from international web pages, including unwanted frames, images, and objects. It is the most popular list used by many ad blockers and forms the basis of over a dozen combination and supplementary filter lists.",
"descriptionSourceUrl": "https://easylist.to/",
"discontinuedDate": null,
"donateUrl": null,
"emailAddress": "easylist.subscription@gmail.com",
"forumUrl": "https://forums.lanik.us/viewforum.php?f=23",
"homeUrl": "https://easylist.to/",
"issuesUrl": "https://github.com/easylist/easylist/issues",
"licenseId": 5,
"name": "EasyList TPL",
"policyUrl": null,
"publishedDate": null,
"submissionUrl": null,
"syntaxId": null,
"viewUrl": "https://easylist-msie.adblockplus.org/easylist.tpl"
}
]

View file

@ -674,5 +674,13 @@
{
"filterListId": 437,
"languageId": 13
},
{
"filterListId": 479,
"languageId": 11
},
{
"filterListId": 480,
"languageId": 79
}
]
]

View file

@ -3,6 +3,10 @@
"filterListId": 5,
"tagId": 15
},
{
"filterListId": 18,
"tagId": 9
},
{
"filterListId": 19,
"tagId": 1
@ -31,6 +35,18 @@
"filterListId": 94,
"tagId": 10
},
{
"filterListId": 98,
"tagId": 9
},
{
"filterListId": 102,
"tagId": 9
},
{
"filterListId": 134,
"tagId": 9
},
{
"filterListId": 141,
"tagId": 10
@ -47,6 +63,10 @@
"filterListId": 145,
"tagId": 10
},
{
"filterListId": 150,
"tagId": 15
},
{
"filterListId": 151,
"tagId": 10
@ -59,6 +79,10 @@
"filterListId": 155,
"tagId": 10
},
{
"filterListId": 169,
"tagId": 9
},
{
"filterListId": 159,
"tagId": 4
@ -80,20 +104,12 @@
"tagId": 5
},
{
"filterListId": 223,
"filterListId": 216,
"tagId": 4
},
{
"filterListId": 224,
"tagId": 4
},
{
"filterListId": 225,
"tagId": 4
},
{
"filterListId": 226,
"tagId": 4
"tagId": 8
},
{
"filterListId": 227,
@ -103,14 +119,38 @@
"filterListId": 229,
"tagId": 4
},
{
"filterListId": 232,
"tagId": 15
},
{
"filterListId": 235,
"tagId": 9
},
{
"filterListId": 236,
"tagId": 9
},
{
"filterListId": 238,
"tagId": 10
},
{
"filterListId": 250,
"tagId": 8
},
{
"filterListId": 270,
"tagId": 14
},
{
"filterListId": 279,
"tagId": 8
},
{
"filterListId": 280,
"tagId": 15
},
{
"filterListId": 285,
"tagId": 14
@ -131,6 +171,18 @@
"filterListId": 308,
"tagId": 1
},
{
"filterListId": 311,
"tagId": 9
},
{
"filterListId": 313,
"tagId": 9
},
{
"filterListId": 314,
"tagId": 1
},
{
"filterListId": 318,
"tagId": 1
@ -151,6 +203,10 @@
"filterListId": 340,
"tagId": 12
},
{
"filterListId": 341,
"tagId": 4
},
{
"filterListId": 343,
"tagId": 8
@ -191,10 +247,18 @@
"filterListId": 365,
"tagId": 4
},
{
"filterListId": 370,
"tagId": 17
},
{
"filterListId": 371,
"tagId": 13
},
{
"filterListId": 371,
"tagId": 15
},
{
"filterListId": 373,
"tagId": 4
@ -207,6 +271,10 @@
"filterListId": 381,
"tagId": 15
},
{
"filterListId": 382,
"tagId": 11
},
{
"filterListId": 384,
"tagId": 10
@ -231,6 +299,10 @@
"filterListId": 392,
"tagId": 16
},
{
"filterListId": 398,
"tagId": 9
},
{
"filterListId": 402,
"tagId": 10
@ -239,6 +311,10 @@
"filterListId": 403,
"tagId": 15
},
{
"filterListId": 405,
"tagId": 9
},
{
"filterListId": 422,
"tagId": 13
@ -251,6 +327,10 @@
"filterListId": 433,
"tagId": 15
},
{
"filterListId": 434,
"tagId": 15
},
{
"filterListId": 435,
"tagId": 12
@ -267,6 +347,26 @@
"filterListId": 474,
"tagId": 4
},
{
"filterListId": 483,
"tagId": 11
},
{
"filterListId": 487,
"tagId": 11
},
{
"filterListId": 491,
"tagId": 11
},
{
"filterListId": 492,
"tagId": 11
},
{
"filterListId": 493,
"tagId": 11
},
{
"filterListId": 500,
"tagId": 4
@ -286,5 +386,9 @@
{
"filterListId": 506,
"tagId": 10
},
{
"filterListId": 507,
"tagId": 17
}
]

View file

@ -81,7 +81,7 @@
},
{
"id": 17,
"description": "Intended for use in Internet Explorer",
"description": "Intended for use with Internet Explorer's TPL feature",
"name": "ie"
}
]