OSDN Git Service

immortalwrt/luci.git
3 days agoOpenClsh: Update to 0.45.33 openwrt-21.02
Tianling Shen [Wed, 22 Jun 2022 20:13:19 +0000 (04:13 +0800)]
OpenClsh: Update to 0.45.33

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 495fa64f67d870f37dab7a779036746c1cd8b311)

3 days agoluci-app-diskman: sync with upstream source
Tianling Shen [Wed, 22 Jun 2022 20:08:37 +0000 (04:08 +0800)]
luci-app-diskman: sync with upstream source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b363362a9de00ee74f2b7ab43f21536b2b0dc2cd)

3 days agoMerge Official Source
Tianling Shen [Wed, 22 Jun 2022 19:56:20 +0000 (03:56 +0800)]
Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
8 days agoluci-app-ssr-plus: sync with upstream source
Tianling Shen [Fri, 17 Jun 2022 16:57:33 +0000 (00:57 +0800)]
luci-app-ssr-plus: sync with upstream source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit e36b9bd541a66c56fad9f2393cbbfa5b582f21f7)

9 days agoluci-app-ssr-plus: fix generate v2ray ss config
Tianling Shen [Thu, 16 Jun 2022 15:10:55 +0000 (23:10 +0800)]
luci-app-ssr-plus: fix generate v2ray ss config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit daf91637d4622b8012da85845607e7601fcbca8d)

9 days agoluci-app-ssr-plus: sync with upstream
Tianling Shen [Tue, 14 Jun 2022 15:34:36 +0000 (23:34 +0800)]
luci-app-ssr-plus: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1e47528a5372c87e39eb285c58e6daa18014d306)

10 days agoluci-base: network.js: consider uci config for Device.getType()/getParent()
Jo-Philipp Wich [Thu, 16 Jun 2022 07:47:47 +0000 (09:47 +0200)]
luci-base: network.js: consider uci config for Device.getType()/getParent()

For network devices declared in uci but not yet created by netifd, the
runtime status information will be unavailable, causing methods such as
`getType()` to assume plain ethernet interfaces and `getParent()` to fail
resolving parent devices.

Fall back to infer the information from uci configuration settings in such
cases to give accurate type hints to callers.

In particular, this prevents LuCI from turning wireless target networks
containing a to-be-created bridge device into bridges themselves.

Fixes: https://github.com/openwrt/packages/issues/18768
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8effea58d7281fd4f2b6c31d534195dba27a850b)

13 days agotreewide: Backport and sync translations
Hannu Nyman [Sun, 12 Jun 2022 16:54:57 +0000 (19:54 +0300)]
treewide: Backport and sync translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
13 days agoluci-app-vssr: bump to 1.25
Tianling Shen [Sun, 12 Jun 2022 13:08:20 +0000 (21:08 +0800)]
luci-app-vssr: bump to 1.25

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 7c1b32546bc137184e863ebbae8e659eaf1f2003)

13 days agoluci-app-passwall: sync with upstream
Tianling Shen [Sun, 12 Jun 2022 12:53:59 +0000 (20:53 +0800)]
luci-app-passwall: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit f61e034f5e4f9327748c3c020f569340817533ce)

13 days agoluci-theme-argon: sync with upstream
Tianling Shen [Sun, 12 Jun 2022 12:49:24 +0000 (20:49 +0800)]
luci-theme-argon: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8b8a05213fd2ea7950733653bd3d75cb1c0b65f1)

13 days agoluci-theme-argon: use uclient-fetch for smaller size
Tianling Shen [Sat, 21 May 2022 08:10:58 +0000 (16:10 +0800)]
luci-theme-argon: use uclient-fetch for smaller size

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1baf4beaad91c1e13c01a9bd49e61bd36b6b8cec)

13 days agoluci-theme-argon: sync with upstream
Tianling Shen [Sat, 21 May 2022 08:07:20 +0000 (16:07 +0800)]
luci-theme-argon: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit bffde9409f2fcb15785a93a7585e8d4d7c5494c4)

