From b9464ced41bd3e8ad131c2cd12b7dfd20499e315 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 03:38:49 +0200 Subject: [PATCH 1/6] Added 6 more tools --- data/Software.json | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/data/Software.json b/data/Software.json index 72bef9c0f..3267bad23 100644 --- a/data/Software.json +++ b/data/Software.json @@ -34,5 +34,41 @@ "downloadUrl": "https://getadblock.com/", "homeUrl": "https://getadblock.com/", "name": "AdBlock" + }, + { + "id": 7, + "downloadUrl": "https://f-droid.org/packages/org.adaway/", + "homeUrl": "https://adaway.org/", + "name": "AdAway" + }, + { + "id": 8, + "downloadUrl": "https://chrome.google.com/webstore/detail/personal-blocklist-by-goo/nolijncfnkgaikbjbdaogikpmpbdcdef", + "homeUrl": "https://chrome.google.com/webstore/detail/personal-blocklist-by-goo/nolijncfnkgaikbjbdaogikpmpbdcdef", + "name": "Personal Blocklist (Chrome)" + }, + { + "id": 9, + "downloadUrl": "https://addons.mozilla.org/firefox/addon/personal-blocklist/", + "homeUrl": "https://github.com/wildskyf/personal-blocklist", + "name": "Personal Blocklist (Firefox)" + }, + { + "id": 10, + "downloadUrl": "http://einaregilsson.com/redirector/", + "homeUrl": "http://einaregilsson.com/redirector/", + "name": "Redirector" + }, + { + "id": 11, + "downloadUrl": "https://github.com/scottlerch/HostsFileEditor/releases", + "homeUrl": "https://scottlerch.github.io/HostsFileEditor/", + "name": "Hosts File Editor" + }, + { + "id": 12, + "downloadUrl": "https://github.com/2ndalpha/gasmask/releases", + "homeUrl": "https://github.com/2ndalpha/gasmask", + "name": "Gas Mask" } -] \ No newline at end of file +] From 45fd0bb83e8461b485c2444bccae487b7409b753 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 04:13:00 +0200 Subject: [PATCH 2/6] Minor syntax fixes, part 1 The E-mail address that was listed for Schack was incorrect, first and foremost. --- data/FilterList.json | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index dd567569d..5e5b36dca 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1866,7 +1866,7 @@ "descriptionSourceUrl": "https://youtube.adblockplus.me/", "discontinuedDate": null, "donateUrl": "https://adblockplus.org/en/donate", - "emailAddress": " subscriptionlist@adblockplus.org", + "emailAddress": "subscriptionlist@adblockplus.org", "forumUrl": null, "homeUrl": "https://youtube.adblockplus.me/", "issuesUrl": null, @@ -2822,7 +2822,7 @@ "descriptionSourceUrl": "https://henrik.schack.dk/adblock/", "discontinuedDate": null, "donateUrl": "https://www.paypal.me/schack", - "emailAddress": "henrik@schackinger.com", + "emailAddress": null, "forumUrl": null, "homeUrl": "https://henrik.schack.dk/adblock/", "issuesUrl": null, @@ -2837,8 +2837,7 @@ { "id": 148, "chatUrl": null, - "description": - "I make supplemental filters in Adblock Plus to block garbage on webpages not blocked by other lists. I use many regular expressions, a few domain filters, but no CSS filters.", + "description": "I make supplemental filters in Adblock Plus to block garbage on webpages not blocked by other lists. I use many regular expressions, a few domain filters, but no CSS filters.", "descriptionSourceUrl": "https://satterly.neocities.org/abp_filters.html", "discontinuedDate": null, "donateUrl": null, @@ -8259,7 +8258,25 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 1, - "viewUrl": - "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts" - } -] \ No newline at end of file + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts" + }, + { + "id": 431, + "chatUrl": null, + "description": "Have you ever felt bothered by how many websites still think that everyone are using narrow monitors? Well, here's how to stretch them out like a piece of gum!", + "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": "Dandelion Sprout's Website Stretcher", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Website%20Stretcher.txt" + }, +] From 032de3a82f4a7b3d110b5412b5e1e2a741172192 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 04:19:11 +0200 Subject: [PATCH 3/6] Minor brushup, part 2 --- data/FilterListLanguage.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 10fda5bdd..3888c7737 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -207,6 +207,14 @@ "filterListId": 167, "languageId": 108 }, + { + "filterListId": 171, + "languageId": 139 + }, + { + "filterListId": 171, + "languageId": 110 + }, { "filterListId": 178, "languageId": 18 @@ -639,6 +647,10 @@ "filterListID": 402, "languageId": 44 }, + { + "filterListID": 416, + "languageId": 167 + }, { "filterListID": 422, "languageId": 110 @@ -659,4 +671,4 @@ "filterListID": 430, "languageId": 44 } -] \ No newline at end of file +] From 1c1a935fdf55ac6f33b5c236ae75db00e07686b6 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 04:23:47 +0200 Subject: [PATCH 4/6] Minor brushup, part 3 Accredited more lists to gorhill. --- data/FilterListMaintainer.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index ddc32e048..150f32eac 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -647,6 +647,26 @@ "filterListId": 401, "maintainerId": 69 }, + { + "filterListId": 87, + "maintainerId": 57 + }, + { + "filterListId": 88, + "maintainerId": 57 + }, + { + "filterListId": 89, + "maintainerId": 57 + }, + { + "filterListId": 90, + "maintainerId": 57 + }, + { + "filterListId": 91, + "maintainerId": 57 + }, { "filterListId": 405, "maintainerId": 57 @@ -699,4 +719,4 @@ "filterListId": 430, "maintainerId": 22 } -] \ No newline at end of file +] From d1ed388c756ac27982be13614e080669653249de Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 04:27:21 +0200 Subject: [PATCH 5/6] Added more entries The continued popularity of hosts-file editing, has been quite the surprise for me to discover. --- data/SoftwareSyntax.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 644120730..de74b2ceb 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -22,5 +22,29 @@ { "softwareId": 6, "syntaxId": 3 + }, + { + "softwareId": 7, + "syntaxId": 1 + }, + { + "softwareId": 8, + "syntaxId": 2 + }, + { + "softwareId": 9, + "syntaxId": 2 + }, + { + "softwareId": 10, + "syntaxId": 11 + }, + { + "softwareId": 11, + "syntaxId": 1 + }, + { + "softwareId": 12, + "syntaxId": 1 } -] \ No newline at end of file +] From ad4fff745a14ab27b70e6584ca62bf7dfe1975a2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Jul 2018 04:28:01 +0200 Subject: [PATCH 6/6] Removed erreneous comma --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 5e5b36dca..841ebdaba 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8278,5 +8278,5 @@ "submissionUrl": null, "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout's%20Website%20Stretcher.txt" - }, + } ]