Merge branch 'bugfix' into patch-155

Author: svivian

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a bug in Question2Answer
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Please enter the steps to reproduce the behavior:
+1. 
+2. 
+3. 
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**System information:**
+ - Server/OS: [e.g. Apache on Ubuntu Server]
+ - PHP version: 
+ - MySQL version: 
+ - Q2A version: 
+ - Browser:

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Reporting security issues
+
+If you think you've found a security issue, you can responsibly disclose it to us using the [contact form here](https://www.question2answer.org/feedback.php).

.gitignore

@@ -1,6 +1,7 @@
 # Ignore Q2A config file and .htaccess in development
 /qa-config.php
 /.htaccess
+/qa-tests/phpunit-qa-config.php
 
 # Ignore cached files
 /qa-cache/*/

.travis.yml

@@ -1,10 +1,10 @@
 Question2Answer
 -----------------------------
 
-[![Build Status](https://travis-ci.org/q2a/question2answer.png?branch=dev)](https://travis-ci.org/q2a/question2answer/branches)
-
 [Question2Answer][Q2A] (Q2A) is a popular free open source Q&A platform for PHP/MySQL, used by over 20,898 [sites] in 40 languages.
 
+**Note:** if you're using Q2A directly from git, make sure to use the master branch as that is the latest stable version. Or download an official release from the [Q2A website][Q2A].
+
 Q2A is highly customisable with many awesome features:
 
 - Asking and answering questions (duh!)
@@ -46,17 +46,22 @@ Q2A also features an extensive plugin system:
 ----------
 
 
-As of version 1.6.3, all development is taking place through GitHub. The collaborative development process is being managed by [Scott Vivian][1]. (Note that official releases are still distributed via the [Q2A website][Q2A].)
+All development is now taking place through GitHub. The collaborative development process is being managed by [Scott Vivian][1]. (Note that official releases are still distributed via the [Q2A website][Q2A].) See also:
 
-Please read the [contributing page][2] for more information on how to get involved.
+- The [Q2A docs][2] for how to get started installing and using Q2A.
+- The [Changelog][3] for what's new in each version.
+- The [contributing file][4] for more information on how to get involved.
 
 
 Thanks and enjoy!
 
-Gideon
+Gideon & Scott
 
 
 [Q2A]: http://www.question2answer.org/
 [1]: http://www.question2answer.org/qa/user/Scott
-[2]: https://github.com/q2a/question2answer/blob/master/CONTRIBUTING.md
+[2]: https://docs.question2answer.org/
+[3]: https://docs.question2answer.org/install/versions/
+[4]: https://github.com/q2a/question2answer/blob/master/CONTRIBUTING.md
+[releases]: https://github.com/q2a/question2answer/releases
 [sites]: http://www.question2answer.org/sites.php

CHANGELOG.html

@@ -1 +1 @@
-1.8.6
+1.8.7