2 weeks agoluci-app-ssr-plus: sync fixes
Tianling Shen [Fri, 10 Jun 2022 13:44:57 +0000 (21:44 +0800)]
luci-app-ssr-plus: sync fixes

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3caf0a505b51a7b71798310f90c5a8c52b7c50eb)

2 weeks agoluci-app-v2ray-server: switch to sagernet core
Tianling Shen [Thu, 9 Jun 2022 10:13:12 +0000 (18:13 +0800)]
luci-app-v2ray-server: switch to sagernet core

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 2e22ce92b3356fda5f32f87cf44ee02e4aa4f79e)

2 weeks agoluci-app-ssr-plus: fix generate v2ray sing config
Tianling Shen [Wed, 8 Jun 2022 16:10:50 +0000 (00:10 +0800)]
luci-app-ssr-plus: fix generate v2ray sing config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit bce009c1b414f8cc33cc61da26315ec07ba4497d)

2 weeks agoluci-app-ssr-plus: fix v2ray gPRC multi support
Tianling Shen [Wed, 8 Jun 2022 10:19:16 +0000 (18:19 +0800)]
luci-app-ssr-plus: fix v2ray gPRC multi support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 21634789b1560c5ce1cd43d237f8fe8ec7183f20)

2 weeks agoluci-app-ssr-plus: add v2ray ws earlydata support
Tianling Shen [Wed, 8 Jun 2022 09:59:02 +0000 (17:59 +0800)]
luci-app-ssr-plus: add v2ray ws earlydata support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 745a43d9dafa2f96fd2a58ed04d06afde6feb2a2)

2 weeks agoluci-app-ssr-plus: add hysteria support
Tianling Shen [Wed, 8 Jun 2022 08:51:38 +0000 (16:51 +0800)]
luci-app-ssr-plus: add hysteria support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 0b58589bf8f0dadf0bd03df3edfbca6a2310f662)

2 weeks agoluci-app-ssr-plus: remove pdnsd support
Tianling Shen [Tue, 7 Jun 2022 17:41:48 +0000 (01:41 +0800)]
luci-app-ssr-plus: remove pdnsd support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit c62864d8e17e80a3c7e83aa3b65f1ca6d56c0a79)

2 weeks agoOpenClash: Update to 0.45.30
Tianling Shen [Tue, 7 Jun 2022 09:26:00 +0000 (17:26 +0800)]
OpenClash: Update to 0.45.30

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 233b8a148f33e3fb843a28e581574a8901554440)

2 weeks agoluci-app-ssr-plus: fix generate SUoT config
Tianling Shen [Mon, 6 Jun 2022 19:06:34 +0000 (03:06 +0800)]
luci-app-ssr-plus: fix generate SUoT config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 80d6c39bdc2239c2c97d63b72c945dfc649cfe56)

2 weeks agoluci-app-ssr-plus: bump to 186-1
Tianling Shen [Mon, 6 Jun 2022 16:57:00 +0000 (00:57 +0800)]
luci-app-ssr-plus: bump to 186-1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit e2f3d9864a951475a6107e468f5472ac2b721b72)

2 weeks agoluci-app-ssr-plus: use dns2tcp by default
Tianling Shen [Sun, 5 Jun 2022 12:59:56 +0000 (20:59 +0800)]
luci-app-ssr-plus: use dns2tcp by default

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 35b93d9bfc4b2e1f09bbfc85ea8e8a76cf429fc9)

3 weeks agoluci-app-ssr-plus: sync with upstream source
Tianling Shen [Fri, 3 Jun 2022 16:33:15 +0000 (00:33 +0800)]
luci-app-ssr-plus: sync with upstream source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8a5b6cc6c5308156fd5bf2d90b1f0f47687225c9)

3 weeks agoMerge Official Source
Tianling Shen [Fri, 3 Jun 2022 16:29:28 +0000 (00:29 +0800)]
Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
3 weeks agoluci-app-opkg: fix parsing package dependencies with version constraints
Jo-Philipp Wich [Fri, 3 Jun 2022 11:36:02 +0000 (13:36 +0200)]
luci-app-opkg: fix parsing package dependencies with version constraints

