🛸 Sync 2026-09-20 11:04:31

This commit is contained in:
github-actions[bot] committed 2026-09-20 11:04:31 +08:00
1 parent 4b4d482791
commit 8df28edee1
10 files changed
+14 -69

No files matched your search

+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.9.16 PKG_VERSION:=26.9.16
PKG_RELEASE:=283 PKG_RELEASE:=284
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
@@ -83,21 +83,6 @@ o = s:option(DynamicList, "users", translate("User"))
for i, v in ipairs(user_list) do for i, v in ipairs(user_list) do
o:value(v[".name"], v.username) o:value(v[".name"], v.username)
end end
o.validate = function(self, value, t)
if type(value) == "string" then value = {value} end
if type(value) == "table" then
for _, u in ipairs(value) do
local found = false
for _, v in ipairs(user_list) do
if u == v[".name"] then found = true; break end
end
if not found then
return nil, translate("Please configure user info on the User Management page.")
end
end
end
return value
end
o:depends({ protocol = "mixed" }) o:depends({ protocol = "mixed" })
o:depends({ protocol = "socks" }) o:depends({ protocol = "socks" })
o:depends({ protocol = "http" }) o:depends({ protocol = "http" })
@@ -76,21 +76,6 @@ o = s:option(DynamicList, "users", translate("User"))
for i, v in ipairs(user_list) do for i, v in ipairs(user_list) do
o:value(v[".name"], v.username) o:value(v[".name"], v.username)
end end
o.validate = function(self, value, t)
if type(value) == "string" then value = {value} end
if type(value) == "table" then
for _, u in ipairs(value) do
local found = false
for _, v in ipairs(user_list) do
if u == v[".name"] then found = true; break end
end
if not found then
return nil, translate("Please configure user info on the User Management page.")
end
end
end
return value
end
o:depends({ protocol = "http" }) o:depends({ protocol = "http" })
o:depends({ protocol = "socks" }) o:depends({ protocol = "socks" })
o:depends({ protocol = "shadowsocks" }) o:depends({ protocol = "shadowsocks" })
@@ -50,21 +50,6 @@ for i, v in ipairs(user_list) do
o:value(v[".name"], v.username) o:value(v[".name"], v.username)
end end
o:depends({ custom = false }) o:depends({ custom = false })
o.validate = function(self, value, t)
if type(value) == "string" then value = {value} end
if type(value) == "table" then
for _, u in ipairs(value) do
local found = false
for _, v in ipairs(user_list) do
if u == v[".name"] then found = true; break end
end
if not found then
return nil, translate("Please configure user info on the User Management page.")
end
end
end
return value
end
o = s:option(Flag, "realms", translate("Realms")) o = s:option(Flag, "realms", translate("Realms"))
o.default = "0" o.default = "0"
@@ -3,13 +3,6 @@ local map = self.map
local api = map.api local api = map.api
local section = self.section local section = self.section
-%> -%>
<style>
[id*="_users"] .cbi-dropdown li[data-value="-"],
[id*="_users"] .cbi-dropdown input[type="text"],
[id*="_users"] .cbi-dropdown .preview li[data-value="-"] {
display: none !important;
}
</style>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function server_update_config(cfgid, data, redirect_url) { function server_update_config(cfgid, data, redirect_url) {
-3
View File
@@ -1682,9 +1682,6 @@ msgstr "用户管理"
msgid "User Config" msgid "User Config"
msgstr "用户配置" msgstr "用户配置"
msgid "Please configure user info on the User Management page."
msgstr "请在用户管理页设置用户信息。"
msgid "Logs" msgid "Logs"
msgstr "日志" msgstr "日志"
+3 -3
View File
@@ -17,12 +17,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-wwand PKG_NAME:=luci-app-wwand
PKG_VERSION:=1.6.7_p2 PKG_VERSION:=1.6.7_p5
PKG_RELEASE:=22 PKG_RELEASE:=23
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/luci-app-wwand.git PKG_SOURCE_URL:=https://github.com/ddimension/luci-app-wwand.git
PKG_SOURCE_VERSION:=7ac9dd73b7b9aaa3b5fe53ce0ce7719e25f58d13 PKG_SOURCE_VERSION:=28b49c1034a2944b6b0b3a76746938eb9813cdd9
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
@@ -8,7 +8,7 @@
.Dashboard { .Dashboard {
--dashboard-surface-alt: var(--background-color-medium, #f2f4f7); --dashboard-surface-alt: var(--background-color-medium, #f2f4f7);
--dashboard-text: var(--text-color-high, #1f2933); --dashboard-text: var(--text-color-high, #1f2933);
--dashboard-text-muted: var(--text-color-low, #6b7280); --dashboard-text-muted: var(--text-color-medium, #6b7280);
--dashboard-border: var(--border-color-medium, rgba(0, 0, 0, 0.12)); --dashboard-border: var(--border-color-medium, rgba(0, 0, 0, 0.12));
--dashboard-primary: var(--primary-color-high, #1976d2); --dashboard-primary: var(--primary-color-high, #1976d2);
--dashboard-success: var(--success-color-high, #00ac59); --dashboard-success: var(--success-color-high, #00ac59);
@@ -33,7 +33,7 @@
[data-darkmode="true"] .Dashboard { [data-darkmode="true"] .Dashboard {
--dashboard-surface-alt: var(--background-color-medium, #262b34); --dashboard-surface-alt: var(--background-color-medium, #262b34);
--dashboard-text: var(--text-color-high, #e6e8eb); --dashboard-text: var(--text-color-high, #e6e8eb);
--dashboard-text-muted: var(--text-color-low, #9aa3ad); --dashboard-text-muted: var(--text-color-medium, #9aa3ad);
--dashboard-border: var(--border-color-medium, rgba(255, 255, 255, 0.12)); --dashboard-border: var(--border-color-medium, rgba(255, 255, 255, 0.12));
--dashboard-series-4: #a98cf0; --dashboard-series-4: #a98cf0;
--dashboard-series-5: #e5652c; --dashboard-series-5: #e5652c;
@@ -46,7 +46,7 @@
:root:not([data-darkmode="false"]) .Dashboard { :root:not([data-darkmode="false"]) .Dashboard {
--dashboard-surface-alt: var(--background-color-medium, #262b34); --dashboard-surface-alt: var(--background-color-medium, #262b34);
--dashboard-text: var(--text-color-high, #e6e8eb); --dashboard-text: var(--text-color-high, #e6e8eb);
--dashboard-text-muted: var(--text-color-low, #9aa3ad); --dashboard-text-muted: var(--text-color-medium, #9aa3ad);
--dashboard-border: var(--border-color-medium, rgba(255, 255, 255, 0.12)); --dashboard-border: var(--border-color-medium, rgba(255, 255, 255, 0.12));
--dashboard-series-4: #a98cf0; --dashboard-series-4: #a98cf0;
--dashboard-series-5: #e5652c; --dashboard-series-5: #e5652c;
@@ -150,7 +150,7 @@
.dashboard-donut-track { .dashboard-donut-track {
fill: none; fill: none;
stroke: var(--dashboard-surface-alt); stroke: var(--dashboard-border);
stroke-width: 16; stroke-width: 16;
} }
+3 -3
View File
@@ -20,12 +20,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-proto-wwand PKG_NAME:=luci-proto-wwand
PKG_VERSION:=1.6.7 PKG_VERSION:=1.6.7_p2
PKG_RELEASE:=11 PKG_RELEASE:=12
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/luci-proto-wwand.git PKG_SOURCE_URL:=https://github.com/ddimension/luci-proto-wwand.git
PKG_SOURCE_VERSION:=6e214de502bae28cb4badb82f4a8c0674b760aa8 PKG_SOURCE_VERSION:=ebacded705a3bd5886c42c54ba66a1e26b7e4f42
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
+3 -3
View File
@@ -49,12 +49,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wwand PKG_NAME:=wwand
PKG_VERSION:=1.6.7_p21 PKG_VERSION:=1.6.7_p46
PKG_RELEASE:=46 PKG_RELEASE:=47
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git
PKG_SOURCE_VERSION:=910e38b7e4c92e273b91aeead3bea7e2f7104a27 PKG_SOURCE_VERSION:=6ae4cab239ecd02e570d7cd51584d60101704732
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only