project/luci.git
2 days agoluci-app-banip: fix "Apply & Restart" button call chain openwrt-23.05
Dirk Brenken [Sat, 27 Apr 2024 05:26:12 +0000 (07:26 +0200)]
luci-app-banip: fix "Apply & Restart" button call chain

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit d4b8290f072767182e2d172da847291d49b9ce45)

2 days agoluci-app-banip: new button "Apply & Restart"
Dirk Brenken [Fri, 26 Apr 2024 17:13:12 +0000 (19:13 +0200)]
luci-app-banip: new button "Apply & Restart"

* Many changes to the user interface require a banIP restart, e.g. to restructure the underlying nft rule set. In this case, “Apply & Restart” saves the user an unnecessary “Save & Apply” (followed by a banIP reload & restart to obtain the new nft structure.

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 1661b210c80102fb77f1a61d5c658c54ac339289)
Signed-off-by: Dirk Brenken <dev@brenken.org>
2 days agoluci-app-banip: handle load errors of the countries file
Dirk Brenken [Fri, 26 Apr 2024 11:42:54 +0000 (13:42 +0200)]
luci-app-banip: handle load errors of the countries file

* properly handle/skip possible read errors in try/catch blocks

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit f8eb80bac75df3b69ec0713524c8bb1169d7d3b9)

2 days agoluci-app-banip: handle json load errors
Dirk Brenken [Mon, 22 Apr 2024 20:28:58 +0000 (22:28 +0200)]
luci-app-banip: handle json load errors

* properly handle possible json load errors in try/catch blocks

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 32babe7069c2297ae8f2578e38762b3406bc84d7)

2 days agoluci-app-banip: sync with 0.9.5-2
Dirk Brenken [Sun, 21 Apr 2024 19:59:48 +0000 (21:59 +0200)]
luci-app-banip: sync with 0.9.5-2

* fixed Set search issues in LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit aa463d007fcea9cd5164d7b6e678884589ca4ac2)

2 days agoluci-app-banip: sync with 0.9.5-1
Dirk Brenken [Fri, 19 Apr 2024 20:38:49 +0000 (22:38 +0200)]
luci-app-banip: sync with 0.9.5-1

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit a4f00ac556f61d62448b815755e86d1a14b23376)

8 days agoluci-mod-network: fix potential null dereference on deleting VLANs
Jo-Philipp Wich [Sat, 20 Apr 2024 21:13:12 +0000 (23:13 +0200)]
luci-mod-network: fix potential null dereference on deleting VLANs

Fixes: #7074
Fixes: 61cef9baad ("luci-mod-network: don't trigger uci save on removing bridge vlans")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ea04003657cc06ee69639aaede24b4c74071946c)

8 days agoluci.mk: remove unnecessary i18n postinst script
Hannu Nyman [Sat, 20 Apr 2024 09:19:26 +0000 (12:19 +0300)]
luci.mk: remove unnecessary i18n postinst script

OpenWrt master has since 2016 run the uci-defaults also in run-time installations
as postinst:
openwrt/openwrt@9b9c78e

Remove the older separate implementation from LuCI.

Fixes #7070 and #7073

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit fb776a6645b7c1671e1b733f3de433a34971a49a)

12 days agoluci-app-openvpn: change Value to DynamicList for ciphers
Paul Donald [Wed, 17 Apr 2024 00:49:49 +0000 (02:49 +0200)]
luci-app-openvpn: change Value to DynamicList for ciphers

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit f6301561e709433b8602264fa00495c4aeb70ad3)

12 days agoluci-proto-ppp: pppoe.so has no MTU option; remove it
Paul Donald [Tue, 16 Apr 2024 15:41:30 +0000 (17:41 +0200)]
luci-proto-ppp: pppoe.so has no MTU option; remove it

Retain comment so nobody is tempted to resurrect it.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 995d3a1801cf3b850e8c7c35937fbdd0526ff53e)

2 weeks agoMerge pull request #7053 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Fri, 12 Apr 2024 20:39:38 +0000 (13:39 -0700)]
Merge pull request #7053 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: bugfix: status/overview page include

2 weeks agoluci-app-https-dns-proxy: bugfix: status/overview page include 7053/head
Stan Grishin [Wed, 10 Apr 2024 21:37:58 +0000 (21:37 +0000)]
luci-app-https-dns-proxy: bugfix: status/overview page include

This fix prevents iteration over empty/null array of instances (and the type error)
if there are no instances found.

Fixes https://github.com/openwrt/packages/issues/23868

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f19647536440f93a16612d4746508f9ff7d49161)

2 weeks agotreewide: Backport and sync translations
Hannu Nyman [Wed, 10 Apr 2024 17:32:54 +0000 (20:32 +0300)]
treewide: Backport and sync translations

Backport from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 weeks agoluci-app-nut: Remove old no-op uci-defaults script
Hannu Nyman [Sun, 7 Apr 2024 12:16:24 +0000 (15:16 +0300)]
luci-app-nut: Remove old no-op uci-defaults script