Due to improper ordering of regexp alternatives, version constraint operators
might get undermatched.

Fixes: https://github.com/openwrt/openwrt/issues/9982
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b84791bd029c2aaa67cbc06a15d23828f62f4608)

4 weeks agoluci-app-turboacc: cleanup cbi code
Tianling Shen [Mon, 23 May 2022 04:16:40 +0000 (12:16 +0800)]
luci-app-turboacc: cleanup cbi code

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
4 weeks agoluci-app-autoreboot: fix dependency
Tianling Shen [Mon, 23 May 2022 04:04:26 +0000 (12:04 +0800)]
luci-app-autoreboot: fix dependency

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 77f4431590aed9328950079f96bfd3eac177b444)

5 weeks agoluci-app-passwall: bump to 4.54-3
Tianling Shen [Sat, 21 May 2022 08:03:41 +0000 (16:03 +0800)]
luci-app-passwall: bump to 4.54-3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 11868b9d7fe962f6406ba48b04bff933b1bfdf06)

5 weeks agoluci-app-mentohust: code alignment
Beginner-Go [Mon, 16 May 2022 17:27:28 +0000 (17:27 +0000)]
luci-app-mentohust: code alignment

(cherry picked from commit 4ee88581e8db13a06605663504a45b7c63bbbfe1)

5 weeks agoluci-app-k3usb: code alignment
Beginner-Go [Mon, 16 May 2022 16:20:10 +0000 (16:20 +0000)]
luci-app-k3usb: code alignment

(cherry picked from commit 33cd2f3f201e7a038986d8efd2ceb80fd84772c4)

5 weeks agoluci-app-mwol: code alignment
Beginner-Go [Mon, 16 May 2022 18:25:10 +0000 (18:25 +0000)]
luci-app-mwol: code alignment

(cherry picked from commit e3b7e8a2ee861d11f0e372c12154bd93cbe11022)

5 weeks agoluci-app-music-remote-center: code alignment
Beginner-Go [Mon, 16 May 2022 17:59:04 +0000 (17:59 +0000)]
luci-app-music-remote-center: code alignment

(cherry picked from commit e3541b256755a91cf446cf4fa31acfbffc8c204f)

5 weeks agoluci-app-iptvhelper: code alignment
Beginner-Go [Mon, 16 May 2022 15:47:47 +0000 (15:47 +0000)]
luci-app-iptvhelper: code alignment

(cherry picked from commit 08ab0127484b61aaa2984571b5ee378aea39d6fc)

5 weeks agoluci-app-minieap: code alignment
Beginner-Go [Mon, 16 May 2022 17:50:34 +0000 (17:50 +0000)]
luci-app-minieap: code alignment

(cherry picked from commit 4503f4fa8a7ee0a832ea32c013650a6ab02aeefa)

5 weeks agoluci-app-ipsec-vpnd: tidy up code
Beginner-Go [Thu, 5 May 2022 17:02:46 +0000 (17:02 +0000)]
luci-app-ipsec-vpnd: tidy up code

(cherry picked from commit 20997b50ab2c2fca77df9c03435c8536e4c2cbd0)

5 weeks agoluci-app-filetransfer: tidy up code
Beginner-Go [Thu, 5 May 2022 15:27:19 +0000 (15:27 +0000)]
luci-app-filetransfer: tidy up code

(cherry picked from commit 796a89a64c1af541aa1d1a4bf6d66d776f11c144)

5 weeks agotreewide: Backport translations and sync
Hannu Nyman [Sun, 15 May 2022 17:15:29 +0000 (20:15 +0300)]
treewide: Backport translations and sync

Backport from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 weeks agoOpenClash: bump to 0.45.16
Tianling Shen [Wed, 11 May 2022 10:40:23 +0000 (18:40 +0800)]
OpenClash: bump to 0.45.16

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 787d4e2ca49b5e597f37c40953657ceb3ae40861)

