Merge branch 'pr/543'

This commit is contained in:
Collin M. Barrett 2018-10-01 12:35:33 -05:00
commit e719fe9ae7
3 changed files with 270 additions and 26 deletions

View file

@ -4490,15 +4490,6 @@
"syntaxId": 4,
"viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt"
},
{
"id": 411,
"descriptionSourceUrl": "",
"homeUrl": "https://gist.github.com/BBcan177",
"licenseId": 18,
"name": "pfBlockerNG - Blacklist Configuration",
"syntaxId": 2,
"viewUrl": "https://gist.githubusercontent.com/BBcan177/b91d3c25667d326411b6fc4eb5c1f080/raw/7e23b07148adf030262f056870373c8f1ac2056c/squidblacklist_global_usage"
},
{
"id": 412,
"homeUrl": "https://gist.github.com/BBcan177",

View file

@ -91,6 +91,10 @@
"filterListId": 18,
"tagId": 9
},
{
"filterListId": 18,
"tagId": 21
},
{
"filterListId": 19,
"tagId": 1
@ -335,10 +339,18 @@
"filterListId": 78,
"tagId": 2
},
{
"filterListId": 78,
"tagId": 17
},
{
"filterListId": 79,
"tagId": 2
},
{
"filterListId": 79,
"tagId": 17
},
{
"filterListId": 80,
"tagId": 2
@ -391,6 +403,10 @@
"filterListId": 93,
"tagId": 2
},
{
"filterListId": 93,
"tagId": 17
},
{
"filterListId": 94,
"tagId": 10
@ -399,10 +415,18 @@
"filterListId": 95,
"tagId": 2
},
{
"filterListId": 95,
"tagId": 17
},
{
"filterListId": 96,
"tagId": 2
},
{
"filterListId": 97,
"tagId": 9
},
{
"filterListId": 98,
"tagId": 9
@ -457,36 +481,76 @@
},
{
"filterListId": 103,
"tagId": 15
"tagId": 17
},
{
"filterListId": 103,
"tagId": 21
},
{
"filterListId": 104,
"tagId": 2
},
{
"filterListId": 104,
"tagId": 17
},
{
"filterListId": 104,
"tagId": 21
},
{
"filterListId": 105,
"tagId": 2
},
{
"filterListId": 105,
"tagId": 17
},
{
"filterListId": 105,
"tagId": 21
},
{
"filterListId": 106,
"tagId": 2
},
{
"filterListId": 106,
"tagId": 21
},
{
"filterListId": 107,
"tagId": 2
},
{
"filterListId": 107,
"tagId": 21
},
{
"filterListId": 108,
"tagId": 2
},
{
"filterListId": 108,
"tagId": 21
},
{
"filterListId": 109,
"tagId": 2
},
{
"filterListId": 109,
"tagId": 17
},
{
"filterListId": 110,
"tagId": 2
},
{
"filterListId": 110,
"tagId": 21
},
{
"filterListId": 111,
"tagId": 2
@ -607,6 +671,10 @@
"filterListId": 136,
"tagId": 3
},
{
"filterListId": 137,
"tagId": 2
},
{
"filterListId": 138,
"tagId": 2
@ -1013,7 +1081,7 @@
},
{
"filterListId": 232,
"tagId": 15
"tagId": 21
},
{
"filterListId": 233,
@ -1089,7 +1157,7 @@
},
{
"filterListId": 249,
"tagId": 15
"tagId": 18
},
{
"filterListId": 250,
@ -1367,6 +1435,22 @@
"filterListId": 308,
"tagId": 1
},
{
"filterListId": 309,
"tagId": 1
},
{
"filterListId": 309,
"tagId": 2
},
{
"filterListId": 309,
"tagId": 3
},
{
"filterListId": 309,
"tagId": 6
},
{
"filterListId": 311,
"tagId": 9
@ -1629,7 +1713,7 @@
},
{
"filterListId": 371,
"tagId": 15
"tagId": 21
},
{
"filterListId": 372,
@ -1715,6 +1799,10 @@
"filterListId": 389,
"tagId": 13
},
{
"filterListId": 389,
"tagId": 21
},
{
"filterListId": 390,
"tagId": 15
@ -1791,6 +1879,10 @@
"filterListId": 403,
"tagId": 15
},
{
"filterListId": 403,
"tagId": 18
},
{
"filterListId": 405,
"tagId": 9
@ -1943,10 +2035,22 @@
"filterListId": 451,
"tagId": 3
},
{
"filterListId": 452,
"tagId": 2
},
{
"filterListId": 452,
"tagId": 3
},
{
"filterListId": 453,
"tagId": 15
},
{
"filterListId": 453,
"tagId": 18
},
{
"filterListId": 454,
"tagId": 3
@ -1999,6 +2103,34 @@
"filterListId": 472,
"tagId": 4
},
{
"filterListId": 472,
"tagId": 19
},
{
"filterListId": 473,
"tagId": 19
},
{
"filterListId": 474,
"tagId": 19
},
{
"filterListId": 475,
"tagId": 19
},
{
"filterListId": 476,
"tagId": 19
},
{
"filterListId": 477,
"tagId": 19
},
{
"filterListId": 478,
"tagId": 19
},
{
"filterListId": 474,
"tagId": 4
@ -2291,6 +2423,46 @@
"filterListId": 527,
"tagId": 3
},
{
"filterListId": 528,
"tagId": 19
},
{
"filterListId": 529,
"tagId": 19
},
{
"filterListId": 530,
"tagId": 19
},
{
"filterListId": 531,
"tagId": 19
},
{
"filterListId": 532,
"tagId": 19
},
{
"filterListId": 533,
"tagId": 19
},
{
"filterListId": 534,
"tagId": 19
},
{
"filterListId": 535,
"tagId": 19
},
{
"filterListId": 536,
"tagId": 19
},
{
"filterListId": 537,
"tagId": 19
},
{
"filterListId": 532,
"tagId": 4
@ -2311,6 +2483,46 @@
"filterListId": 539,
"tagId": 2
},
{
"filterListId": 546,
"tagId": 19
},
{
"filterListId": 547,
"tagId": 19
},
{
"filterListId": 548,
"tagId": 19
},
{
"filterListId": 549,
"tagId": 19
},
{
"filterListId": 550,
"tagId": 19
},
{
"filterListId": 551,
"tagId": 19
},
{
"filterListId": 552,
"tagId": 19
},
{
"filterListId": 553,
"tagId": 19
},
{
"filterListId": 554,
"tagId": 19
},
{
"filterListId": 555,
"tagId": 19
},
{
"filterListId": 551,
"tagId": 4
@ -2457,7 +2669,7 @@
},
{
"filterListId": 589,
"tagId": 15
"tagId": 17
},
{
"filterListId": 590,
@ -2473,7 +2685,7 @@
},
{
"filterListId": 593,
"tagId": 15
"tagId": 21
},
{
"filterListId": 594,
@ -2545,7 +2757,7 @@
},
{
"filterListId": 604,
"tagId": 15
"tagId": 20
},
{
"filterListId": 605,
@ -2563,6 +2775,10 @@
"filterListId": 606,
"tagId": 6
},
{
"filterListId": 623,
"tagId": 18
},
{
"filterListId": 671,
"tagId": 14
@ -2591,6 +2807,10 @@
"filterListId": 719,
"tagId": 10
},
{
"filterListId": 734,
"tagId": 2
},
{
"filterListId": 734,
"tagId": 11
@ -2667,10 +2887,6 @@
"filterListId": 622,
"tagId": 3
},
{
"filterListId": 623,
"tagId": 3
},
{
"filterListId": 624,
"tagId": 3
@ -2733,19 +2949,19 @@
},
{
"filterListId": 635,
"tagId": 15
"tagId": 17
},
{
"filterListId": 636,
"tagId": 15
"tagId": 17
},
{
"filterListId": 637,
"tagId": 15
"tagId": 17
},
{
"filterListId": 638,
"tagId": 15
"tagId": 17
},
{
"filterListId": 639,
@ -2951,6 +3167,18 @@
"filterListId": 689,
"tagId": 3
},
{
"filterListId": 690,
"tagId": 20
},
{
"filterListId": 691,
"tagId": 20
},
{
"filterListId": 692,
"tagId": 20
},
{
"filterListId": 692,
"tagId": 6
@ -3097,7 +3325,7 @@
},
{
"filterListId": 730,
"tagId": 9
"tagId": 18
},
{
"filterListId": 731,

View file

@ -78,5 +78,30 @@
"id": 16,
"description": "Removes obstructing or annoying overlays",
"name": "overlay"
},
{
"id": 17,
"description": "Blocks gambling resources",
"name": "gambling"
},
{
"id": 18,
"description": "Removes website-embedded fonts",
"name": "fonts"
},
{
"id": 19,
"description": "Blocks resources from certain companies",
"name": "anti-corp"
},
{
"id": 20,
"description": "Lists that are of special interest to IT admins",
"name": "admin"
},
{
"id": 21,
"description": "Lists that remove news stories of subjectively low quality",
"name": "clickbait"
}
]
]