Remove old uci-defaults script that was supposed to be run
if nut was older than 2.4.7-8. Nut has been at 2.7.4-9 or newer
since 2018.

(Ps. The script had faulty logic: the version check never matched.)

Fixes #6966

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 983047a505d57d72b52e7a291f9a36b4e8c41794)

3 weeks agoMerge pull request #7045 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Fri, 5 Apr 2024 19:59:26 +0000 (12:59 -0700)]
Merge pull request #7045 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: bugfix: AdGuard servers URLs

3 weeks agoluci-app-https-dns-proxy: bugfix: AdGuard servers URLs 7045/head
Stan Grishin [Wed, 3 Apr 2024 20:02:55 +0000 (20:02 +0000)]
luci-app-https-dns-proxy: bugfix: AdGuard servers URLs

AdGuard seems to have drastically changed their DoH servers URLs, so this change updates
the root/usr/share/https-dns-proxy/providers/com.adguard.dns.json file.
Fixes https://github.com/openwrt/luci/issues/7038

Also include minor Makefile changes for better menuconfig presence.

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8f92f8b40369c4a2fc0cd358969e9278920d6d18)

4 weeks agoluci-theme-material: make luci-app-commands command box align with Bootstrap theme
Daniel Nilsson [Tue, 19 Mar 2024 19:01:09 +0000 (20:01 +0100)]
luci-theme-material: make luci-app-commands command box align with Bootstrap theme

The current implementation made the commands from the app luci-app-commands absolutely positioned which resulted in hiding elements which was underneath it, ie. the buttons. This implementation removes the absolutely positioned behavior making the buttons visible again and as an upside aligns it with how the Bootstrap theme handles commands.

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit 4adc4a65688d7d411ccae019be673c47bd811e41)

4 weeks agoluci-mod-status: fix syslog / dmesg scroll for some themes
Miguel Angel Mulero Martinez [Wed, 27 Mar 2024 09:16:22 +0000 (10:16 +0100)]
luci-mod-status: fix syslog / dmesg scroll for some themes

The actual code moves the scroll in the window. This works for the bootstrap theme, because the scroll is at window level. But this does not work for other themes, like material.

This commit changes the move of the scroll by "focusing" the window in the opposite button element in the syslog / dmesg page. In this way the move is automatically done by the browser.

Another solution is to "search" in the parent until we find the scroll and move it, but seems less solid.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 1164d276081a30923197299cacede3c6f4dce16e)

4 weeks agoluci-proto-qmi: allow v6apn and (v6)profile configuration
Lech Perczak [Thu, 8 Jun 2023 22:57:36 +0000 (00:57 +0200)]
luci-proto-qmi: allow v6apn and (v6)profile configuration

To support split-APN dual-stack connections over QMI, add new parameters
supported in UCI to LuCI as well. Previously, connection profile wasn't
configurable from LuCI at all, so add options to set which APN profile
to match for each protocol.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
(cherry picked from commit c682e530e2b95af7768b6a0c74c942222e0cd78d)

4 weeks agoluci-app-ttyd: add option for UNIX socket and URL override
Richard Yu [Mon, 25 Mar 2024 17:08:06 +0000 (01:08 +0800)]
luci-app-ttyd: add option for UNIX socket and URL override

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 9f3ae08703e23d7395ef9daa05ab1000dde09152)

4 weeks agoluci-theme-bootstrap: darkmode graphs fine-tuning
Thomas Schröder [Mon, 18 Mar 2024 20:03:32 +0000 (21:03 +0100)]
luci-theme-bootstrap: darkmode graphs fine-tuning

Fine tuning #6991

Bugfix for the wireless graphs, reorder everything to the same level
as displayed in the menu and make the spaces even.

Signed-off-by: Thomas Schröder <tschroeder_github@outlook.com>
(cherry picked from commit e569ddaf897632ed578e5ff2d3f9e259d19753f5)

4 weeks agoluci-theme-bootstrap: darkmode graphs
james [Thu, 14 Mar 2024 18:31:31 +0000 (13:31 -0500)]
luci-theme-bootstrap: darkmode graphs
This adds 2 more graphs to be dark in dark mode and makes the gridlines white
Signed-off-by: james <jameslindstrom2@gmail.com>
(cherry picked from commit 850345bfb90459a36b72ae45b0b7966ad1e7a6f6)

4 weeks agowidgets: add a re-useable filtered logread view
Karl Palsson [Mon, 18 Oct 2021 13:04:00 +0000 (13:04 +0000)]
widgets: add a re-useable filtered logread view

Multiple apps introduced their own implementation of a syslog view,
filtered for just their own application logs.  Pull that out as a shared
view.  Some of these had _minor_ style differences, which has been
"standardized" now.  A full "widget" conversion would allow more end app
tuning of that, but is not implemented.

