project/luci.git
3 months agotreewide: Backport i18n translations
Hannu Nyman [Thu, 29 Aug 2024 18:21:42 +0000 (21:21 +0300)]
treewide: Backport i18n translations

Backport from master. Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 months agoluci-app-usteer: Fix translation
Hannu Nyman [Tue, 20 Aug 2024 17:20:51 +0000 (20:20 +0300)]
luci-app-usteer: Fix translation

Fix translation by renaming po/template --> po/templates
Backport current translations.

(Fixes 77bd97af cherry-pick of 0b2aad03 by applying also
the directory name fix from d41e972b)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 months agoluci-app-usteer: Fix neighbor spelling in option
Hannu Nyman [Tue, 20 Aug 2024 16:56:20 +0000 (19:56 +0300)]
luci-app-usteer: Fix neighbor spelling in option

Fix option name max_neighbour_reports --> max_neighbor_reports

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(adapted from 067f1c5 in master)

3 months agoluci-app-natmap: change bind port data type from port to portrange
Ray Wang [Tue, 13 Aug 2024 16:05:51 +0000 (00:05 +0800)]
luci-app-natmap: change bind port data type from port to portrange

Signed-off-by: Ray Wang <r@hev.cc>
(cherry picked from commit ca57a08eb9176f51a978cb2adbaa96b6c5dcb470)

3 months agoMerge pull request #7239 from stangri/openwrt-23.05-pbr
Stan Grishin [Thu, 15 Aug 2024 13:31:40 +0000 (06:31 -0700)]
Merge pull request #7239 from stangri/openwrt-23.05-pbr

[23.05] luci-app-pbr: cherry-pick commits from snapshots to update to 1.1.6-20

3 months agoluci-app-pbr: sync with 1.1.6-20 principal package 7239/head
Stan Grishin [Sat, 3 Aug 2024 23:23:38 +0000 (23:23 +0000)]
luci-app-pbr: sync with 1.1.6-20 principal package

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

3 months agoluci-app-pbr: sync with principal package
Stan Grishin [Sat, 13 Apr 2024 22:34:30 +0000 (22:34 +0000)]
luci-app-pbr: sync with principal package

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

3 months agoluci-app-pbr: sync with principal package
Stan Grishin [Thu, 11 Apr 2024 16:31:29 +0000 (16:31 +0000)]
luci-app-pbr: sync with principal package

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

3 months agoluci-app-pbr: prepare migration to APK
Stan Grishin [Sat, 23 Mar 2024 01:14:52 +0000 (01:14 +0000)]
luci-app-pbr: prepare migration to APK

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

3 months agoluci-app-pbr: update to 1.1.4-5
Stan Grishin [Mon, 18 Mar 2024 02:03:13 +0000 (02:03 +0000)]
luci-app-pbr: update to 1.1.4-5

* sync with the principal package
* add the status include file

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

3 months agotreewide: Backport i18n translations and sync
Hannu Nyman [Sun, 11 Aug 2024 18:49:58 +0000 (21:49 +0300)]
treewide: Backport i18n translations and sync

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 months agoluci-app-adblock: sync with adblock-4.2.1
Dirk Brenken [Sun, 11 Aug 2024 07:52:10 +0000 (09:52 +0200)]
luci-app-adblock: sync with adblock-4.2.1

* added full 1Hosts support

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 06037ad777ab0500008c49bcb2c06af309bc4e51)
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 months agoluci-app-adblock: sync with adblock-4.2.0
Dirk Brenken [Sun, 11 Aug 2024 07:46:07 +0000 (09:46 +0200)]
luci-app-adblock: sync with adblock-4.2.0

* add hagezi support

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 257cfac4257571581bd32430757c94a783d4e1e5)
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 months agoMerge pull request #7230 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Sat, 10 Aug 2024 20:25:41 +0000 (13:25 -0700)]
Merge pull request #7230 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with 1.1.2-3 principal package

3 months agoluci-app-adblock-fast: sync with 1.1.2-3 principal package 7230/head
Stan Grishin [Sat, 3 Aug 2024 23:32:11 +0000 (23:32 +0000)]
luci-app-adblock-fast: sync with 1.1.2-3 principal package

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

3 months agoMerge pull request #7226 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Tue, 6 Aug 2024 09:34:22 +0000 (02:34 -0700)]
Merge pull request #7226 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: Mullvad URL update

3 months agorpcd-mod-luci: strip colon from dnsmasq duid
Ansuel Smith [Mon, 7 Dec 2020 16:57:49 +0000 (17:57 +0100)]
rpcd-mod-luci: strip colon from dnsmasq duid

Dnsmasq DHCPv6 use colons in the generated duid present in the lease file. Strip the colon as this is not supported by the OpenWrt config and follow the same way odhcpd use to display duid.

