Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock into nextdev

This commit is contained in:
Raymond Hill 2019-01-11 09:45:40 -05:00
parent e93ce46901 3e41939e41
commit 941182d6f2
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
assets/assets.json
View File

@ -103,7 +103,7 @@
"content": "filters", "content": "filters",
"group": "ads", "group": "ads",
"off": true, "off": true,
"title": "Adguard Base Filters", "title": "AdGuard Base filter",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
@ -112,7 +112,7 @@
"content": "filters", "content": "filters",
"group": "ads", "group": "ads",
"off": true, "off": true,
"title": "Adguard Mobile Filters", "title": "AdGuard Mobile Ads filter",
"ua": "mobile", "ua": "mobile",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
@ -134,7 +134,7 @@
"content": "filters", "content": "filters",
"group": "privacy", "group": "privacy",
"off": true, "off": true,
"title": "Adguard Spyware Filters", "title": "AdGuard Spyware filter",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
@ -203,11 +203,20 @@
"content": "filters", "content": "filters",
"group": "social", "group": "social",
"off": true, "off": true,
"title": "Adguard’s Annoyance List", "title": "AdGuard Annoyances filter",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/14.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/14.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-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": { "fanboy-thirdparty_social": {
"content": "filters", "content": "filters",
"group": "social", "group": "social",
@ -467,7 +476,7 @@
"content": "filters", "content": "filters",
"group": "regions", "group": "regions",
"off": true, "off": true,
"title": "JPN: Adguard Japan Filter", "title": "JPN: AdGuard Japanese filter",
"lang": "ja", "lang": "ja",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
@ -575,7 +584,7 @@
"content": "filters", "content": "filters",
"group": "regions", "group": "regions",
"off": true, "off": true,
"title": "RUS: Adguard Russian Filter", "title": "RUS: AdGuard Russian filter",
"lang": "be ru uk", "lang": "be ru uk",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/1.txt", "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", "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", "content": "filters",
"group": "regions", "group": "regions",
"off": true, "off": true,
"title": "spa, por: Adguard Spanish/Portuguese", "title": "spa, por: AdGuard Spanish/Portuguese filter",
"lang": "es pt", "lang": "es pt",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
@ -631,7 +640,7 @@
"content": "filters", "content": "filters",
"group": "regions", "group": "regions",
"off": true, "off": true,
"title": "TUR: Adguard Turkish Filter", "title": "TUR: AdGuard Turkish filter",
"lang": "tr", "lang": "tr",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt", "contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",