6 weeks agoluci-app-adblock: s/1-7/0-6/g
Dirk Brenken [Tue, 10 May 2022 16:17:05 +0000 (18:17 +0200)]
luci-app-adblock: s/1-7/0-6/g

Fixes: #5716
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit abbff0f4b6d6c7df7d3dc642f1c4db42b3d2c895)
Signed-off-by: Dirk Brenken <dev@brenken.org>
6 weeks agoluci-app-adblock: sync with 4.1.3-6
Dirk Brenken [Tue, 10 May 2022 16:11:39 +0000 (18:11 +0200)]
luci-app-adblock: sync with 4.1.3-6

* remove support for shallalist

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 1eddbe0f3f0b00366694424f1445ea6cceb7d7d5)
Signed-off-by: Dirk Brenken <dev@brenken.org>
6 weeks agoluci-app-adblock: small fixes
Dirk Brenken [Tue, 10 May 2022 16:07:49 +0000 (18:07 +0200)]
luci-app-adblock: small fixes

* fix #5677
* fix 'flush cache' wording

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 2ab828f5bf4e80f5d1cc16712df6e04b58b6eaaa)
Signed-off-by: Dirk Brenken <dev@brenken.org>
6 weeks agoMerge pull request #5806 from odmdas/2102-sysntpd-iface
Jo-Philipp Wich [Tue, 10 May 2022 09:04:35 +0000 (11:04 +0200)]
Merge pull request #5806 from odmdas/2102-sysntpd-iface

[21.02] luci-mod-system: add interface selection for NTPD

6 weeks agoluci-mod-system: add interface selection for NTPD
Alexey Dobrovolsky [Wed, 4 May 2022 22:18:51 +0000 (01:18 +0300)]
luci-mod-system: add interface selection for NTPD

UCI option `interface` for sysntpd server was introduced in
OpenWrt commit 4da60500ebd2. NTP server binds to the specified interface,
or if unspecified, to all.

This patch adds selection widget to LuCI.

Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>
(cherry picked from commit 24ac5a2bf6d713c6878cf7be7d4e4516965c2884)

7 weeks agoluci-app-gowebdav: code alignment
Beginner-Go [Thu, 5 May 2022 15:53:22 +0000 (15:53 +0000)]
luci-app-gowebdav: code alignment

(cherry picked from commit 67019d1f6d0a2745665627e1620c3795a5486bcb)

7 weeks agoluci-app-filebrowser: code alignment
Beginner-Go [Thu, 5 May 2022 15:17:04 +0000 (15:17 +0000)]
luci-app-filebrowser: code alignment

(cherry picked from commit c60026bfcd70157372ad006ddb086a723671e145)

7 weeks agoluci-app-familycloud: drop application
Beginner-Go [Thu, 5 May 2022 15:04:43 +0000 (15:04 +0000)]
luci-app-familycloud: drop application

(cherry picked from commit ca1bfd407407ebe58b6de4bf7d58bc2c7ebba5ab)

7 weeks agoluci-app-syncthing: compat with official service
zxlhhyccc [Mon, 18 Oct 2021 06:14:20 +0000 (14:14 +0800)]
luci-app-syncthing: compat with official service

(cherry picked from commit 42af7a536d5cf677c402431b34240fdfc9a8fd67)

7 weeks agoluci-app-cpufreq: uci-defaults: raise the priority
Tianling Shen [Fri, 6 May 2022 03:54:10 +0000 (11:54 +0800)]
luci-app-cpufreq: uci-defaults: raise the priority

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b1834bbb8a7688a5f4f6bf88870b12223ea5e0fe)

7 weeks agoluci-app-eqos: code alignment
Beginner-Go [Thu, 5 May 2022 14:55:26 +0000 (14:55 +0000)]
luci-app-eqos: code alignment

(cherry picked from commit 56626804ed05660108a6eba9c8834a20c7343a55)

7 weeks agoluci-app-docker: code alignment
Beginner-Go [Thu, 5 May 2022 14:45:46 +0000 (14:45 +0000)]
luci-app-docker: code alignment

(cherry picked from commit 9046a9bf17b4ce0dc8f88336d27c1224b8868b9d)