Fixes: #4543
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit f71e9cbd42db24c7743589804dacfdf5513ca883)

3 months agoluci-app-https-dns-proxy: Mullvad URL update 7226/head
Hector Fernandez [Fri, 2 Aug 2024 18:12:49 +0000 (20:12 +0200)]
luci-app-https-dns-proxy: Mullvad URL update

Signed-off-by: Hector Fernandez <hector.fernandez.carmona@gmail.com>
(cherry picked from commit d5f80ac6e8669d3c52d92e9b33ebd4cb6627a41e)

4 months agoluci-base: dispatcher.uc: skip login nodes when resolving w/ active session
Jo-Philipp Wich [Tue, 30 Jul 2024 21:50:41 +0000 (23:50 +0200)]
luci-base: dispatcher.uc: skip login nodes when resolving w/ active session

When resolving eligible child nodes during evaluation of the "firstchild"
dispatch action, do not consider nodes allowing a login as allowed when
there already is an established session.

This fixes cases where restricted sessions are redirected to nodes they
have insufficent ACLs for, just because those nodes allow logins.

Fixes: #7218
Ref: https://forum.openwrt.org/t/x/174687
Suggested-by: @mikma
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 65b8002adbf8219b5dad37637756fa8fcae871a6)

4 months agoluci-mod-status: log viewers - change focus() to scrollIntoView()
Paul Donald [Mon, 8 Jul 2024 14:34:31 +0000 (16:34 +0200)]
luci-mod-status: log viewers - change focus() to scrollIntoView()

scrollIntoView() is more universally supported and standards tracked.

Closes #7186

Updates 9370bdddaede2feeb581193158d83f5062d5a318

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

4 months agoluci-theme-openwrt: convert Lua templates to ucode
Jo-Philipp Wich [Mon, 29 Jul 2024 22:06:23 +0000 (00:06 +0200)]
luci-theme-openwrt: convert Lua templates to ucode

Convert the theme's Lua templates to ucode to avoid the implicit dependency
on the luci-lua-runtime package.

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

4 months agoMerge pull request #7216 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Mon, 29 Jul 2024 21:35:16 +0000 (14:35 -0700)]
Merge pull request #7216 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update

4 months agoluci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update 7216/head
Stan Grishin [Mon, 29 Jul 2024 01:07:55 +0000 (01:07 +0000)]
luci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update

* bugfix: update OpenDNS family filter URL
* update copyright/license
* update PKG_RELEASE to avoid double `r` on snapshots
* add LUCI_URL to upstream repository
* update README URL to upstream documentation
* update pkg.URL property to allow linking to a specific version of README
* remove duplicates of pkg object from overview.js/status include js files

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

4 months agoluci-app-banip: optimized external file loading
Dirk Brenken [Fri, 26 Jul 2024 20:29:39 +0000 (22:29 +0200)]
luci-app-banip: optimized external file loading

* optimize loading of external config/feed files

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

4 months agoluci-mod-network: made expandAndFormatMAC return arrays
Paul Donald [Thu, 25 Jul 2024 14:22:25 +0000 (16:22 +0200)]
luci-mod-network: made expandAndFormatMAC return arrays

instead of returning a space separated string

follow-up to 5ab0cb1f15bcb31015ae8345d302c6d023ba51e2

Closes #7209

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

4 months agoluci-mod-network: Correctly assign dnsmasq instance: name not number
Paul Donald [Tue, 23 Jul 2024 13:18:07 +0000 (15:18 +0200)]
luci-mod-network: Correctly assign dnsmasq instance: name not number

Closes #7199

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

4 months agotreewide: Backport and sync i18n translations
Hannu Nyman [Thu, 18 Jul 2024 09:09:00 +0000 (12:09 +0300)]
treewide: Backport and sync i18n translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 months agotreewide: Backport translations
Hannu Nyman [Fri, 28 Jun 2024 20:02:41 +0000 (23:02 +0300)]
treewide: Backport translations

Backport translations and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 months agoluci-app-keepalived: Fix option for script falls
Kotyara [Sun, 16 Jun 2024 13:09:13 +0000 (13:09 +0000)]
luci-app-keepalived: Fix option for script falls
Signed-off-by: Kotyara <lokotyara@gmail.com>
5 months agotreewide: Backport and sync i18n translations
Hannu Nyman [Sat, 15 Jun 2024 07:22:21 +0000 (10:22 +0300)]
treewide: Backport and sync i18n translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 months agoluci-app-banip: sync with forthcoming banIP 1.0
Dirk Brenken [Fri, 7 Jun 2024 20:58:23 +0000 (22:58 +0200)]
luci-app-banip: sync with forthcoming banIP 1.0

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

