Skip to content

Commit dccde9a

Browse files
pgu001claude
andcommitted
Merge branch 'upstream/dev' into feat/subscription-multi-provider
Resolved conflicts in luci-app-openclash/luasrc/view/openclash/status.htm - Preserved multi-provider subscription display feature - Kept backward compatibility with single subscription sources - Integrated upstream updates from dev branch 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
2 parents 2efd45f + c46db90 commit dccde9a

File tree

102 files changed

+1467
-1866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1467
-1866
lines changed

.github/workflows/compile_new_ipk.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
run: |
101101
CHNR_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/etc/openclash/china_ip_route.ipset
102102
CHNR6_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/etc/openclash/china_ip6_route.ipset
103-
YACD_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/usr/share/openclash/ui/yacd
104103
ZASHBOARD_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/usr/share/openclash/ui/zashboard
105104
METACUBEXD_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/usr/share/openclash/ui/metacubexd
106105
GEOSITE_PATH=tmp/${{ matrix.target.sdk_dir }}/package/luci-app-openclash/root/etc/openclash/GeoSite.dat
@@ -124,15 +123,6 @@ jobs:
124123
rm -rf "$METACUBEXD_PATH"/*
125124
cp -rf "$METACUBEXD_UNZIP_PATH"/* "$METACUBEXD_PATH"
126125
127-
# 更新 Yacd UI
128-
mkdir -p tmp/yacd_zip
129-
curl -sSL https://github.com/MetaCubeX/Yacd-meta/archive/refs/heads/gh-pages.zip -o tmp/yacd.zip
130-
unzip -q -o tmp/yacd.zip -d tmp/yacd_zip
131-
YACD_UNZIP_PATH="tmp/yacd_zip/Yacd-meta-gh-pages"
132-
mkdir -p "$YACD_PATH"
133-
rm -rf "$YACD_PATH"/*
134-
cp -rf "$YACD_UNZIP_PATH"/* "$YACD_PATH"
135-
136126
# 更新 ZashBoard UI
137127
mkdir -p tmp/zashboard_zip
138128
curl -sSL https://github.com/Zephyruso/zashboard/releases/latest/download/dist-cdn-fonts.zip -o tmp/zashboard.zip

luci-app-openclash/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=luci-app-openclash
4-
PKG_VERSION:=0.47.027
4+
PKG_VERSION:=0.47.029
55
PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
66

77
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

0 commit comments

Comments
 (0)