7 weeks agoluci-app-dnsforwarder: code alignment
Beginner-Go [Thu, 5 May 2022 14:33:15 +0000 (14:33 +0000)]
luci-app-dnsforwarder: code alignment

(cherry picked from commit cd95d5c4dd66b07788959caaf5e5710b25bc1791)

7 weeks agoluci-app-cpufreq: code alignment
Beginner-Go [Thu, 5 May 2022 05:27:02 +0000 (05:27 +0000)]
luci-app-cpufreq: code alignment

(cherry picked from commit 0ba7d1edafface6f7e3d3af49719bda03bd2670d)

7 weeks agoluci-app-cpulimit: code alignment
Beginner-Go [Thu, 5 May 2022 05:38:37 +0000 (05:38 +0000)]
luci-app-cpulimit: code alignment

(cherry picked from commit 40e62e288785758144888065fbf3d8b6cc8c4f67)

7 weeks agoluci-app-cifs: code alignment
Beginner-Go [Thu, 5 May 2022 05:11:29 +0000 (05:11 +0000)]
luci-app-cifs: code alignment

(cherry picked from commit 05de52c3c826a45bf119a2e1a4d39d24863d5f56)

7 weeks agoluci-app-cifs-mount: code alignment
Beginner-Go [Thu, 5 May 2022 04:55:56 +0000 (04:55 +0000)]
luci-app-cifs-mount: code alignment

(cherry picked from commit 2cc502fbcc8aad9a9b00c4b6e70b0990da9faf9e)

7 weeks agoluci-app-cd8021x: code alignment
Beginner-Go [Thu, 5 May 2022 04:42:05 +0000 (04:42 +0000)]
luci-app-cd8021x: code alignment

(cherry picked from commit a0bd6464c7bb754b53a86802bba3bea8a909cf33)

7 weeks agoluci-app-beardropper: code alignment
Beginner-Go [Thu, 5 May 2022 04:16:29 +0000 (04:16 +0000)]
luci-app-beardropper: code alignment

(cherry picked from commit 610425d0cc1fe9ce3c5636cbd71301363355aeef)

7 weeks agoluci-app-brook-server: code alignment
Beginner-Go [Thu, 5 May 2022 04:31:45 +0000 (04:31 +0000)]
luci-app-brook-server: code alignment

(cherry picked from commit 30f1126a2fd5b4b6eb9594002079d207486471a0)

7 weeks agoluci-app-autoipsetadder: drop application
Beginner-Go [Wed, 4 May 2022 17:42:32 +0000 (17:42 +0000)]
luci-app-autoipsetadder: drop application

(cherry picked from commit 5119c2d185d54e12d3e1788db8958f093bdb4d90)

7 weeks agoluci-app-baidupcs-web: code alignment
Beginner-Go [Wed, 4 May 2022 17:57:05 +0000 (17:57 +0000)]
luci-app-baidupcs-web: code alignment

(cherry picked from commit b1822f4afde33034cc4a059bebd7e77ca1d3c656)

7 weeks agoluci-app-arpbind: code alignment
Beginner-Go [Wed, 4 May 2022 17:18:50 +0000 (17:18 +0000)]
luci-app-arpbind: code alignment

(cherry picked from commit 2c5c53918a76c4c87542f42b8ee23213a11dc610)

7 weeks agoluci-app-aliddns: code alignment
Beginner-Go [Wed, 4 May 2022 17:02:21 +0000 (17:02 +0000)]
luci-app-aliddns: code alignment

(cherry picked from commit 8135d31408f728ba241fc3a0a3ac9fa9e2bafdab)

7 weeks agoluci-app-airwhu: tidy up code
Beginner-Go [Wed, 4 May 2022 16:42:13 +0000 (16:42 +0000)]
luci-app-airwhu: tidy up code

(cherry picked from commit 3c793b22abce94252723afa419646ed99389aa95)

7 weeks agoluci-app-advancedsetting: code alignment
Beginner-Go [Wed, 4 May 2022 16:14:38 +0000 (16:14 +0000)]
luci-app-advancedsetting: code alignment