5 months agoluci-app-banip: responsive design fixes
Dirk Brenken [Sun, 2 Jun 2024 12:15:54 +0000 (14:15 +0200)]
luci-app-banip: responsive design fixes

fix responsive design, esp. on mobile devices

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

6 months agoluci-app-banip: sync with 0.9.6-2
Dirk Brenken [Thu, 30 May 2024 20:13:17 +0000 (22:13 +0200)]
luci-app-banip: sync with 0.9.6-2

small fixes & improvements

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

6 months agoluci-app-opkg: populate alternative package size if needed
Jo-Philipp Wich [Mon, 27 May 2024 12:09:53 +0000 (14:09 +0200)]
luci-app-opkg: populate alternative package size if needed

Populate the raw size value with the alternative size if the package
size is unavailable.

Fixes: #7139
Fixes: 63e5d38db0 ("luci-app-opkg: fix sorting by size column")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2d2e5c0689b3483b22d033af1da9d33afeedf33e)

6 months agoluci-mod-status: fix ordering realtime connections by traffic
Jo-Philipp Wich [Mon, 20 May 2024 08:07:41 +0000 (10:07 +0200)]
luci-mod-status: fix ordering realtime connections by traffic

Add raw byte values to properly order rows by transferred bytes,
regardless of the dispalyed unit.

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

6 months agotreewide: Backport i18n translations
Hannu Nyman [Thu, 16 May 2024 16:38:40 +0000 (19:38 +0300)]
treewide: Backport i18n translations

Backport translations. Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 months agoRevert "luci-proto-ppp: pppoe.so has no MTU option; remove it"
Jo-Philipp Wich [Mon, 13 May 2024 10:34:15 +0000 (12:34 +0200)]
Revert "luci-proto-ppp: pppoe.so has no MTU option; remove it"

This reverts commit 995d3a1801cf3b850e8c7c35937fbdd0526ff53e.

The `mtu` option controls the pppd mru and mtu arguments, it is not
specific to pppoe.so.

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

6 months agoluci-app-p910nd: Fix enable default
Paul Donald [Tue, 14 May 2024 12:14:29 +0000 (14:14 +0200)]
luci-app-p910nd: Fix enable default

Enabled setting shall always be present.

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

6 months agoluci-app-xinetd: introduce bind setting
Paul Donald [Sun, 12 May 2024 21:14:47 +0000 (23:14 +0200)]
luci-app-xinetd: introduce bind setting

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

6 months agoMerge pull request #7122 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Mon, 13 May 2024 23:03:41 +0000 (16:03 -0700)]
Merge pull request #7122 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.2-1

6 months agoluci-app-adblock-fast: update to 1.1.2-1 7122/head
Stan Grishin [Mon, 13 May 2024 04:36:07 +0000 (04:36 +0000)]
luci-app-adblock-fast: update to 1.1.2-1

* update license
* update PKG_VERSION/PKG_RELEASE
* improve visibility in menuconfig
* add warning for compatiblity check fails with principal package
* report compatiblity check fails with principal package from RPCD script

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

6 months agoluci-app-banip: sync with 0.9.5-5
Dirk Brenken [Sun, 5 May 2024 20:04:46 +0000 (22:04 +0200)]
luci-app-banip: sync with 0.9.5-5

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

6 months agoluci-app-banip: various optimizations
Dirk Brenken [Thu, 2 May 2024 21:02:33 +0000 (23:02 +0200)]
luci-app-banip: various optimizations

* add various translation improvements based on the work of "stokito"
* use the new logreadbox component for the firewall log as well
* removed obsolete standard Save/Save & Apply buttons in the footer,
   use only the improved/customized "Reload" and "Restart" buttons
* improved the error handling in the try/catch blocks

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit c2740d7cd96921aba5dc354400bc2e1ad46b10ca)
Signed-off-by: Dirk Brenken <dev@brenken.org>
6 months agoluci-app-banip: improve translation
Dirk Brenken [Thu, 2 May 2024 20:56:18 +0000 (22:56 +0200)]
luci-app-banip: improve translation

Remove obsolete "VLAN Forwads" translations
Fix Treshold to Threshold
restore Countries translation
reuse Disable instead of 0 (disable)
reuse old translation Restart for Apply & Restart
untranslate numbers and use o.default

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 6b58247456148fe65aa956331c65269bbac1381a)
Signed-off-by: Dirk Brenken <dev@brenken.org>
7 months agoluci-app-banip: fix "Apply & Restart" button call chain
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)

7 months 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>
7 months 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)

7 months 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)

7 months 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)

7 months 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)

7 months 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)

7 months 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)

7 months 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)

7 months 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)

7 months 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

7 months 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)

7 months 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>
7 months 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)

7 months 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

7 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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

8 months 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

8 months 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

8 months 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

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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>
8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)

8 months 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)