Signed-off-by: Karl Palsson <karlp@etactica.com>
app-nextdns: fix Logs title

Minor typo, introduced in 625abbf (convert simple controllers to
menu.json)

Signed-off-by: Karl Palsson <karlp@etactica.com>
luci-base: implement shared log reader view

Closes #5452

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit c5a65a839713ab7ac70e6a6b5a7331593f67a9a0)

4 weeks agoluci-base: ui.js: avoid polling in a tight loop on confirm/rollback
Erik Karlsson [Sun, 16 Apr 2023 20:19:45 +0000 (22:19 +0200)]
luci-base: ui.js: avoid polling in a tight loop on confirm/rollback

The call function was based on the legacy XHR interface and it has not
been updated to comply with the new request interface which passes the
duration as part of the response object rather than as a separate
argument. This resulted in polling in a tight loop in certain cases
since the duration was undefined.

In addition there is no need to adjust apply_holdoff based on elapsed
time as no significant amount of time has elapsed at this point.

Signed-off-by: Erik Karlsson <erik.karlsson@genexis.eu>
(cherry picked from commit 6abb5ed7095032fdf8d2c9e2cac3218db99b19e5)

4 weeks agoluci-proto-ipv6: Add support for IPIP6(RFC2473) tunnel
Arayuki Mago [Tue, 13 Feb 2024 10:18:49 +0000 (19:18 +0900)]
luci-proto-ipv6: Add support for IPIP6(RFC2473) tunnel

Add Generic Packet Tunneling in IPv6 Specification (RFC 2473) support.

Signed-off-by: Arayuki Mago <ms@missing233.com>
(cherry picked from commit c88e24772e50cb9e58d6707f1082d9ceb3a8b3e1)

4 weeks agoluci-app-dockerman: check for existing IPAM config
Daniel Nilsson [Sun, 17 Mar 2024 21:14:34 +0000 (22:14 +0100)]
luci-app-dockerman: check for existing IPAM config

This was added in upstream with https://github.com/lisaac/luci-app-dockerman/commit/7292955a1b415bb60fa2e403bb3a437b4b7f7846 so should be fine for us to add it.

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit a5d7ce06f96436dcf02970d5df8c68b65968e37c)

5 weeks agoMerge pull request #7016 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Sun, 24 Mar 2024 13:55:17 +0000 (07:55 -0600)]
Merge pull request #7016 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: prepare migration to APK

5 weeks agoMerge pull request #7014 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Sun, 24 Mar 2024 13:09:10 +0000 (07:09 -0600)]
Merge pull request #7014 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: prepare migration to APK

5 weeks agoMerge pull request #7015 from stangri/openwrt-23.05-luci-app-advanced-reboot
Stan Grishin [Sun, 24 Mar 2024 13:08:14 +0000 (07:08 -0600)]
Merge pull request #7015 from stangri/openwrt-23.05-luci-app-advanced-reboot

[23.05] luci-app-advanced-reboot: prepare migration to APK

5 weeks agoMerge pull request #7018 from stangri/openwrt-23.05-luci-proto-nebula
Stan Grishin [Sun, 24 Mar 2024 13:07:49 +0000 (07:07 -0600)]
Merge pull request #7018 from stangri/openwrt-23.05-luci-proto-nebula

[23.05] luci-proto-nebula: prepare migration to APK

5 weeks agoluci-proto-nebula: prepare migration to APK 7018/head
Stan Grishin [Sat, 23 Mar 2024 01:15:28 +0000 (01:15 +0000)]
luci-proto-nebula: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 82105922ebf36743cd11d140d90f7bf4a5660455)

5 weeks agoluci-app-https-dns-proxy: prepare migration to APK 7016/head
Stan Grishin [Sat, 23 Mar 2024 01:14:38 +0000 (01:14 +0000)]
luci-app-https-dns-proxy: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 1efb3cd5f898e41148b298ae6ecdec4a7ae558f8)

5 weeks agoluci-app-advanced-reboot: prepare migration to APK 7015/head
Stan Grishin [Sat, 23 Mar 2024 01:14:22 +0000 (01:14 +0000)]
luci-app-advanced-reboot: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 120710420a7f653e1cf695b52e667783d5cc5dc8)

5 weeks agoluci-app-adblock-fast: prepare migration to APK 7014/head
Stan Grishin [Sat, 23 Mar 2024 01:14:10 +0000 (01:14 +0000)]
luci-app-adblock-fast: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit b6c9d5f9744e8e84829115692e7f02c165cc2a34)

5 weeks agotreewide: Backport translations and sync
Hannu Nyman [Wed, 20 Mar 2024 19:55:10 +0000 (21:55 +0200)]
treewide: Backport translations and sync

Sync translations and backport from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 weeks agoluci-app-travelmate: disable vpn processing by default
Dirk Brenken [Mon, 18 Mar 2024 21:25:16 +0000 (22:25 +0100)]
luci-app-travelmate: disable vpn processing by default

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 81496b88daf004ff2622bf8f47dbe6288abf8b26)

