Merge pull request #5249 from learningequality/master

Master into 0.16.x

Author: benjaoming

.github/ISSUE_TEMPLATE.md

@@ -1,32 +1,21 @@
-### Note
-
-
-Does your post belong on Github?  If you are reporting a bug or issue, or are contributing to the development of Kolibri, then it belongs here!  If you are seeking advice on technical and non-technical elements of deploying KA Lite and Kolibri in your community, you'll find relevant information at our [community forum](https://community.learningequality.org). 
-
 ## Summary
 
 *Briefly describe what this is about*
 
+## System information
 
-## Branch or installer method
-
-*Please specify if you are using the current `develop` branch or which installation source you were using when the issue occurred.*
-
- - Installer: Windows/OSX/Debian (?)
- - Version: 0.15.1 (?)
-
-or:
-
- - Branch: develop (?)
+*Please specify the KA Lite version you were using and your operating system!*
 
+ - Operating system: ?
+ - Version: 0.16.?
+ - Browser: ?
 
 ## Traceback or relevant snippet from server.log
 
 ```
 INSERT TRACEBACK, LOG MESSAGES ETC. HERE
 ```
 
-
 ## How to reproduce
 
 1. Steps

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,10 +18,6 @@ If not all TODOs are marked, this PR is considered WIP (work in progress)
 
 List the issues solved or partly solved by the PR
 
-## Documentation
-
-*If the PR has documentation, link the file here (either .rst in your repo or if built on Read The Docs)*
-
 ## Screenshots (if appropriate)
 
 *They're nice. :)*

CONTRIBUTING.md

@@ -1,13 +1,14 @@
-Please include the following information when opening an issue:
-* The branch you found the issue on
-* The current date / the build that the issue affects
-* Expected behavior
-* Actual behavior
-* Steps to reproduce (be detailed!)
-
-If opening a PR, please observe the following guidelines
-* If you're fixing a bug, write a regression test (or have a really good reason for not writing one... and I mean **really** good!). Additionally, add in a "Fixes `issue number`" for PRs that address a certain issue (e.g. "Fixes #3390").
-* If your PR changes or adds to the User Interface, please include screenshots in either the description or the comments.
-* Give a brief summary of your changes in the PR description. Add in any other notes that are important for the reviewer to know.
-* Update the documentation if your changes affect it (don't just assume they don't)
-* Double check your own code for good style
+# Read before posting!
+
+Does your post belong on Github?  If you are reporting a bug or issue, or are contributing to the development of Kolibri, then it belongs here!  If you are seeking advice on technical and non-technical elements of deploying KA Lite and Kolibri in your community, you'll find relevant information at our [community forum](https://community.learningequality.org). 
+
+
+# Especially this...
+
+**Use the template in the description field, without this critical information, we cannot help you.**
+
+# PRs
+
+If opening a PR, please make note that the template is different, and we expect
+tests to accept contribution unless with good reason.
+