(cherry picked from commit c631f8b4b92370e646148a8620f85605039ae494)

7 weeks ago luci-app-syncdial: Fixed problem that the quantity is not displayed on online interf...
zxlhhyccc [Thu, 5 May 2022 02:46:16 +0000 (10:46 +0800)]
 luci-app-syncdial: Fixed problem that the quantity is not displayed on online interface (#138)

* luci-app-syncdial´╝Ü Fixed the problem that the quantity is not displayed on the online interface

* Update syncdial.lua

(cherry picked from commit ccca31a9c7e426082a7c1cb2c9de0ba733a4b1c3)

7 weeks agoluci-app-syncdial: code alignment
Beginner-Go [Wed, 27 Apr 2022 16:54:35 +0000 (16:54 +0000)]
luci-app-syncdial: code alignment

(cherry picked from commit 91fbe481936e2bdf21d9e92e0b989fa96c5db1c0)

7 weeks agoluci-app-airplay2: code alignment
Beginner-Go [Wed, 4 May 2022 16:02:57 +0000 (16:02 +0000)]
luci-app-airplay2: code alignment

(cherry picked from commit 24813e00635ba040e7b5999c94b51fbed8277e15)

7 weeks agoluci-app-adbyby-plus: code alignment
Beginner-Go [Thu, 28 Apr 2022 12:11:44 +0000 (12:11 +0000)]
luci-app-adbyby-plus: code alignment

(cherry picked from commit ab746d7d24007f54d1372f692727a5758b314b7a)

7 weeks agoluci-app-autoreboot: code alignment
Beginner-Go [Thu, 28 Apr 2022 12:30:53 +0000 (12:30 +0000)]
luci-app-autoreboot: code alignment

(cherry picked from commit b8cab216d2b146d85a980f886ee73ea62d6a7260)

7 weeks agoluci-app-ddns: fix update time calculation
small_5 [Thu, 4 Mar 2021 02:50:25 +0000 (10:50 +0800)]
luci-app-ddns: fix update time calculation

* Fix last_update overflow

* Fix next_update wrong when the router is just started

* Fix missing check_seconds for next_update

Signed-off-by: Small_5 <61473216+small-5@users.noreply.github.com>
(cherry picked from commit 58ed2b211a1add5fb2cb3750af6074c4d51c307a)

7 weeks agoOpenClash: Update to v0.45.12-beta
Tianling Shen [Mon, 2 May 2022 01:55:48 +0000 (09:55 +0800)]
OpenClash: Update to v0.45.12-beta

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1aafc3b353a6933270a34cbfcaf450143c309c0c)

7 weeks agoluci-app-passwall: bump to 4.54
Tianling Shen [Mon, 2 May 2022 01:54:15 +0000 (09:54 +0800)]
luci-app-passwall: bump to 4.54

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 9f302907b3ba63704246398704fa87bf732c0b16)

7 weeks agoluci-theme-argon: chmod +x
ZiMing Mo [Thu, 28 Apr 2022 15:40:28 +0000 (23:40 +0800)]
luci-theme-argon: chmod +x

(cherry picked from commit e5c859131004f97cc7b3ff81258c5fa171c59158)

7 weeks agoluci-theme-argon: sync with upstream source
ZiMing Mo [Thu, 28 Apr 2022 15:31:07 +0000 (23:31 +0800)]
luci-theme-argon: sync with upstream source

(cherry picked from commit 4a5beb70a6bb50d0429f80a92295e027fa205dbf)

8 weeks agoluci-base: sys.lua: fix parsing conntrack entries without timeout
Jo-Philipp Wich [Fri, 29 Apr 2022 10:16:19 +0000 (12:16 +0200)]
luci-base: sys.lua: fix parsing conntrack entries without timeout

Flow offloaded conntrack entries carry no timeout value and trip up the
record parsing routine. Adjust the code to properly deal with such entries.

Ref: https://forum.openwrt.org/t/offloading-breaks-connections-list/126423
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 531c0ecff2ca57c4bc0aacee66a0746814fefc78)