6 weeks agoluci-app-unbound: spell fix
Paul Donald [Fri, 15 Mar 2024 13:53:14 +0000 (14:53 +0100)]
luci-app-unbound: spell fix

Closes openwrt/luci#6993

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 977035837e00f0f8f17c0595bd0e698a82bddfd0)

6 weeks agoluci-mod-network: don't trigger uci save on removing bridge vlans
Jo-Philipp Wich [Fri, 15 Mar 2024 12:23:04 +0000 (13:23 +0100)]
luci-mod-network: don't trigger uci save on removing bridge vlans

Do not trigger a uci save operation on removing bridge VLANs as that might
invalidate the ephemeral section ID of a just added network device.

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

6 weeks agoluci-mod-network: remove unused option property
Jo-Philipp Wich [Fri, 8 Dec 2023 11:56:25 +0000 (12:56 +0100)]
luci-mod-network: remove unused option property

The logic handling the `migrate` property has been dropped in commit
f689d0d208 ("luci-mod-network: refactor device configuration") so remove
the now redundant property as well.

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

6 weeks agoluci-mod-network: disable 'Edit' button for dynamic interfaces
Paul Donald [Sun, 31 Dec 2023 13:11:41 +0000 (13:11 +0000)]
luci-mod-network: disable 'Edit' button for dynamic interfaces

Otherwise they produce "Cannot read properties of null".

Tested on 23.05.2

Fixes issue #6799

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 032f3056789d01930028ab5eeecac59c17c7e8d6)

6 weeks agorpcd-mod-luci: use standard POSIX header for basename()
Tony Ambardar [Wed, 6 Mar 2024 08:09:20 +0000 (00:09 -0800)]
rpcd-mod-luci: use standard POSIX header for basename()

The musl libc only implements POSIX basename() but provided a GNU header
kludge in <string.h>, which was removed in musl 1.2.5 [1]. Use the standard
<libgen.h> header to avoid compilation errors like:

luci.c: In function 'rpc_luci_parse_network_device_sys':
luci.c:676:53: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration]
  676 |                 blobmsg_add_string(&blob, "master", basename(link));
      |                                                     ^~~~~~~~
luci.c:676:53: error: passing argument 3 of 'blobmsg_add_string' makes pointer from integer without a cast [-Werror=int-conversion]
  676 |                 blobmsg_add_string(&blob, "master", basename(link));
      |                                                     ^~~~~~~~~~~~~~
      |                                                     |
      |                                                     int
...
cc1: all warnings being treated as errors

Link 1: https://git.musl-libc.org/cgit/musl/log/?qt=grep&q=basename

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
(cherry picked from commit 8b08b48df99c42918ab443dea29bd42652abed36)

6 weeks agoluci-base: use correct regex for time validation
Daniel Nilsson [Sat, 2 Mar 2024 10:35:04 +0000 (11:35 +0100)]
luci-base: use correct regex for time validation

Before this change, values further in time than 23:59:59 was allowed, such as 24:00:00 and 23:60:00. Leap seconds is accounted for so 60 is allowed in the seconds parameter.

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit c68ec2f910007c77874816fc0b829df78ca47aa0)

6 weeks agoluci-mod-network: drop trailing whitespace
Daniel Nilsson [Tue, 12 Mar 2024 20:16:47 +0000 (21:16 +0100)]
luci-mod-network: drop trailing whitespace

This resulted in the sysfs parameter to be invalid as it contained a space.

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit 7d106acd53d754d2b34229e9869c538c045d932b)

6 weeks agoluci-theme-bootstrap: Realtime Graphs dark mode
james [Tue, 12 Mar 2024 16:12:12 +0000 (11:12 -0500)]
luci-theme-bootstrap: Realtime Graphs dark mode
This feature is to have the realtime graphs dark when using Bootstrap Dark Theme

Signed-off-by: james <jameslindstrom2@gmail.com>
(cherry picked from commit 056407754d00e05a432f38b51c6ad103a1a12a6d)

6 weeks agoluci-app-p910nd: convert to JS
Paul Donald [Mon, 12 Feb 2024 15:07:58 +0000 (16:07 +0100)]
luci-app-p910nd: convert to JS

Simple p910nd printer management, and some level of automation that
detects whether the typically necessary kmods are installed, and if not
provides quick links to install those.

Tested on: 22.03.6, 23.05.2

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 7053272b559e17415966e5b8e935b2630dee688b)

7 weeks agoluci-base: docs house-keeping
Paul Donald [Wed, 6 Mar 2024 01:03:57 +0000 (02:03 +0100)]
luci-base: docs house-keeping

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f630f2241c8807a18c1d5bf1e7e286b3dd6a97f8)

7 weeks agobuild: comments for Darwin when building zoneinfo.
Paul Donald [Sat, 2 Mar 2024 16:13:03 +0000 (17:13 +0100)]
build: comments for Darwin when building zoneinfo.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 66e758dcada7b6470cc0c33b291af39ea8d9fa72)

