From adafc61c706d85fab896ab36169827c4402f120b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 26 Aug 2018 02:43:37 +0200 Subject: [PATCH 1/5] Added more tags --- data/FilterListTag.json | 124 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 114 insertions(+), 10 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 2b783645e..190301b99 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -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 } ] From e8807f999ca03cd31d80a65fbf014961ae588425 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 26 Aug 2018 02:44:21 +0200 Subject: [PATCH 2/5] Clarified the ie tag --- data/Tag.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Tag.json b/data/Tag.json index 0eb0127b6..b34717293 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -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" } ] From d1fe3e5888399685aefa43092f74aa76005a910c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 26 Aug 2018 02:53:03 +0200 Subject: [PATCH 3/5] Assigned 2 languages --- data/FilterListLanguage.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 6648e2d79..6509d42b1 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -674,5 +674,13 @@ { "filterListId": 437, "languageId": 13 + }, + { + "filterListId": 479, + "languageId": 11 + }, + { + "filterListId": 480, + "languageId": 79 } -] \ No newline at end of file +] From f58e71a141da19dd568ee0266ef06825cdd2f4e4 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 26 Aug 2018 02:56:17 +0200 Subject: [PATCH 4/5] Added TPL version of EasyList --- data/FilterList.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 5b6d2ec52..854998875 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -9422,5 +9422,24 @@ "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" } ] From 5f7730e43a76b613471f88de070f8db777f6da51 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 26 Aug 2018 03:04:05 +0200 Subject: [PATCH 5/5] Corrected one list name --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 854998875..98c264a06 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -9416,7 +9416,7 @@ "homeUrl": "https://acceptableads.com/", "issuesUrl": null, "licenseId": 5, - "name": "Acceptable Ads", + "name": "Acceptable Ads without third-party tracking", "policyUrl": null, "publishedDate": null, "submissionUrl": null,