2 months agoluci-app-statistics: stat-genconfig: don't emit bools for absent uci options
Jo-Philipp Wich [Mon, 25 Apr 2022 18:55:02 +0000 (20:55 +0200)]
luci-app-statistics: stat-genconfig: don't emit bools for absent uci options

Do not emit native collectd.conf boolean false options if the corresponding
uci option is unset in order to honour collectd's implicit defaults.

This fixes certain options, such as the memory plugins `ValuesAbsolute`,
being without effect if declared as default-enabled in the related plugin
uci forms.

Fixes: #5777
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f16037cec5e3f65cffe2f5788c264f1912435b0e)

2 months agoluci-app-passwall: compatible with mwan3
xiaorouji [Sat, 23 Apr 2022 14:05:42 +0000 (22:05 +0800)]
luci-app-passwall: compatible with mwan3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 690c4289165c2217b8d43192be4391a745dd9b87)

2 months agoluci-app-accesscontrol: code alignment
Beginner-Go [Sun, 24 Apr 2022 13:26:07 +0000 (13:26 +0000)]
luci-app-accesscontrol: code alignment

(cherry picked from commit ad5e3084f77bc6e79bf4ab46fc189c69dbdb4a64)

2 months agoluci-app-unblockneteasemusic: bump to 2.12-3
Tianling Shen [Mon, 11 Apr 2022 21:32:26 +0000 (05:32 +0800)]
luci-app-unblockneteasemusic: bump to 2.12-3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b3caaa48feec21aede65c6075af02f69be49226b)

2 months agoluci-app-passwall: bump to 4.53-8
Tianling Shen [Sat, 23 Apr 2022 07:22:50 +0000 (15:22 +0800)]
luci-app-passwall: bump to 4.53-8

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ae6a17eff0458c1b2a7ada886daa6194965ee083)

2 months agoluci-app-serverchan: sync with upstream
Tianling Shen [Sat, 23 Apr 2022 07:11:04 +0000 (15:11 +0800)]
luci-app-serverchan: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 60961e28b8227c0d079d70d74a10f5d04052d8e8)

2 months agoRevert "luci-app-ssr-plus: fix compatibility for v2ray-core v5"
Tianling Shen [Thu, 21 Apr 2022 20:21:09 +0000 (04:21 +0800)]
Revert "luci-app-ssr-plus: fix compatibility for v2ray-core v5"

21.02 branch still uses v4, revert it for now.

This reverts commit e17f1542bfbfeeba444a19bdcc77ac52aed06dbe.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2 months agoRevert "luci-app-v2ray-server: fix compatibility for v2ray-core v5"
Tianling Shen [Thu, 21 Apr 2022 20:20:41 +0000 (04:20 +0800)]
Revert "luci-app-v2ray-server: fix compatibility for v2ray-core v5"

21.02 branch still uses v4, revert it for now.

This reverts commit 25707af358ed513d2d650f6c265d581e542c8fcd.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2 months agoOpenClash: Update to 0.45.06
Tianling Shen [Thu, 21 Apr 2022 20:19:33 +0000 (04:19 +0800)]
OpenClash: Update to 0.45.06

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 175cbd9dcf25bc32b24f01b4b43d8c8894e43e01)

2 months agoluci-app-v2ray-server: fix compatibility for v2ray-core v5
zxlhhyccc [Sun, 10 Apr 2022 15:56:55 +0000 (23:56 +0800)]
luci-app-v2ray-server: fix compatibility for v2ray-core v5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit dcb27ebcec18f5293851b9cec83811f00d3e4c1a)

2 months agoluci-app-unblockneteasemusic: use json output
Tianling Shen [Fri, 21 Jan 2022 07:49:02 +0000 (15:49 +0800)]
luci-app-unblockneteasemusic: use json output

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 33549c03756a13a470b2d459a2d9e438767943b4)

2 months agoluci-app-ssr-plus: fix compatibility for v2ray-core v5
Tianling Shen [Thu, 7 Apr 2022 16:40:30 +0000 (00:40 +0800)]
luci-app-ssr-plus: fix compatibility for v2ray-core v5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 82957caf4e3665a455a42c101795c8f188626a80)