7 weeks agoluci-app-fwknopd: remove unused vars
Sergey Ponomarev [Sat, 2 Mar 2024 00:47:10 +0000 (02:47 +0200)]
luci-app-fwknopd: remove unused vars

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 07c41852dd570d3ffd2179d455e59bff1df5147c)

7 weeks agoluci-themes: add luci-base to depends
Fengyu Wu [Sat, 17 Feb 2024 13:45:15 +0000 (21:45 +0800)]
luci-themes: add luci-base to depends

Signed-off-by: Fengyu Wu <saldry@proton.me>
(cherry picked from commit 98a6ba28deb09e1ac524b960a0a207e2fe1a333a)

7 weeks agoluci-theme-material: open footer link in new tab
Fengyu Wu [Sat, 17 Feb 2024 13:20:09 +0000 (21:20 +0800)]
luci-theme-material: open footer link in new tab

Also set Referrer Policy

Signed-off-by: Fengyu Wu <saldry@proton.me>
(cherry picked from commit 45d2becacbee5ca786eb403b4b0871c757321356)

7 weeks agoluci-theme-bootstrap: open footer links in new tab
Fengyu Wu [Sat, 17 Feb 2024 13:18:39 +0000 (21:18 +0800)]
luci-theme-bootstrap: open footer links in new tab

Also set Referrer Policy

Signed-off-by: Fengyu Wu <saldry@proton.me>
(cherry picked from commit f01347d3be9c6b744e6831d98b7a6e920020a627)

7 weeks agoluci-theme-material: improve theming system colors and contrasts
Daniel Nilsson [Thu, 22 Feb 2024 19:50:09 +0000 (20:50 +0100)]
luci-theme-material: improve theming system colors and contrasts

This changed spawned from trying to make certain text colors readable (such as white text on white background in many dialogs) introduced by commit 4ee2bc6 (ref: #5841) which made obvious the need to improve the color and contrast situation in the theme.

Alot of colors were duplicated in cascade.css and made for a hard time to align colors across different elements. This commit tries to rectify that by introducing variables for all commonly used colors.

* All base colors (white, blue, red, green, blue, yellow, etc) has been consolidated and moved to common variables
* Introduced more specific selectors for info levels to avoid colors bleeding over to other elements
* Removed duplicated properties which were overriden at the next row

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit 3acc8bc3733bbbb6c20b40bcb7b8f27d50b63779)

7 weeks agoluci-theme-material: add missing css for dsl_status_table
Florian Eckert [Wed, 28 Feb 2024 14:06:07 +0000 (15:06 +0100)]
luci-theme-material: add missing css for dsl_status_table

Insert a space between the name and the current value, as with other themes.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 0b24d1f4654d4f9c925e1ed1ccccbc9a2dcf8494)

7 weeks agoluci-app-cloudflared: v1.2
Hilman Maulana [Tue, 27 Feb 2024 07:46:33 +0000 (14:46 +0700)]
luci-app-cloudflared: v1.2

Signed-off-by: Hilman Maulana <hilman0.0maulana@gmail.com>
(cherry picked from commit 6200371f7aa6fd12fc966e2bb8151f3f8cbc20e5)

7 weeks agoluci-app-cloudflared: Add template for tunnel table
Hilman Maulana [Tue, 27 Feb 2024 07:21:32 +0000 (14:21 +0700)]
luci-app-cloudflared: Add template for tunnel table

Signed-off-by: Hilman Maulana <hilman0.0maulana@gmail.com>
(cherry picked from commit 5f0f28326a3670a98a16489f00d5745251bb5b09)

7 weeks agoluci-app-cloudflared: Add table for Tunnels
Hilman Maulana [Tue, 27 Feb 2024 07:01:25 +0000 (14:01 +0700)]
luci-app-cloudflared: Add table for Tunnels

Signed-off-by: Hilman Maulana <hilman0.0maulana@gmail.com>
(cherry picked from commit e8156de2cfd204977c9d98b8aca082e224573624)

7 weeks agoluci-mod-system: remove bogus mount option
Jo-Philipp Wich [Wed, 21 Feb 2024 21:11:53 +0000 (22:11 +0100)]
luci-mod-system: remove bogus mount option

Drop the bogus `enabled_fsck` option which seems to be an automatic Lua->JS
conversion artifact.

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

7 weeks agoluci-base: static.js: fix validation of netmask option
Jo-Philipp Wich [Wed, 21 Feb 2024 14:38:37 +0000 (15:38 +0100)]
luci-base: static.js: fix validation of netmask option

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 06c0fbbef736c7d4976614467064d094af8ccf85)

