From 141488842a7ccf001686a57f579836af19e00082 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 8 Jan 2019 08:13:03 -0500 Subject: [PATCH 1/2] Make Firefox dev build auto-update --- dist/firefox/updates.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json index 8946944b7..409b559bc 100644 --- a/dist/firefox/updates.json +++ b/dist/firefox/updates.json @@ -3,10 +3,10 @@ "uBlock0@raymondhill.net": { "updates": [ { - "version": "1.17.7.1", + "version": "1.17.7.2", "applications": { "gecko": { "strict_min_version": "52" } }, - "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.7b1", - "update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.7b1/uBlock0_1.17.7b1.firefox.signed.xpi" + "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.7b2", + "update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.7b2/uBlock0_1.17.7b2.firefox.signed.xpi" } ] } From 3e41939e4160c1d441ac4c53b1d6020e43814a61 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Fri, 11 Jan 2019 09:39:37 -0500 Subject: [PATCH 2/2] Add "AdGuard Social Media filter" to stock lists Related issue: - https://github.com/gorhill/uBlock/issues/3214 --- assets/assets.json | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/assets/assets.json b/assets/assets.json index b4aa14715..90d7c6eea 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -103,7 +103,7 @@ "content": "filters", "group": "ads", "off": true, - "title": "Adguard Base Filters", + "title": "AdGuard Base filter", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" @@ -112,7 +112,7 @@ "content": "filters", "group": "ads", "off": true, - "title": "Adguard Mobile Filters", + "title": "AdGuard Mobile Ads filter", "ua": "mobile", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", @@ -134,7 +134,7 @@ "content": "filters", "group": "privacy", "off": true, - "title": "Adguard Spyware Filters", + "title": "AdGuard Spyware filter", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" @@ -203,11 +203,20 @@ "content": "filters", "group": "social", "off": true, - "title": "Adguard’s Annoyance List", + "title": "AdGuard Annoyances filter", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/14.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" }, + "adguard-social": { + "content": "filters", + "group": "social", + "off": true, + "title": "AdGuard Social Media filter", + "contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt", + "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", + "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" + }, "fanboy-thirdparty_social": { "content": "filters", "group": "social", @@ -467,7 +476,7 @@ "content": "filters", "group": "regions", "off": true, - "title": "JPN: Adguard Japan Filter", + "title": "JPN: AdGuard Japanese filter", "lang": "ja", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", @@ -575,7 +584,7 @@ "content": "filters", "group": "regions", "off": true, - "title": "RUS: Adguard Russian Filter", + "title": "RUS: AdGuard Russian filter", "lang": "be ru uk", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/1.txt", "supportURL": "https://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard", @@ -594,7 +603,7 @@ "content": "filters", "group": "regions", "off": true, - "title": "spa, por: Adguard Spanish/Portuguese", + "title": "spa, por: AdGuard Spanish/Portuguese filter", "lang": "es pt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", @@ -631,7 +640,7 @@ "content": "filters", "group": "regions", "off": true, - "title": "TUR: Adguard Turkish Filter", + "title": "TUR: AdGuard Turkish filter", "lang": "tr", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",