Skip to content

Commit

Permalink
Merge tag '1.16.0' into safari
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/ISSUE_TEMPLATE.md
#	README.md
#	platform/safari/img/browsericons/safari-icon16-off.png
#	platform/safari/img/browsericons/safari-icon16.png
#	platform/safari/img/browsericons/safari-icon16@2x.png
#	src/img/help16.png
#	src/img/icon_128.png
#	src/img/icon_16.png
  • Loading branch information
el1t committed Apr 22, 2018
2 parents a32680d + 6781beb commit 8dbf60f
Show file tree
Hide file tree
Showing 103 changed files with 1,634 additions and 1,431 deletions.
19 changes: 2 additions & 17 deletions 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).
9 changes: 1 addition & 8 deletions assets/assets.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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/"
}
}

0 comments on commit 8dbf60f

Please sign in to comment.