From b43fe19ca588cf0e3dc0b39c2c2cffe9a66a9d45 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 5 Oct 2018 15:20:02 +0200 Subject: [PATCH 1/4] Added 2 new softwares to uMatrix --- data/SoftwareSyntax.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 6851e0ea8..33cc6d83b 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -35,6 +35,10 @@ "softwareId": 22, "syntaxId": 1 }, + { + "softwareId": 25, + "syntaxId": 1 + }, { "softwareId": 1, "syntaxId": 2 @@ -63,6 +67,10 @@ "softwareId": 19, "syntaxId": 2 }, + { + "softwareId": 25, + "syntaxId": 2 + }, { "softwareId": 1, "syntaxId": 3 From b6c620ae4736a5e800177bad2eb4df7b07ce0cb8 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 5 Oct 2018 15:29:11 +0200 Subject: [PATCH 2/4] Added 2 new lists and brushed up 2 others --- data/FilterList.json | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 811237d75..26a5fdc53 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -4110,7 +4110,7 @@ "licenseId": 4, "name": "AFNIL - Anti Fake News International List", "publishedDate": "2017-12-20T00:00:00", - "syntaxId": 7, + "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/AFNIL-AntiFakeNewsInternationalList/AFNIL/master/AFNIL-ABP-uBO.txt" }, { @@ -8563,7 +8563,7 @@ "homeUrl": "https://github.com/lassekongo83/Frellwits-filter-lists", "issuesUrl": "https://github.com/lassekongo83/Frellwits-filter-lists/issues", "licenseId": 4, - "name": "Frellwit's Swedish Filter", + "name": "Frellwit's Swedish Hosts File", "syntaxId": 1, "viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Hosts-File.txt" }, @@ -8575,5 +8575,28 @@ "name": "IndianList", "syntaxId": 3, "viewUrl": "https://easylist-downloads.adblockplus.org/indianlist.txt" + }, + { + "id": 819, + "description": "This list is mostly meant to be used on top of \"YouTube: Pure Video Experience\", and it removes even more (number-wise) distracting or uncomfortable things on YouTube.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/YouTubeEvenMorePureVideoExperience.txt", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "YouTube: Even More Pure Video Experience", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/YouTubeEvenMorePureVideoExperience.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/YouTubeEvenMorePureVideoExperience.txt" + }, + { + "id": 820, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uMatrix - Rulesets for English websites", + "syntaxId": 7, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/recipes/recipes_en.txt" } ] From 90204355f3bcf22ab6b17f54304cc47e6ac49caa Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 5 Oct 2018 15:29:59 +0200 Subject: [PATCH 3/4] Assigned tags to the 2 new lists --- data/FilterListTag.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index d1e41caff..bfeaac3a9 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -3814,5 +3814,13 @@ { "filterListId": 818, "tagId": 2 + }, + { + "filterListId": 819, + "tagId": 9 + }, + { + "filterListId": 820, + "tagId": 3 } ] From d6d41dfbb4ef36f0ace9277b9f58e6d12fe39c14 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 5 Oct 2018 15:31:32 +0200 Subject: [PATCH 4/4] Assigned maintainers to the 2 new lists --- data/FilterListMaintainer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 00e2fc5d5..b48fe73c8 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -263,6 +263,10 @@ "filterListId": 680, "maintainerId": 22 }, + { + "filterListId": 819, + "maintainerId": 22 + }, { "filterListId": 23, "maintainerId": 23 @@ -763,6 +767,10 @@ "filterListId": 410, "maintainerId": 57 }, + { + "filterListId": 820, + "maintainerId": 57 + }, { "filterListId": 380, "maintainerId": 58