From 242e7e720010843a03a85b319cefa0b23e927214 Mon Sep 17 00:00:00 2001 From: Flex Zhong <124694738@qq.com> Date: Fri, 21 Aug 2020 13:01:02 +0800 Subject: [PATCH 01/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f1c47b8..45183a23 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ ## Related Links - - [Website](https://qv2ray.github.io/en/) and [First Time Usage](https://qv2ray.github.io/en/getting-started/) + - [Website](https://qv2ray.net/en/) and [First Time Usage](https://qv2ray.net/en/getting-started/) - Latest **[Release](https://github.com/Qv2ray/Qv2ray/releases/latest)** - Welcome to translate Qv2ray via: **[Transifex](https://www.transifex.com/qv2ray/qv2ray)** From 95b7ba95dda696da93f15dab045a0320dd831c5f Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Thu, 27 Aug 2020 08:17:49 +0800 Subject: [PATCH 02/21] aur: overwrite update https://github.com/DuckSoft/build-aur-action/commit/2fcaaa788b026807aa029172d493bdc125b1b1ac --- .github/workflows/aur.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 4b47cba7..4f1b32fa 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -34,7 +34,7 @@ jobs: repo: [qv2ray, qv2ray-dev-git] runs-on: [ubuntu-latest] steps: - - uses: DuckSoft/build-aur-action@v1.0 + - uses: DuckSoft/build-aur-action@v1.1 with: repo-name: ${{ matrix.repo }} From 851cb6f0552154e443b553b7ffa8adfb18a9a58a Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Wed, 2 Sep 2020 00:33:49 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Issue=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..87646293 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: 加入 Telegram 群组 / Join Telegram Group + url: https://t.me/qv2ray + about: 使用问题请加入群组讨论 / For usage problems please chat in the group From 3e4a8287a5a735961f86e246af4f8af8fc1ae7e5 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Tue, 15 Sep 2020 16:09:58 +0800 Subject: [PATCH 04/21] README.md: GPL-Compliance --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 45183a23..56fae123 100644 --- a/README.md +++ b/README.md @@ -130,11 +130,3 @@ Qv2ray is licenced under [![License: GPL v3](https://img.shields.io/badge/Licens You should have received a copy of the GNU General Public License along with this program. If not, see . ``` - -***注意:Qv2ray 仅能用于 Qt/C++/Linux/CI/自动化 等相关技术的学习和在法律允许范围内的使用,任何个人或集体不得使用 Qv2ray 进行任何违反相关法律法规的活动。*** - -> Note: Qv2ray can **ONLY** be used for learning related technologies such as Qt/C++/Linux/CI/automation and use within the scope permitted by law. Any individual or group **MAY NOT** use Qv2ray for any violation of relevant laws and regulations. - -*任何尝试下载或下载 Qv2ray 任意分支或发行版即代表您同意本项目作者及贡献者不承担任何由于您违反以上准则所带来的任何法律责任。* - -> Any attempt to download of any branch or distribution of Qv2ray constitutes your agreement that the author and the contributor of the project **will not be** liable for any legal liability arising from your breach of the above guidelines. From 380049ecfad4fd65ca845b6f0af26bec7a2a706d Mon Sep 17 00:00:00 2001 From: ymshenyu Date: Wed, 23 Sep 2020 11:10:06 +0800 Subject: [PATCH 05/21] remove built-in plugin in snap package --- snap/snapcraft.yaml | 64 ++------------------------------------------- 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a480108c..39ba6860 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -67,6 +67,8 @@ parts: - libprotobuf-dev - protobuf-compiler-grpc - pkg-config + - libcurl4-openssl-dev + - libqt5svg5-dev stage-packages: - libgcc1 - libstdc++6 @@ -122,65 +124,3 @@ parts: plugin: nil stage-packages: - qt5-gtk-platformtheme - - qv2ray-ssr-plugin: - plugin: cmake - source-type: git - source: https://github.com/Qv2ray/QvPlugin-SSR.git - source-branch: dev - build-packages: - - build-essential - - libsodium-dev - - libuv1-dev - - libssl-dev - - qttools5-dev - - qt5-default - stage-packages: - - libgcc1 - - libstdc++6 - - libssl1.1 - - libqt5core5a - - libqt5gui5 - - libqt5network5 - - libqt5widgets5 - - libuv1 - - libsodium23 - cmake-parameters: - - -DCMAKE_INSTALL_PREFIX=/usr - - -DCMAKE_BUILD_TYPE=Release - - -DSSR_UVW_WITH_QT=ON - - -DUSE_SYSTEM_SODIUM=ON - - -DUSE_SYSTEM_LIBUV=ON - - -DSTATIC_LINK_LIBUV=OFF - - -DSTATIC_LINK_SODIUM=OFF - after: - - desktop-qt5 - - qv2ray-trojan-plugin: - plugin: cmake - source-type: git - source: https://github.com/Qv2ray/QvPlugin-Trojan.git - source-branch: dev - build-packages: - - build-essential - - libboost-system-dev - - libboost-program-options-dev - - libssl-dev - - qttools5-dev - - qt5-default - stage-packages: - - libgcc1 - - libstdc++6 - - libssl1.1 - - libqt5core5a - - libqt5gui5 - - libqt5network5 - - libqt5widgets5 - - libboost-program-options1.71.0 - - libboost-system1.71.0 - cmake-parameters: - - -DCMAKE_INSTALL_PREFIX=/usr - - -DCMAKE_BUILD_TYPE=Release - - -DFORCE_TCP_FASTOPEN=ON - after: - - desktop-qt5 From 6d761f73abda55b39b4d98a56063881aef88cb42 Mon Sep 17 00:00:00 2001 From: QxQ <59914293+U-v-U@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:20:45 +0800 Subject: [PATCH 06/21] Update ----.md --- .github/ISSUE_TEMPLATE/----.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md index 3f41b8d9..ca899912 100644 --- a/.github/ISSUE_TEMPLATE/----.md +++ b/.github/ISSUE_TEMPLATE/----.md @@ -1,33 +1,32 @@ --- name: 使用疑问 about: 使用此模板提出使用上的疑问 -title: 使用疑问:<你有咩问题> +title: 使用疑问:「 」 labels: help wanted assignees: '' - --- +**请删掉下面一行内容,未删掉的 Issue 将会直接被 bot 关闭** +`QV_ISSUE_QUESTION_TEMPLATE_PLACEHOLDER` + ### 你想做啥? *简要描述你的最原始的目的。* -例:我在学校,校园网能解锁文献数据库,我想对这些地址直连。 + ### 你目前试了啥? *简单叙述你为解决这个问题所进行的操作。* -例:看完文档,没有相关内容,就过来问一问。 + ### 其他要补充的信息? *在此附加其他需要补充的信息。* From 8eab02b968a8866ae9c784cdb6ff03d101f48bd3 Mon Sep 17 00:00:00 2001 From: QxQ <59914293+U-v-U@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:21:13 +0800 Subject: [PATCH 07/21] Update ----.md --- .github/ISSUE_TEMPLATE/----.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md index ca899912..6557c69d 100644 --- a/.github/ISSUE_TEMPLATE/----.md +++ b/.github/ISSUE_TEMPLATE/----.md @@ -18,6 +18,7 @@ assignees: '' --> **请删掉下面一行内容,未删掉的 Issue 将会直接被 bot 关闭** + `QV_ISSUE_QUESTION_TEMPLATE_PLACEHOLDER` ### 你想做啥? From c43165b6c17ce622fd83c01a2e56804d03fbb2f5 Mon Sep 17 00:00:00 2001 From: QxQ <59914293+U-v-U@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:30:18 +0800 Subject: [PATCH 08/21] Update -----.md --- .github/ISSUE_TEMPLATE/-----.md | 36 +++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/-----.md b/.github/ISSUE_TEMPLATE/-----.md index 6a84e5da..328572e9 100644 --- a/.github/ISSUE_TEMPLATE/-----.md +++ b/.github/ISSUE_TEMPLATE/-----.md @@ -9,21 +9,41 @@ assignees: '' +**请删掉下面一行内容,未删掉的 Issue 将会直接被 bot 关闭** + +`QV_ISSUE_FEATUREREQUEST_TEMPLATE_PLACEHOLDER` + +----------------- + **你的功能请求与使用中遇到的麻烦有关吗?若有,请描述?** -请尽可能清晰简洁地描述问题。例:每次吃饭都要出门穿衣收拾打扮,太烦了…… + +请尽可能清晰简洁地描述问题。 + + **简单描述你预期的解决方案?** -请尽可能清晰简洁描述问题。例:我想打电话给餐馆让他们直接给我送过来…… + +请尽可能清晰简洁描述问题。 + + **你有想到其他比较容易实现的解决方案吗?** -请简单清晰描述。例:或者直接给餐馆签个协议也行…… + +请简单清晰描述。 + + **补充内容** 请在此附加任何你认为对你的描述有所帮助的内容。 From e40ae75c997aa34845f01bff7370be9dc475cf60 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Thu, 19 Nov 2020 16:55:06 +0800 Subject: [PATCH 09/21] actions: { unsafe } --- .github/workflows/aur.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 4f1b32fa..ca09f7db 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -11,6 +11,11 @@ on: schedule: - cron: "0 19 * * *" +# unsafe { +env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true +# } + jobs: check_commit_msg: outputs: From 1ea8d20bc9a5d56b67974663f1036329dcc6938d Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Thu, 19 Nov 2020 16:56:43 +0800 Subject: [PATCH 10/21] actions: unsafe { deb } --- .github/workflows/deb.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 18afee00..a5a22d79 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -5,6 +5,11 @@ on: release: types: [prereleased] +# unsafe { +env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true +# } + jobs: check_commit_msg: outputs: From dfe1c19c7fecd8c1639a61a0f69f0a4e1834f69c Mon Sep 17 00:00:00 2001 From: sixg0000d Date: Wed, 9 Dec 2020 18:02:00 +0800 Subject: [PATCH 11/21] Update project translations url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56fae123..e6753015 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ ## Related Links - [Website](https://qv2ray.net/en/) and [First Time Usage](https://qv2ray.net/en/getting-started/) - Latest **[Release](https://github.com/Qv2ray/Qv2ray/releases/latest)** - - Welcome to translate Qv2ray via: **[Transifex](https://www.transifex.com/qv2ray/qv2ray)** + - Welcome to translate Qv2ray via: **[Crowdin](https://crowdin.com/project/qv2ray)** ## Special Thanks - **Quality Assurance & User Experience:** [@DuckSoft](https://github.com/DuckSoft/) From 9e19c9379472dffe031015eb8f44f9b2867b5d13 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 2 Jan 2021 16:21:09 +0800 Subject: [PATCH 12/21] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e6753015..b5b1b3f3 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ [![GitHub Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/latest/total?style=flat-square&logo=github)](https://github.com/Qv2ray/Qv2ray/releases) [![GitHub All Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/total?label=downloads-total&logo=github&style=flat-square)](https://github.com/Qv2ray/Qv2ray/releases) +## [Documentation / 文档](https://qv2ray.net/) + ## Availability & Status [![Snap Status](https://img.shields.io/travis/com/Qv2ray/Qv2ray?label=snapcraft-travis&logo=github)](https://travis-ci.com/Qv2ray/Qv2ray) From d784acd76ce2bd8a819305479b53234da29be4e6 Mon Sep 17 00:00:00 2001 From: ymshenyu <39402395+ymshenyu@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:15:13 +0800 Subject: [PATCH 13/21] Update qv2ray.metainfo.xml --- assets/qv2ray.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/qv2ray.metainfo.xml b/assets/qv2ray.metainfo.xml index 31962225..d79f25f6 100644 --- a/assets/qv2ray.metainfo.xml +++ b/assets/qv2ray.metainfo.xml @@ -1,7 +1,7 @@ com.github.Qv2ray - GPL-3.0+ + CC-BY-SA-3.0 GPL-3.0+ Qv2ray Qv2ray is a cross-platform v2ray graphical frontend written in Qt. From c4c5478f77d4290ba09967320491e0ebbbe56fbe Mon Sep 17 00:00:00 2001 From: QxQ <59914293+U-v-U@users.noreply.github.com> Date: Sun, 7 Feb 2021 16:15:41 +0800 Subject: [PATCH 14/21] Update README.md --- README.md | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b5b1b3f3..0985aa93 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,7 @@ [![GitHub Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/latest/total?style=flat-square&logo=github)](https://github.com/Qv2ray/Qv2ray/releases) [![GitHub All Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/total?label=downloads-total&logo=github&style=flat-square)](https://github.com/Qv2ray/Qv2ray/releases) -## [Documentation / 文档](https://qv2ray.net/) - -## Availability & Status +## Availability & CI/CD Status [![Snap Status](https://img.shields.io/travis/com/Qv2ray/Qv2ray?label=snapcraft-travis&logo=github)](https://travis-ci.com/Qv2ray/Qv2ray) [![Qv2ray AUR Build](https://github.com/Qv2ray/Qv2ray/workflows/Build%20Qv2ray%20AUR/badge.svg)](https://github.com/Qv2ray/Qv2ray/actions?query=workflow%3A%22Build+Qv2ray+AUR%22) @@ -58,7 +56,6 @@ - Flathub flathub @@ -94,26 +91,21 @@ -## Related Links - - [Website](https://qv2ray.net/en/) and [First Time Usage](https://qv2ray.net/en/getting-started/) - - Latest **[Release](https://github.com/Qv2ray/Qv2ray/releases/latest)** - - Welcome to translate Qv2ray via: **[Crowdin](https://crowdin.com/project/qv2ray)** +Translation Platform: **[Crowdin](https://crowdin.com/project/qv2ray)** ## Special Thanks -- **Quality Assurance & User Experience:** [@DuckSoft](https://github.com/DuckSoft/) -- **Debian-based distro Packager:** [@ymshenyu](https://github.com/ymshenyu) -- [**JetBrains Developer Toolbox**](https://www.jetbrains.com/?from=Qv2ray) + +**[JetBrains Developer Toolbox](https://www.jetbrains.com/?from=Qv2ray)** + ------------------------------- -## Copyright -### This is free software, and you are welcome to redistribute it under certain conditions -- ALL credit goes to **Qv2ray User Group** and **Qv2ray Development Group** - -### Libraries that have been used in Qv2ray are listed below (Sorted by date added) -- Please see: [assets/credit.html](assets/credit.html) - ## Licences +This is free software, and you are welcome to redistribute it under certain conditions. + +### Third-party Libraries and Resources +See: [assets/credit.html](assets/credit.html) + Qv2ray is licenced under [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ``` @@ -132,3 +124,6 @@ Qv2ray is licenced under [![License: GPL v3](https://img.shields.io/badge/Licens You should have received a copy of the GNU General Public License along with this program. If not, see . ``` +## Star History + +![stars](https://starchart.cc/Qv2ray/Qv2ray.svg) From 440e354951a79ad236f0dd3e5c4d4f6db358e039 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 1 May 2021 17:04:01 +0800 Subject: [PATCH 15/21] Update issue templates --- .github/ISSUE_TEMPLATE/-----.md | 49 ------------ .github/ISSUE_TEMPLATE/----.md | 33 -------- .github/ISSUE_TEMPLATE/bug---english.md | 86 -------------------- .github/ISSUE_TEMPLATE/bug-report.md | 27 +++++++ .github/ISSUE_TEMPLATE/bug.md | 95 ----------------------- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++ .github/ISSUE_TEMPLATE/feature-request.md | 20 ----- .github/ISSUE_TEMPLATE/usage-questions.md | 26 ------- 8 files changed, 65 insertions(+), 309 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/-----.md delete mode 100644 .github/ISSUE_TEMPLATE/----.md delete mode 100644 .github/ISSUE_TEMPLATE/bug---english.md create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md delete mode 100644 .github/ISSUE_TEMPLATE/bug.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature-request.md delete mode 100644 .github/ISSUE_TEMPLATE/usage-questions.md diff --git a/.github/ISSUE_TEMPLATE/-----.md b/.github/ISSUE_TEMPLATE/-----.md deleted file mode 100644 index 328572e9..00000000 --- a/.github/ISSUE_TEMPLATE/-----.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -name: 功能请求 -about: 使用此模板提建议 -title: 功能请求:<你的鬼点子> -labels: NewFeature -assignees: '' - ---- - - - -**请删掉下面一行内容,未删掉的 Issue 将会直接被 bot 关闭** - -`QV_ISSUE_FEATUREREQUEST_TEMPLATE_PLACEHOLDER` - ------------------ - -**你的功能请求与使用中遇到的麻烦有关吗?若有,请描述?** - -请尽可能清晰简洁地描述问题。 - - - -**简单描述你预期的解决方案?** - -请尽可能清晰简洁描述问题。 - - - -**你有想到其他比较容易实现的解决方案吗?** - -请简单清晰描述。 - - - -**补充内容** -请在此附加任何你认为对你的描述有所帮助的内容。 diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md deleted file mode 100644 index 6557c69d..00000000 --- a/.github/ISSUE_TEMPLATE/----.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -name: 使用疑问 -about: 使用此模板提出使用上的疑问 -title: 使用疑问:「 」 -labels: help wanted -assignees: '' ---- - - - - -**请删掉下面一行内容,未删掉的 Issue 将会直接被 bot 关闭** - -`QV_ISSUE_QUESTION_TEMPLATE_PLACEHOLDER` - -### 你想做啥? -*简要描述你的最原始的目的。* - - -### 你目前试了啥? -*简单叙述你为解决这个问题所进行的操作。* - - -### 其他要补充的信息? -*在此附加其他需要补充的信息。* diff --git a/.github/ISSUE_TEMPLATE/bug---english.md b/.github/ISSUE_TEMPLATE/bug---english.md deleted file mode 100644 index cb736595..00000000 --- a/.github/ISSUE_TEMPLATE/bug---english.md +++ /dev/null @@ -1,86 +0,0 @@ ---- -name: Bug Report -about: Use this template to report a bug -title: '' -labels: Bugs, help wanted -assignees: '' - ---- - - - -- [ ] **I'm sure I've tried to reproduce the problem several times and will provide the system environment, each software and its version that is involved in the problem.** - -## Briefly describe this bug: - - - -## How to trigger this bug: - -1. -2. -3. -4. - -### If it's a connection issue, has it happened in other V2Ray clients? - - - -### Related screenshots or logs - -
- -``` -Please paste your Qv2ray log here: - - -``` - -
- -## System Information - - - -### Open Preferences -> About, and enter the following info - -``` -Version: -Build info: -Extra build info: -``` - -### Operating systems - -- [ ] Linux -- [ ] macOS -- [ ] Windows - -### Installation source - -- [ ] ArchLinuxCN - Stable -- [ ] ArchLinuxCN - Dev-git -- [ ] ArchLinux AUR - Stable -- [ ] ArchLinux AUR - Development -- [ ] Fedora - Stable -- [ ] Fedora - Preview -- [ ] openSUSE - Stable -- [ ] openSUSE - Preview -- [ ] Flathub -- [ ] Snap -- [ ] Homebrew Cask -- [ ] Scoop / Chocolatey / Github Release -- [ ] Compile manually - -### Installed plugins, versions and sources - - - -## Additional Info - - - -*Please hide your server address and UUID if you wish to post the vmess string or your connection setting.* diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 00000000..c65c66fc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,27 @@ +--- +name: Bug Report +about: Report Qv2ray Bug +title: 'Bug Report: ' +labels: Bugs +assignees: '' + +--- + + + +### Summary + + +### Environment + + +### How to Reproduce + + +### Additional Info diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index b5d1e73b..00000000 --- a/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,95 +0,0 @@ ---- -name: Bug 反馈 -about: 使用此模板反馈 bug -title: '' -labels: Bugs, help wanted -assignees: '' - ---- - - - - - -- [ ] **我确定我已经尝试多次触发此次问题,并且将会提供涉及此问题的系统环境,每个软件及其版本。** - -## 简单描述这个 Bug: - - - -## 如何触发这个 Bug: - -1. -2. -3. -4. - -### 如果是连接问题,在其他 V2Ray 客户端里出现过吗? - - - -### 相关截图或日志 - -
- -``` -请从此行下面的行开始粘贴 Qv2ray 日志: - - -``` - -
- -## 系统信息 - - - -### 打开首选项 -> 关于,填写以下信息 - -``` -版本: -编译信息: -额外编译信息: -``` - -### 操作系统 - -- Linux -- macOS -- Windows - -### 安装来源 - -- ArchLinuxCN - 稳定版 -- ArchLinuxCN - 开发版 -- ArchLinux AUR - 稳定版 -- ArchLinux AUR - 开发版 -- Fedora - 稳定版 -- Fedora - 开发版 -- openSUSE - 稳定版 -- openSUSE - 开发版 -- Flathub 包 -- Snap 包 -- Homebrew Cask -- Github Release / Scoop / Chocolatey -- 手动编译 - -### 已安装的插件、版本及安装来源 - - - -## 附加信息 - - - -*请注意打码隐私相关信息。* diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..dd84ea78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md deleted file mode 100644 index da7d122d..00000000 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature Request -about: Suggest an idea for this project -title: 'Feature Request: ' -labels: NewFeature -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/usage-questions.md b/.github/ISSUE_TEMPLATE/usage-questions.md deleted file mode 100644 index 991eb6d1..00000000 --- a/.github/ISSUE_TEMPLATE/usage-questions.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Usage Questions -about: Use this template if you want to ask something about usage. -title: 'Question: ' -labels: '' -assignees: '' - ---- - - - - -### Describe You Purpose - -### Describe What Have You Tried - -### Any Other Thing From 8a9030c045e63067bb241591812d45ede511fd09 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 1 May 2021 17:06:27 +0800 Subject: [PATCH 16/21] Update bug-report.md --- .github/ISSUE_TEMPLATE/bug-report.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index c65c66fc..3380a6f7 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -16,12 +16,20 @@ Notes for Bug Report: --> ### Summary +_A clear and concise description of what the bug is._ -### Environment +### Expected behavior +_A clear and concise description of what you expected to happen._ ### How to Reproduce +_Steps to reproduce the behavior._ + + +### Screenshots +_If applicable, add screenshots to help explain your problem._ ### Additional Info +_Add any other context about the problem here._ From e88a0251a96d683d7f31e7ffdb0f181538fda0c3 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 1 May 2021 17:06:40 +0800 Subject: [PATCH 17/21] Delete bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 38 ---------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea78..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. From e9e7e73340bf0eab67d0cef934578380ce261e3b Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 1 May 2021 17:10:47 +0800 Subject: [PATCH 18/21] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 87646293..3113f1f7 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,10 @@ blank_issues_enabled: false contact_links: + - name: 使用疑问 / Usage Inquiry + url: https://github.com/Qv2ray/Qv2ray/discussions + about: 使用疑问请前往讨论区 / Please go to Discussion for that. + - name: 功能请求 / Feature Request + url: https://github.com/Qv2ray/Qv2ray/discussions + about: 功能请求请前往讨论区 / Please go to Discussion for that. - name: 加入 Telegram 群组 / Join Telegram Group url: https://t.me/qv2ray - about: 使用问题请加入群组讨论 / For usage problems please chat in the group From 162d2e970c4608d7100b092a8854ecdc053de6a8 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 1 May 2021 17:11:54 +0800 Subject: [PATCH 19/21] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3113f1f7..6101c9d9 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -6,5 +6,6 @@ contact_links: - name: 功能请求 / Feature Request url: https://github.com/Qv2ray/Qv2ray/discussions about: 功能请求请前往讨论区 / Please go to Discussion for that. - - name: 加入 Telegram 群组 / Join Telegram Group + - name: 加入 Telegram 群组 / Telegram Group url: https://t.me/qv2ray + about: 点击加入 Telegram 群组 / Click to join our Telegram chat. From bb80f64250e61d630ed948b986e08a717c5f071b Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 8 May 2021 13:50:58 +0800 Subject: [PATCH 20/21] docs: reinforce bug report usage --- .github/ISSUE_TEMPLATE/bug-report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 3380a6f7..8a228766 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -1,6 +1,6 @@ --- -name: Bug Report -about: Report Qv2ray Bug +name: Bug Report / 缺陷报告 +about: 仅用于报告缺陷,滥用将直接关闭,不予回复 / For Bug Reports Only. title: 'Bug Report: ' labels: Bugs assignees: '' From 7cfd904ef728a063f0754b7399ababc06adc43cc Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Sat, 8 May 2021 13:51:31 +0800 Subject: [PATCH 21/21] chores: fix format --- .github/ISSUE_TEMPLATE/bug-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 8a228766..673ce536 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -1,5 +1,5 @@ --- -name: Bug Report / 缺陷报告 +name: 缺陷报告 / Bug Report about: 仅用于报告缺陷,滥用将直接关闭,不予回复 / For Bug Reports Only. title: 'Bug Report: ' labels: Bugs