From 650269d3568d2a453aab10e5e2266f34782c1558 Mon Sep 17 00:00:00 2001
From: Kevin McDonald <k3vmcd@gmail.com>
Date: Mon, 26 Dec 2016 21:33:27 -0700
Subject: [PATCH 1/3] Add ISSUE_TEMPLATE

---
 ISSUE_TEMPLATE.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..8359ec6786
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,31 @@
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to get all the necessary data to fix your issue.
+You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
+
+Let's begin with a checklist: replace the empty checkbox [ ] below with a checked one [x] if you already searched for duplicate bugs -->
+
+I have:
+- [ ] searched open and closed issues for duplicates
+
+----------------------------------------
+
+### Version info
+<!-- please replace the examples with your info -->
+**Riot (vector-web) Version:** 0.0.0
+**Operating System:**
+
+### Bug description
+Describe here the issue that you are experiencing.
+
+### Steps to reproduce
+- using hyphens as bullet points
+- list the steps
+- that reproduce the bug
+
+**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
+**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
+
+### Screenshots
+<!-- you can drag and drop images below -->
+
+### debug log
+<!-- posting a debug log helps the developers to fix your issue -->

From 95f529f9a4e856ceec65167f8b340e4b0bb4f254 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 7 Feb 2017 20:25:45 +0000
Subject: [PATCH 2/3] Tweak ISSUE_TEMPLATE

---
 .github/ISSUE_TEMPLATE.md | 32 ++++++++++++++++++++++++++++++++
 ISSUE_TEMPLATE.md         | 31 -------------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 delete mode 100644 ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..b5a61799ad
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,32 @@
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Include screenshots if possible: you can drag and drop images below.
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+- **Browser**: Chrome, Safari, Firefox? which version? <!-- n/a for desktop app -->
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: <!-- riot-web version from the user settings panel -->
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8359ec6786..0000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to get all the necessary data to fix your issue.
-You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
-
-Let's begin with a checklist: replace the empty checkbox [ ] below with a checked one [x] if you already searched for duplicate bugs -->
-
-I have:
-- [ ] searched open and closed issues for duplicates
-
-----------------------------------------
-
-### Version info
-<!-- please replace the examples with your info -->
-**Riot (vector-web) Version:** 0.0.0
-**Operating System:**
-
-### Bug description
-Describe here the issue that you are experiencing.
-
-### Steps to reproduce
-- using hyphens as bullet points
-- list the steps
-- that reproduce the bug
-
-**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
-**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
-
-### Screenshots
-<!-- you can drag and drop images below -->
-
-### debug log
-<!-- posting a debug log helps the developers to fix your issue -->

From 04422588656f90210e1b1d71f3213b1a4d2858da Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 7 Feb 2017 21:19:09 +0000
Subject: [PATCH 3/3] More issue_template tweaks

Encourage rageshaking

don't insist on version for the web app
---
 .github/ISSUE_TEMPLATE.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b5a61799ad..53c2ba9695 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -20,13 +20,25 @@ Describe here the problem that you are experiencing, or the feature you are requ
 
 Describe how what happens differs from what you expected.
 
-Include screenshots if possible: you can drag and drop images below.
+Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
 
 ### Version information
 
 <!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
 
 - **Platform**: web (in-browser) or desktop?
-- **Browser**: Chrome, Safari, Firefox? which version? <!-- n/a for desktop app -->
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-- **Version**: <!-- riot-web version from the user settings panel -->
+- **URL**: riot.im/develop / riot.im/app / somewhere else?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 0.x.y <!-- check the user settings panel if unsure -->