Merge branch 'develop' into feature/react-admin

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,28 +1,37 @@
-name: 🐛 Bug Report
+name: Bug Report
-description: For reporting code or design bugs with the software. DO NOT REPORT APACHE/NGINX/PHP CONFIGURATION ISSUES.
+description: Something isn't working quite right in the software.
 body:
 - type: markdown
   attributes:
     value: |
-        DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER. 
+      Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.gg/pterodactyl).
-        For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.gg/pterodactyl)
-        You MUST complete all of the below information when reporting a bug, failure to do so will result in the closure of your issue. PLEASE stop spamming our tracker with "bugs" that are not related to this project.
-        *To obtain logs for the panel and wings the below commands should help with the retrieval of them.*
-        * **Panel:** `tail -n 100 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc bin.ptdl.co 99`
-        * **Wings:** `sudo wings diagnostics`
 
-- type: markdown
+- type: checkboxes
   attributes:
-    value: |
+    label: Is there an existing issue for this?
-        **Background**"
+    description: Please [search here](https://github.com/pterodactyl/panel/issues) to see if an issue already exists for your problem.
-
-- type: dropdown
-  id: panel-or-wings
-  attributes:
-    label: Panel or Wings
     options:
-      - "Panel"
+    - label: I have searched the existing issues before opening this issue.
-      - "Wings"
+      required: true
+
+- type: textarea      
+  attributes:
+    label: Current Behavior
+    description: Please provide a clear & concise description of the issue.
+  validations:
+    required: true
+
+- type: textarea      
+  attributes:
+    label: Expected Behavior
+    description: Please describe what you expected to happen.
+  validations:
+    required: true
+
+- type: textarea      
+  attributes:
+    label: Steps to Reproduce
+    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will likely result in this issue being closed.
   validations:
     required: true
 
@@ -31,7 +40,7 @@ body:
   attributes:
     label: Panel Version
     description: Version number of your Panel (latest is not a version)
-    placeholder: 1.x.x
+    placeholder: 1.4.0
   validations:
     required: true
 
@@ -40,102 +49,20 @@ body:
   attributes:
     label: Wings Version
     description: Version number of your Wings (latest is not a version)
-    placeholder: 1.x.x
+    placeholder: 1.4.2
   validations:
     required: true
 
-- type: input
+- type: textarea
   id: panel-logs
   attributes:
-    label: Panel Logs
+    label: Error Logs
-    placeholder: "https://bin.ptdl.co/"
+    description: |
-  validations:
+      Run the following command to collect logs on your system.
-    required: true
       
-- type: input
+      Wings: `sudo wings diagnostics`
-  id: wings-logs
+      Panel: `tail -n 100 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc bin.ptdl.co 99`
-  attributes:
+    placeholder: "https://bin.ptdl.co/a1h6z"
-    label: Wings Logs
-    placeholder: "https://ptero.co/"
-  validations:
-    required: true
-
-- type: input
-  id: server-os
-  attributes:
-    label: Server OS
-    placeholder: "Ubuntu 20.04"
-  validations:
-    required: true
-
-- type: input
-  id: computer-os
-  attributes:
-    label: Your Computer's OS
-    placeholder: "Windows"
-  validations:
-    required: true
-
-- type: input
-  id: browser
-  attributes:
-    label: Browser
-    placeholder: "Google Chrome"
-  validations:
-    required: true
-    
-- type: input
-  id: php-version
-  attributes:
-    label: PHP Version
-    placeholder: "8.0.5"
-  validations:
-    required: true
-
-- type: textarea
-  id: docker-info
-  attributes:
-    label: Information regarding docker
-    description: "The info returned from `docker info`"
     render: bash
   validations:
-    required: true
+    required: false
-
-- type: textarea
-  id: kernel-info
-  attributes:
-    label: Information regarding docker
-    description: "The info returned from `uname -a`"
-    render: bash
-  validations:
-    required: true
-
-- type: textarea      
-  id: actual-behavior
-  attributes:
-    label: Actual Behavior
-    description: What actually happened instead
-    placeholder: Server crashed with error X
-  validations:
-    required: true
-
-- type: textarea          
-  id: expected-behavior
-  attributes:
-    label: Expected Behavior
-    description: What did you expect to happen
-    placeholder: Install the server, start it, play
-  validations:
-    required: true
-
-- type: textarea       
-  id: reproduce-steps
-  attributes:
-    label: Steps To Reproduce
-    description: Step by step what to do to cause the issue
-    placeholder: |
-      Step 1 Set version to latest
-      Step 2 install
-      Step 3 Receive error X or Y
-  validations:
-    required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🤷 Installation Help
+  - name: Installation Help
     url: https://discord.gg/pterodactyl
     about: Please visit our Discord for help with your installation.
-  - name: ❓ General Question
+  - name: General Question
     url: https://discord.gg/pterodactyl
     about: Please visit our Discord for general questions about Pterodactyl.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,38 +1,31 @@
-name: 🚀 Feature Request
+name: Feature Request
-description: Suggest an idea for this project
+description: Suggest a new feature or improvement for the software.
 body:
-- type: textarea
+- type: checkboxes
-  id: feat-to-problem
   attributes:
-    label: Is your feature request related to a problem?
+    label: Is there an existing feature request for this?
-    description: "A clear and concise description of what the problem is."
+    description: Please [search here](https://github.com/pterodactyl/panel/issues?q=is%3Aissue) to see if someone else has already suggested this.
-    render: bash
+    options:
+    - label: I have searched the existing issues before opening this feature request.
+      required: true
+
+- type: textarea
+  attributes:
+    label: Describe the feature you would like to see.
+    description: "A clear & concise description of the feature you'd like to have added, and what issues it would solve."
   validations:
     required: true
 
 - type: textarea
-  id: solution
   attributes:
-    label: Describe the solution you'd like
+    label: Describe the solution you'd like.
-    description: "A clear and concise description of what you want to happen."
+    description: "You must explain how you'd like to see this feature implemented. Technical implementation details are not necessary, rather an idea of how you'd like to see this feature used."
-    render: bash
   validations:
     required: true
 
 - type: textarea
-  id: alternatives
   attributes:
-    label: Describe alternatives you've considered
+    label: Additional context to this request.
-    description: "A clear and concise description of any alternative solutions or features you've considered."
+    description: "Add any other context or screenshots about the feature request."
-    render: bash
-  validations:
-    required: true
-
-- type: textarea
-  id: context
-  attributes:
-    label: Additional context
-    description: "Add any other context or screenshots about the feature request here."
-    render: bash
   validations:
     required: false