From 57b75ad9711fd977c180f7e1d861af60134f4b59 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 6 Oct 2016 21:59:39 +0800
Subject: [PATCH] Refine GitHub templates

---
 .github/issue_template.md        | 29 ++++++++++++++++++++++++-----
 .github/pull_request_template.md | 14 ++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 873f958e..117041af 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,10 +1,31 @@
-Please answer these questions before submitting your issue. Thanks!
+Please read FAQ in wiki then answer these questions before submitting your issue. Thanks!
 
-### What version of Shadowsocks are you using?
+### Environment
 
+* Android version: *e.g. "7.0.0_r14", more detailed description is preferred*
+* Device: *e.g. Google Pixel XL*
+* Shadowsocks version: *version code "v3.0.0" or commit ID "a073f85"*
 
-### What Android OS version and device are you using?
+### Configuration
 
+_Put an `x` inside the [ ] that applies._
+
+* [ ] IPv4 server address
+* [ ] IPv6 server address
+* [ ] Client IPv4 availability
+* [ ] Client IPv6 availability
+* Local port: 1080
+* Encrypt method:
+* [ ] One-time authentication
+* Route:
+* [ ] IPv6 route
+* [ ] Per-App Proxy
+  * [ ] Bypass mode
+* [ ] UDP Forwarding
+* KCP Parameters: (leave blank if not enabled)
+* [ ] Auto Connect
+* [ ] TCP Fast Open
+* [ ] NAT mode
 
 ### What did you do?
 
@@ -14,5 +35,3 @@ Please answer these questions before submitting your issue. Thanks!
 
 ### What did you see instead?
 
-
-### What is your config in detail (with all sensitive info masked)?
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..97f3046e
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,14 @@
+### Type of changes
+
+_Put an `x` inside the [ ] that applies._
+
+* [ ] Bugfix
+* [ ] New feature
+* [ ] Translation
+* [ ] General refinement
+* Other:
+
+### Details
+
+Please provide more details about changes if necessary.
+