7 weeks agoluci-base: ui.js: further keyboard navigation improvements for dropdowns
Jo-Philipp Wich [Wed, 21 Feb 2024 14:30:16 +0000 (15:30 +0100)]
luci-base: ui.js: further keyboard navigation improvements for dropdowns

 - Ensure that pressing escape within the custom choice input closes the
   dropdown list but not the parent modal dialog

 - Ensure that added custom choice elements are tabbable

 - Retain focus on dropdown when closing dropdown

 - Consistently focus input textarea when tabbing into custom choice item

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 317ed4a0432b3f57c0cf76e633c180b171b7aae1)

7 weeks agoluci-app-firewall: add address range inputs for traffic rules
Jo-Philipp Wich [Wed, 21 Feb 2024 13:45:34 +0000 (14:45 +0100)]
luci-app-firewall: add address range inputs for traffic rules

Ref: https://forum.openwrt.org/t/question-about-firewall-rules/188656
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 42bd2af3fe2b3902cf0b48469e155c324ef5322d)

7 weeks agoluci-base: validation.js: add iprange, iprange4 and iprange6 validators
Jo-Philipp Wich [Wed, 21 Feb 2024 13:37:03 +0000 (14:37 +0100)]
luci-base: validation.js: add iprange, iprange4 and iprange6 validators

Add datatype validators for IP address ranges which are required for certain
firewall inputs.

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

7 weeks agoluci-mod-network: dhcp.js: relax CNAME domain validation
Jo-Philipp Wich [Sun, 18 Feb 2024 23:22:38 +0000 (00:22 +0100)]
luci-mod-network: dhcp.js: relax CNAME domain validation

Relax the CNAME domain validation to allow wildcard names.

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

7 weeks agoluci-base: ui.js: rework dropdown focus behavior
Jo-Philipp Wich [Sun, 18 Feb 2024 22:25:55 +0000 (23:25 +0100)]
luci-base: ui.js: rework dropdown focus behavior

Drop mouse following focus behavior as it interferes with custom value inputs,
rely on CSS based hover effects instead.

Also slightly improve keyboard navigation by auto-focussing the custom value
input when entering the last dropdown choice via arrow down or tab key, and
by allowing to leave the text input again with the arrow up key.

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

7 weeks agoluci-theme-material: add dropdown option hover styles
Jo-Philipp Wich [Sun, 18 Feb 2024 22:25:22 +0000 (23:25 +0100)]
luci-theme-material: add dropdown option hover styles

Subsequent commits will drop the JS based mouse following focus behavior,
so add appropriate replacement CSS hover styles.

Ref: #6903
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 01e55108889563563231e111f8fe1d4bf9b1b853)

7 weeks agoluci-theme-openwrt: add dropdown option hover styles
Jo-Philipp Wich [Sun, 18 Feb 2024 22:25:08 +0000 (23:25 +0100)]
luci-theme-openwrt: add dropdown option hover styles

Subsequent commits will drop the JS based mouse following focus behavior,
so add appropriate replacement CSS hover styles.

Ref: #6903
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b0e56a39aa11d9937de8f3814df25a1a4783ac6c)

7 weeks agoluci-theme-openwrt-2020: add dropdown option hover styles
Jo-Philipp Wich [Sun, 18 Feb 2024 22:24:46 +0000 (23:24 +0100)]
luci-theme-openwrt-2020: add dropdown option hover styles

Subsequent commits will drop the JS based mouse following focus behavior,
so add appropriate replacement CSS hover styles.

Ref: #6903
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ae146074a1a779388f8a05de55071422be8c23b5)

7 weeks agoluci-theme-bootstrap: add dropdown option hover styles
Jo-Philipp Wich [Sun, 18 Feb 2024 22:22:58 +0000 (23:22 +0100)]
luci-theme-bootstrap: add dropdown option hover styles

Subsequent commits will drop the JS based mouse following focus behavior,
so add appropriate replacement CSS hover styles.

Ref: #6903
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f57514d63ca23ec3020a5605a039ac0b228e994d)

7 weeks agoluci-app-ntpc: remove app
Daniel Nilsson [Wed, 28 Feb 2024 17:42:58 +0000 (18:42 +0100)]
luci-app-ntpc: remove app

As ntpclient package is dead, we can delete the app.

Signed-off-by: Daniel Nilsson <daniel.nilsson94@outlook.com>
(cherry picked from commit 6cd54b43eb36357c0e41d3f961e685752c32fdb2)

7 weeks agoMerge pull request #6945 from dannil/ntpc-to-js
Hannu Nyman [Tue, 5 Mar 2024 16:47:46 +0000 (18:47 +0200)]
Merge pull request #6945 from dannil/ntpc-to-js

luci-app-ntpc: remove app
(cherry picked from commit 452e8137834ad085844f4b3c694545708f0adaa6)

7 weeks agoluci-mod-status: fix sporadic logical interfaces resolve failures
Jo-Philipp Wich [Mon, 4 Mar 2024 22:54:24 +0000 (23:54 +0100)]
luci-mod-status: fix sporadic logical interfaces resolve failures