2 months agoMerge Official Source
Tianling Shen [Tue, 12 Apr 2022 22:04:25 +0000 (06:04 +0800)]
Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2 months agotreewide: Backport translations and sync
Hannu Nyman [Sat, 9 Apr 2022 16:18:33 +0000 (19:18 +0300)]
treewide: Backport translations and sync

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2 months agoluci-app-ssr-plus: fix subscribe bugs about grpc and sni
Chikage0o0 [Sat, 9 Apr 2022 14:55:01 +0000 (22:55 +0800)]
luci-app-ssr-plus: fix subscribe bugs about grpc and sni

2 months agoluci-lib-jsonc: stringify int use json_object_new_int64 instead
Justin Klaassen [Sat, 19 Mar 2022 18:34:05 +0000 (11:34 -0700)]
luci-lib-jsonc: stringify int use json_object_new_int64 instead

Fixes: #3293
Signed-off-by: Justin Klaassen <jck112@users.noreply.github.com>
(cherry picked from commit 45f411b7a29d0aa6b46946f06bd88082f2a68034)

2 months agoluci-app-passwall: bump to 4.52-3
Tianling Shen [Thu, 7 Apr 2022 15:18:53 +0000 (23:18 +0800)]
luci-app-passwall: bump to 4.52-3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit e86a538fe38686caf1f6ccdb6a88b5428f824ac6)

2 months agobuild: introduce official way to opt out of source minification
Jo-Philipp Wich [Wed, 6 Apr 2022 09:39:06 +0000 (11:39 +0200)]
build: introduce official way to opt out of source minification

Introduce three new default enabled variables `LUCI_MINIFY_JS`,
`LUCI_MINIFY_LUA` and `LUCI_MINIFY_CSS`  that allow LuCI component
Makefiles to opt out of JavaScript, Lua and CSS compression respectively.

To e.g. inhibit CSSTidy postprocessing in a theme, the corresponding
Makefile can set `LUCI_MINIFY_CSS:=0` prior to including `luci.mk`.

Fixes: #5755
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3646b0cd1f65dc929dbc0b29daaa7252f6a2507b)

2 months agoOpenClash: Update to 0.44.41-beta
Tianling Shen [Fri, 1 Apr 2022 23:01:53 +0000 (07:01 +0800)]
OpenClash: Update to 0.44.41-beta

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 2ff635b77aeefd1f87b8800f4044a7e6d40c721c)

2 months agoluci-app-attendedsysupgrade: request filesystem
Paul Spooren [Mon, 21 Mar 2022 11:44:11 +0000 (11:44 +0000)]
luci-app-attendedsysupgrade: request filesystem

It is possible to request a specific filesystem so no other filesystems
are used. This speeds up the build process and may prevent failures in
edge cases.

A recent edge case is installing more packages than ext4 can handle
while squashfs works fine due to compression.

Backport `procd` detection of `rootfs_type` to JavaScript:
https://git.openwrt.org/?p=project/procd.git;a=blob;f=system.c;h=93eac59c3b01ce3729dc27539ac483f5314759d3;hb=HEAD#l49

Signed-off-by: Paul Spooren <mail@aparcar.org>
2 months agoluci-app-firewall: fix misspelling of restrictions
Jo-Philipp Wich [Wed, 30 Mar 2022 18:44:13 +0000 (20:44 +0200)]
luci-app-firewall: fix misspelling of restrictions

Fixes: #5749
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 0eb3aeb0105be5477ed12a57ce3028d08d5f90c6)

2 months agoMerge Official Source
Tianling Shen [Mon, 28 Mar 2022 07:25:37 +0000 (15:25 +0800)]
Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2 months agoluci-mod-status: fix onlineusers count
Tianling Shen [Mon, 28 Mar 2022 07:02:27 +0000 (15:02 +0800)]
luci-mod-status: fix onlineusers count

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 233b6b3acd93dc09afdaa10b079dcf68956f0ede)