Merge e35f942964 into b3b30470fc

Merge branch 'main' of https://github.com/donaldzou/WGDashboard
Prepare for v4.0.4
2024-09-20 07:16:25 +08:00 · 2024-09-19 22:34:54 +08:00 · 2024-09-19 14:45:11 +08:00 · 2024-09-19 14:44:49 +08:00 · 2024-09-04 14:40:04 +02:00
2 changed files with 5 additions and 3 deletions
--- a/src/dashboard.py
+++ b/src/dashboard.py
@ -33,7 +33,7 @@ import threading

 from flask.json.provider import DefaultJSONProvider

-DASHBOARD_VERSION = 'v4.0.3'
+DASHBOARD_VERSION = 'v4.0.4'
 CONFIGURATION_PATH = os.getenv('CONFIGURATION_PATH', '.')
 DB_PATH = os.path.join(CONFIGURATION_PATH, 'db')
 if not os.path.isdir(DB_PATH):
@ -1303,7 +1303,9 @@ def _regexMatch(regex, text):

 def _getConfigurationList():
    # configurations = {}
-    for i in os.listdir(WG_CONF_PATH):
+    items = os.listdir(WG_CONF_PATH)
+    items.sort()
+    for i in items:
        if _regexMatch("^(.{1,}).(conf)$", i):
            i = i.replace('.conf', '')
            try:
--- a/src/static/app/package.json
+++ b/src/static/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "app",
-  "version": "4.0.2",
+  "version": "4.0.4",
  "private": true,
  "type": "module",
  "scripts": {
Author	SHA1	Message	Date
Martin	5c15f247b8	Merge `e35f942964` into `b3b30470fc`	2024-09-19 22:34:54 +08:00
Donald Zou	b3b30470fc	Merge branch 'main' of https://github.com/donaldzou/WGDashboard	2024-09-19 14:45:11 +08:00
Donald Zou	41d91e75fc	Prepare for v4.0.4	2024-09-19 14:44:49 +08:00
Martin	e35f942964	Update dashboard.py - sort WG configurations Sort WG configurations alphabetically	2024-09-04 14:40:04 +02:00