Correct the incorrect netmask calculation logic leading to incorrect
network range comparisons in some cases.

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

8 weeks agoluci-mod-network: Add clarifying note to wireless join dialog
Hannu Nyman [Sun, 3 Mar 2024 18:24:19 +0000 (20:24 +0200)]
luci-mod-network: Add clarifying note to wireless join dialog

Add a clarifying note about two different meanings of "network"on
the wireless join page. In the dialog title the word "network" refers
to the wireless SSID, while in the config item the same "network"
refers to the name to be used in OpenWrt network configuration.

Reference to forum discussion at
https://forum.openwrt.org/t/cant-join-a-scanned-network/189859

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 48e96d89557cbadfa03ffa351589b6d2273f1ed5)

8 weeks agoluci-app-banip: sync with release 0.9.4-1
Dirk Brenken [Sat, 2 Mar 2024 08:33:39 +0000 (09:33 +0100)]
luci-app-banip: sync with release 0.9.4-1

* small changes to support the new destination port & protocol options in the feed editor and in the reporting engine

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 85c0429651b09a75195bb583506decf07fa9b7bf)

8 weeks agotreewide: Backport i18n translations from master
Hannu Nyman [Fri, 1 Mar 2024 16:35:23 +0000 (18:35 +0200)]
treewide: Backport i18n translations from master

Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2 months agoluci-app-travelmate: remove obsolete option
Dirk Brenken [Sat, 24 Feb 2024 06:15:15 +0000 (07:15 +0100)]
luci-app-travelmate: remove obsolete option

* remove osolete trm_maxscan option
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 7b8e82f26bf2668e9a515b07bbd470bbf022a2ab)
Signed-off-by: Dirk Brenken <dev@brenken.org>
2 months agoluci-mod-status: BUGFIX: routes: help strings to clarify column titles
Thomas Schröder [Sun, 18 Feb 2024 13:24:35 +0000 (14:24 +0100)]
luci-mod-status: BUGFIX: routes: help strings to clarify column titles

Adds a missing closing bracket.

Signed-off-by: Thomas Schröder <tschroeder_github@outlook.com>
(cherry picked from commit 6b0953af64eba7fd70830178dd7f0f51a7c34fed)

2 months agotreewide: Backport translations from master
Hannu Nyman [Sun, 18 Feb 2024 08:20:09 +0000 (10:20 +0200)]
treewide: Backport translations from master

Backport from master.
sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2 months agoluci-base: extend Expires directive to prevent caching
Andre Heider [Tue, 12 Sep 2023 18:09:53 +0000 (20:09 +0200)]
luci-base: extend Expires directive to prevent caching

Some browsers apparently act on fixed dates only, so add that too.
Tested on firefox.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 12378d77cea16c268e980cca33e46df614ce5ecd)

2 months agoluci-base: i18n sync
Paul Donald [Sat, 17 Feb 2024 16:57:29 +0000 (17:57 +0100)]
luci-base: i18n sync

for 580bd979095170081ba34580f58d1ce10c390bf1

Signed-off-by: Paul Donald <newtwen@gmail.com>
2 months agoluci-mod-status: routes: help strings to clarify column titles
Paul Donald [Fri, 16 Feb 2024 00:07:28 +0000 (01:07 +0100)]
luci-mod-status: routes: help strings to clarify column titles

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 2abc93c6e8d9ad81881756014a151840c7c7de6e)

2 months agoluci-base: i18n sync
Paul Donald [Sat, 17 Feb 2024 16:46:44 +0000 (17:46 +0100)]
luci-base: i18n sync

for 49529bb59b345619cfac8fd1cf278e5529298f58

Signed-off-by: Paul Donald <newtwen@gmail.com>
2 months agoluci-mod-network: wireless: RADIUS Access/Accounting-Request attrs
Paul Donald [Fri, 16 Feb 2024 00:49:29 +0000 (01:49 +0100)]
luci-mod-network: wireless: RADIUS Access/Accounting-Request attrs

See following for more detail:

https://w1.fi/cgit/hostap/commit/?id=af35e7af7f8bb1ca9f0905b4074fb56a264aa12b

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit d9e7be1b435c9dc98829b10d153e5ff83ee4c213)

2 months agoMerge pull request #6924 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Fri, 16 Feb 2024 23:24:25 +0000 (16:24 -0700)]
Merge pull request #6924 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing

2 months agoluci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing 6924/head
Stan Grishin [Wed, 14 Feb 2024 20:38:53 +0000 (20:38 +0000)]
luci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit ffc0ffe6697bb315b96a75ab7807cecdd95f7314)

2 months agoMerge pull request #6911 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 16 Feb 2024 23:12:55 +0000 (16:12 -0700)]
Merge pull request #6911 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: dnsmasq_instance & smartdns_instance p…

2 months agoluci-proto-wireguard: fix broken DNS option in peer config generator
Jo-Philipp Wich [Fri, 16 Feb 2024 15:17:26 +0000 (16:17 +0100)]
luci-proto-wireguard: fix broken DNS option in peer config generator

