Merge with upstream repo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,43 +7,49 @@ assignees: ''
 
 ---
 
-**Before submitting an issue**
+<!-- These comments will NOT appear in your issue, so it's OK to ignore them -->
+<!--
+Thanks for reporting a bug for RaspAP.
 
-All submitters MUST read this first https://docs.raspap.com/issues/
+Before creating a new bug report, all submitters MUST read the issue reporting guidelines:
+https://docs.raspap.com/issues/
 
-Have a question or want to suggest a feature? Start or join a discussion https://github.com/raspap/raspap-webgui/discussions
+Refer to the frequently asked questions (FAQ) and official documentation here:
+https://docs.raspap.com/faq/
 
-* [ ] This is a bug report
+Do you have a question or want to suggest a new feature? Start a Discussion here:
-* [ ] I searched existing issues before opening this one
+https://github.com/RaspAP/raspap-webgui/discussions
-* [ ] I checked the FAQ and Wiki before creating this issue
-* [ ] I have read and understand the issue reporting guidelines 
 
-**Describe the bug**
+Be sure there are no issues similar to yours that are already open. You can check this by searching the issues in this repository. If there is a duplicate issue, please close this one and add a comment to the existing issue instead.
-A clear and concise description of what the bug is.
+-->
+<!-- Provide a general summary of the issue in the Title above -->
 
-**Your environment**
+## Checklist
-* Raspberry Pi hardware (examples: Pi 3 Model B+, Pi Zero W)  
+<!-- IMPORTANT! Fill in the boxes that apply by marking them like so: [x] -->
-* Raspbian version (examples: RPi OS Lite, Armbian)
+- [ ] This is a bug report
-* RaspAP version (reported by the Quick Installer) 
+- [ ] I have searched this repository for existing issues
-* Followed the project prerequisites? (Y/N)
+- [ ] I checked the FAQ and official documentation before creating this issue
-* Checked the project FAQ? (Y/N)
+- [ ] I have read and understand the issue reporting guidelines 
-* RaspAP Quick Install or Manual setup?
-* Using default configuration? (Y/N)
-* Simultaneous AP and managed mode? (Y/N)
-* Onboard wireless chipset or external adapter? 
-* Other software or services running with RaspAP?
 
-**Steps to reproduce**
+## Bug description
-Tell us how to reproduce this issue. Provide as much detailed information as possible.
+<!-- Provide a detailed description of the issue -->
 
-**Expected behavior**
+## Your environment
-A clear and concise description of what you expected to happen.
+1. Operating System: **ENTER HERE** <!-- RPi OS 32-bit Lite, Armbian, Debian, etc. -->
+2. Hardware and version: <!-- RPi Zero/3B+/4, OrangePi 3, etc. -->
+3. RaspAP version: <!-- reported by the Quick Installer or About page -->
+4. Followed the project prerequisites? <!-- Yes/No -->
+5. RaspAP Quick Install or Manual setup? <!-- Quick Install/Manual -->
+6. Using default configuration? <!-- Yes/No -->
+7. Simultaneous AP and managed mode? <!-- Yes/No -->
+8. Onboard wireless chipset or external adapter? <!-- Onboard/External -->
+9. Other software or services running with RaspAP? 
 
-**Actual behavior**
+## Steps to reproduce
-Tell us what you observed instead.
+<!-- Tell us how to reproduce this issue. Provide as much detailed information as possible -->
 
-**Screenshots**
+## Screenshots
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to help explain your problem -->
 
-**Additional context**
+## Additional context
-Add any other context about the problem here.
+<!-- Add any other context about the problem here -->

BACKERS.md

@@ -21,7 +21,7 @@ When backers were asked which feature they'd most like to see added to RaspAP, t
 ✅ OpenVPN service logging  
 ✅ Night mode toggle  
 ✅ Restrict network to static clients  
-⚙️  WireGuard support (in progress)  
+✅ WireGuard support  
 ⚙️  Traffic shaping (in progress)  
 
 Look for the list above to grow as we add more exclusive features. 
@@ -34,7 +34,7 @@ Below is a list of funding targets. When a funding target is reached, the featur
 ✅ OpenVPN service logging  
 ✅ Night mode toggle  
 ✅ Restrict network to static clients  
-⚙️  WireGuard support (in progress)  
+✅ WireGuard support  
 ⚙️  Traffic shaping (in progress)  
 
 ### Frequently asked questions

CNAME

@@ -1 +0,0 @@
-raspap.com

installers/common.sh

@@ -640,9 +640,10 @@ function _optimize_php() {
 
 function _install_complete() {
     _install_log "Installation completed"
-    echo "Join RaspAP Insiders for access to exclusive features:"
+    echo "Join RaspAP Insiders for early access to exclusive features!"
     echo -e "${ANSI_RASPBERRY}"
-    echo "> https://github.com/sponsors/RaspAP"
+    echo "> https://docs.raspap.com/insiders/"
+    echo "> https://github.com/sponsors/RaspAP/"
     echo -e "${ANSI_RESET}"
     if [ "$assume_yes" == 0 ]; then
         # Prompt to reboot if wired ethernet (eth0) is connected.

templates/hostapd/advanced.php

@@ -233,7 +233,7 @@
         <option value="OM">Oman</option>
         <option value="PK">Pakistan</option>
         <option value="PW">Palau</option>
-        <option value="PS">Palestinian Territory, Occupied</option>
+        <option value="PS">Palestinian Territory</option>
         <option value="PA">Panama</option>
         <option value="PG">Papua New Guinea</option>
         <option value="PY">Paraguay</option>
@@ -281,7 +281,7 @@
         <option value="SE">Sweden</option>
         <option value="CH">Switzerland</option>
         <option value="SY">Syrian Arab Republic</option>
-        <option value="TW">Taiwan, Province of China</option>
+        <option value="TW">Taiwan</option>
         <option value="TJ">Tajikistan</option>
         <option value="TZ">Tanzania, United Republic of</option>
         <option value="TH">Thailand</option>

yarn.lock

@@ -4712,9 +4712,9 @@ xtend@~4.0.0, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
+  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^4.0.0:
   version "4.0.0"