Merge tag '1.16.6'

nikrolls · Aug 5, 2018 · 732e9a95641043713f898971bb3aa472fb3028de · 732e9a9
2 parents fc35567 + 5edc527
commit 732e9a95641043713f898971bb3aa472fb3028de
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ env:
   matrix:
   - BROWSER=chromium EXT=zip
   - BROWSER=firefox EXT=xpi
-  - BROWSER=webext EXT=xpi
 script: ./tools/make-${BROWSER}.sh all
 deploy:
   provider: releases

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,20 +1,5 @@
 # Submitting issues
 
-Despite all the guidelines and warnings I added over the years about how to use it, the GitHub issue tracker always end up being used as a [help desk](https://en.wikipedia.org/wiki/Help_desk) rather than a place to report actual, real and proven issues.
+Submit on <https://github.com/uBlockOrigin/uBlock-issues/issues>.
 
-Typically help desk are best handled by enthusiast volunteers -- so hopefully this is what will happen.
-
-Given this, from now on I will consider GitHub issue tracker as a help desk one for uBlock Origin. I unsubscribed from being notified from all issues being opened, I will visit once in a while as time and mood allow.
-
-When I will be visiting the "help desk", I will focus **only** on issues which I have good reasons to believe to be valid issues with uBlock Origin **itself**.
-
-Valid issues typically comes with minimal but detailed steps to reproduce (i.e. no guesswork whatsoever required for others to reproduce), and especially genuine efforts to investigate the cause of an issue **as far as possible** using all the browser tools (uBO is HTML/CSS/JS, the browser has all the tools to investigate all of this). These will have my attention, and I will address them.
-
-In case I am really needed for a given issue, you can mention me using `@gorhill` so that GitHub will notify me.
-
-***
-
-Good readings:
-
-- [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html)
-- [Why I didn’t fix your bug](http://magnusmanske.de/wordpress/?p=518)
+Issue tracker here is read-only for non-[prior contributors](https://github.com/gorhill/uBlock/graphs/contributors).
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/ublock/localized.svg)](https://crowdin.com/project/ublock)
+[![License](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/nikrolls/uBlock-Edge/blob/master/LICENSE.txt)
+
+*** 
+
 <h1 align="center">
 <sub>
 <img  src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/icon38@2x.png"
@@ -70,8 +75,8 @@ really do want to contribute something, think about the people working hard
 to maintain the filter lists you are using, which were made available to use by
 all for free.
 
-You can contribute by helping translate uBlock₀ [on Crowdin](https://crowdin.net/project/ublock).
+You can contribute by helping translate uBlock Origin [on Crowdin](https://crowdin.net/project/ublock).
 
 ## License
 
-[GPLv3](LICENSE.txt).
+[GPLv3](https://github.com/nikrolls/uBlock-Edge/blob/master/LICENSE.txt).
diff --git a/assets/assets.json b/assets/assets.json
@@ -188,13 +188,6 @@
 		],
 		"supportURL": "https://www.malwaredomains.com/"
 	},
-	"disconnect-malware": {
-		"content": "filters",
-		"group": "malware",
-		"off": true,
-		"title": "Malware filter list by Disconnect",
-		"contentURL": "https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt"
-	},
 	"spam404-0": {
 		"content": "filters",
 		"group": "malware",
@@ -337,7 +330,7 @@
 		"off": true,
 		"title": "CZE, SVK: EasyList Czech and Slovak",
 		"lang": "cs sk",
-		"contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters_ublock.txt",
+		"contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt",
 		"supportURL": "https://github.com/tomasko126/easylistczechandslovak"
 	},
 	"DEU-0": {
@@ -532,7 +525,7 @@
 		"off": true,
 		"title": "NOR: Dandelion Sprouts norske filtre",
 		"lang": "nb",
-		"contentURL": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/ExperimentalNorwegianList.txt",
+		"contentURL": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt",
 		"supportURL": "https://github.com/DandelionSprout/adfilt"
 	},
 	"POL-0": {
@@ -631,6 +624,6 @@
 		"title": "VIE: ABPVN List",
 		"lang": "vi",
 		"contentURL": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt",
-		"supportURL": "http://abpvn.com/"
+		"supportURL": "https://abpvn.com/"
 	}
 }