The config generation code was referencing a not existing `dns_servers`
input field.

Fixes: #6921
Fixes: 5b26887c52 ("Adding a DNS option to the wireguard peer config ...")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e28f9a0491f5f50a70bbefb1720ff8241f456f83)

2 months agoluci-mod-network: dhcp: separate actual value and display string
Paul Donald [Thu, 15 Feb 2024 22:07:31 +0000 (23:07 +0100)]
luci-mod-network: dhcp: separate actual value and display string

saved value will now be only an integer.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 5b955f1ae922e37ec6bc07599d547aa9c3a5ebf1)

2 months agoluci-app-usteer: filter repeated SSIDs in config
Miguel Angel Mulero Martinez [Wed, 14 Feb 2024 07:03:43 +0000 (08:03 +0100)]
luci-app-usteer: filter repeated SSIDs in config

When the SSID name was the same in different radio, they appear repeated in the options. This commit filter them.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 2841d28396984431f3cf313cf0fbf381441ec40e)

2 months agobuild: invoke ./build/mkbasepot.sh without any parameters
Paul Donald [Thu, 15 Feb 2024 03:01:14 +0000 (04:01 +0100)]
build: invoke ./build/mkbasepot.sh without any parameters

e.g. to build everything

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 269df2426d8c207d6c89ad2950a65f187d9a922e)

2 months agoluci-mod-network: fix broken formatting
Paul Donald [Thu, 15 Feb 2024 01:58:42 +0000 (02:58 +0100)]
luci-mod-network: fix broken formatting

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit ca80c2acf7a1a5c3600d44bbaff1c51b7b170bc2)

2 months agoluci-base: i18n sync
Paul Donald [Wed, 14 Feb 2024 23:31:45 +0000 (00:31 +0100)]
luci-base: i18n sync

after revert of commit f99b20773fca5a7546809ad356c35e205182be0e.

Signed-off-by: Paul Donald <newtwen@gmail.com>
2 months agobuild: invoke ./build/mkbasepot.sh with -b
Paul Donald [Thu, 15 Feb 2024 00:24:11 +0000 (01:24 +0100)]
build: invoke ./build/mkbasepot.sh with -b

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 50f470f6be08a989f1a92094769a1db671862cf3)

2 months agobuild: update build/i18n-* tools
Paul Donald [Wed, 3 Jan 2024 13:14:06 +0000 (13:14 +0000)]
build: update build/i18n-* tools

modify i18n-add-language.sh so it can:
- be run from any path
- bootstrap any (or all) po folder(s) with existing language(s)
- (partially) update luci.mk with new languages

deprecate build/i18n-init.sh

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit b98d8c526e05d658856a83c469f79957223fbfd6)

2 months agoluci-app-tor: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:39:59 +0000 (03:39 +0100)]
luci-app-tor: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 9b978c522ecc0b71275606ea109d7233edbf86bb)

2 months agoluci-app-usteer: Fix no wireless defined setup
Miguel Angel Mulero Martinez [Tue, 13 Feb 2024 11:25:48 +0000 (12:25 +0100)]
luci-app-usteer: Fix no wireless defined setup

Some users use the usteer app in a "non wireless" device. With the current code it crashes because there is no SSID defined. Making the ui element a DynamicList fixes the issue because it allows free text input.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit ac8cf93a015a3eeb960ef216e59dde643bf059ed)

2 months agoluci-app-opkg: i18n sync
Paul Donald [Wed, 14 Feb 2024 22:20:56 +0000 (23:20 +0100)]
luci-app-opkg: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
2 months agoluci-app-openvpn: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:38:45 +0000 (03:38 +0100)]
luci-app-openvpn: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 640727d8586d2938f10039b72a9f07b4c092022f)

2 months agoluci-app-https-dns-proxy: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:38:19 +0000 (03:38 +0100)]
luci-app-https-dns-proxy: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 22467ec732cca0f4f259597535bd304bb5983075)

2 months agoluci-app-adblock-fast: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:37:37 +0000 (03:37 +0100)]
luci-app-adblock-fast: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 07f0d7a61a64314e8c7520c35f4a996cc9ea56ad)

2 months agobuild: i18n-sync script refinements
Paul Donald [Tue, 13 Feb 2024 03:11:41 +0000 (04:11 +0100)]
build: i18n-sync script refinements

add -P x to xargs for x number of processes.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e88294d7acd5002b4867aedd2f2e238eb39efb63)

2 months agoluci-app-tor: add config for tor
Sergey Ponomarev [Fri, 9 Feb 2024 01:07:22 +0000 (03:07 +0200)]
luci-app-tor: add config for tor

Currently the UCI for the Tor allows to set only a list of configs to include.
The only way to configure it for a user is to upload its own config and add it to list of included.
We can simplify this with the app.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit c170dfab9197f714c5e4483caad924631779122a)