luci-mod-network: DNS forwardings -> DNS Forwards

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

luci-app-keepalived: drive-by fixes

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

luci-mod-status: i18n refresh eb6b2bdaae9c6f8d6d8969b47e21895d6508f396

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

luci-mod-status: Adding scroll buttons on syslog and kernellog status pages

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit eb6b2bdaae9c6f8d6d8969b47e21895d6508f396)

Revert "luci-mod-network: add ppsk option (support for Private PSK)"

This reverts commit f99b20773fca5a7546809ad356c35e205182be0e.

Merge pull request #6906 from stangri/openwrt-23.05-luci-app-opkg

[23.05] luci-app-opkg: show disk space consistent with overview

luci-app-opkg: show disk space consistent with overview

* Show Disk space graph consistent with the Status->Overview page
* Brought up in https://forum.openwrt.org/t/software-space-is-going-to-full/187112
* Leading whitespaces reformatted by vscode
* Localizable disk space progress bar title
* Kudos to https://forum.openwrt.org/u/psherman for coming up with final design

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

luci-base: update timezone data to 2024a

Update timezone data to 2024a.

https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html

Briefly:
* Kazakhstan unifies on UTC+5 beginning 2024-03-01.

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

luci-mod-network: put each IPv6 address on a separate line

Right now, when there's active DHCPv6 leases and more than one address per host
(e.g. because ULA is used together with GUA prefixes), the two IPv6 addresses
will be printed on one line (which may or may not get broken up depending on
the length of the addresses, which also looks inconsistent).

Putting each address on a separate line makes it much easier to read the
addresses (IMHO).

Signed-off-by: David Härdeman <david@hardeman.nu>
(cherry picked from commit 9116a93d4311f541efa026f9eb3309a5f7554fd4)

luci-app-openvpn: add OpenVPN option disable-dco

You maybe want to disable the DCO support, so let's add this option.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
(cherry picked from commit 5b2bc99c30b80c3a706de3133a8c05f852dc08d1)

luci-app-cloudflared: simplify translation

Rename "Debug level" with "Logging level".
Reuse similar messages "Log" and "Logs".
Remove now unused "Collecting data...".
Use "Cloudflare Zero Trust Tunnel" instead of just "Cloudflared".

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

luci-app-cloudflared: v1.1

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

luci-app-cloudflared: fix ACL for uploading a file

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

luci-app-cloudflared: simplify service status render

Instead of using poll use the o.cfgvalue to render a status.

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

luci-app-cloudflared: add Tunnels status page

The page allows to see if the tunnel has connections.
This can be used for a basic troubleshooting without opening the Cloudflare dashboard.

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

luci-app-usteer: retrieve SSIDs to be used in the config

This commit retrieves the list of SSIDs availables to prepopulate the ssid_list UI element of the config.

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

Merge pull request #6889 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: prevent runtime errors on empty strings

luci-app-adblock-fast: bugfix: prevent runtime errors on empty warning/messages

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

luci-app-smartdns: Fix The list has multiple headers.
Signed-off-by: FanxJK <fanxjk@gmail.com>
(cherry picked from commit 16f4011644b8689fffb0866e2de4e821b2f52d9b)

luci-app-cloudflared: configure Cloudflare Zero Trust Tunnel

Configure a tunnel and see logs of the daemon.

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

luci-mod-network: add disabled option for interface

Enabled by default. If the interface is in use, the user will be asked
to confirm.

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

luci-base: Code quality fixes

reduce backtracking in regex

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

luci-lib-nixio: Code quality fixes

future variants could use en/decodeURIComponent

ordering is important when handling "&"

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

luci-app-bmx7: Code quality fixes

Add integrity check for externally loaded d3 lib

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

luci-base: Code quality fixes

handle (possibly incorrect) comment variants
<!-- -->
<!-- --!>

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

luci-base: fix docs for TableSection

There are repeated values (TableSection inherits identically named
values from TypedSection which do not make sense to recreate).

There seemed to be other errors. E.g. TypedSection for FlagValue
properties, which mean that TypedSection got tooltip + tooltipicon,
and by virtue of the above error, GridSection inherited this too.

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

luci-app-statistics: Add rrd backup option to config file

Commit ad98af3a2 added the statistics data backup capability
to LuCI statistics, but dit not add the option to the config file.

Add the option (as disabled), so that users can easier notice the
feature.

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

treewide: Backport translations from master and sync

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-usteer: added nslookup/hosthint lookup of AP IP address

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 7a9ae6811fece6512a432af352b4e774fe4a05ed)

luci-mod-network: add ppsk option (support for Private PSK)

Include support in luci to enable the Private PSK.
When Private PSK is enabled, clients can use a default password (common),
or have their own private password that is associated with the client MAC.

The password is retrieved from RADIUS server, asking for the client MAC,
and when such client MAC is not defined, RADIUS should return a default
password.

RADIUS can also return other parameters like VLANs, which can be used to
put clients dynamically in different VLANs based on their MAC, or the
default configuration.

Private PSK is not compatible yet with SAE encryption, therefore cannot
be used yet with WPA3 or WPA3-mixed.

It implements the UI for the PPSK already in master: https://github.com/openwrt/openwrt/pull/3509

Signed-off-by: Manuel Giganto <mgigantoregistros@gmail.com>
(cherry picked from commit 75a2fd233baabf6fa5bafcb13ccc6d7000a4604d)

luci-app-v2raya: add zh-hans translation

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

luci-app-v2raya: i18n house-keeping

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

luci-app-v2raya: add new package

Add LuCI interface for the v2rayA package.

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

luci-mod-network: Fixes for PXE/TFTP tab.

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

luci-mod-network: Restructure DHCP options

DHCP devices: add minport and maxport

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

luci-mod-network: Restructure DHCP options

DHCP limits: add [min|max]_cache_ttl

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

luci-mod-network: Restructure DHCP options

DHCP logging: add logfacility

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

luci-mod-network: Restructure DHCP options

DHCP logging: add logdhcp

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

luci-mod-network: Restructure DHCP options

Multiple dnsmasq sections are now enabled (for those who want
e.g. separate dnsmasq options per interface).

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

luci-mod-network: Restructure DHCP options

DHCP options better structured according to the nature of
the option:

-Tab titles have been trimmed
-Some options moved into new tabs (filter, limits, logging, devices,etc)

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

luci-app-upnp: fix name of access-control-list

Signed-off-by: Reidar Cederqvist <reidar.cederqvist@genexis.eu>
(cherry picked from commit d048e40cb74cc4478beedabca55902a54a4965ad)

luci-mod-network: let sourcefilter option available for most proto

sourcefilter option should be available for proto like:
'dhcpv6'
'directip'
'ppp'
'pppoe'
'pppoa'
'pptp'
'qmi'
'mbim'
'ncm'
'3g'

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 999f26e951e516ddb394ecf7b6b305e4a34810fa)

luci-mod-network: add getHostHints to luci-rpc permissions

it would seem that this was forgotten somewhere along the way

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

luci-mod-network: improve static lease ip validation logic

m (mac) is an array, and is zero length or greater.

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

luci-mod-network: repair DHCP relay validation logic

change && to || so as not to backtrace if only one was empty/null.

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

luci-app-openvpn: Updates proto and mssfix params

- proto parameter is available in client or server mode in the network section.
- mssfix default value is set to openvpn.org default value

Signed-off-by: Philippe Duveau <philippe.duveau@free.fr>
(cherry picked from commit 9889d3f73524c5ef814ab37e5c9fac81f213046d)

Merge pull request #6862 from jesferman/fix_11r_dependencies

luci-mod-network: wireless.js: fix 802.11r dependencies
(cherry picked from commit b0c135423370548e8198609309e64bf48fe1717b)

luci-app-upup: Improve translation

Signed-off-by: He Ping <pinghejk@gmail.com>
(cherry picked from commit 2bdf7c83e3c71f9ad4dfaec259c7fcce87e7d807)

Merge pull request #6852 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: remove unnecessary translation call

Merge pull request #6850 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: remove unnecessary translation calls

luci-app-ksmbd: update kmod from version to vermagic

Now the kmod version on luci show "?", if we switch from version to vermagic it will show correct version of kmod.

Signed-off-by: Andrea Pesaresi <andreapesaresi82@gmail.com>
(cherry picked from commit fe543de80956405085997014fd347f869013953c)

treewide: Backport translations and sync

Backport from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-https-dns-proxy: remove unnecessary translation call

Thank you @hnyman!

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

luci-app-adblock-fast: remove unnecessary translation calls

Thank you @hnyman!

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

Merge pull request #6827 from stangri/openwrt-23.05-luci-theme-openwrt-2020

[23.05] luci-theme-openwrt-2020: fix anchor decorations

luci-theme-openwrt-2020: fix anchor decorations

* add the decorations for when the links are included in the field descriptions

Thanks @dibdot, @stokito!

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

Merge pull request #6823 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05 luci-app-https-dns-proxy: bugfix: editing providers with options

luci-app-https-dns-proxy: bugfix: editing providers with options

* fixes https://github.com/openwrt/luci/issues/6811
* previously editing existing provider instance with options would not
  result in the correct saving of edited parameters

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

luci-app-firewall: add ICMPv6 MLD rules

This adds entries for ICMPv6 MLD types. This fixes the ICMPv6 MLD types to be consistent with fw4.

These types were added to fw4 in this commit:

    -  https://github.com/openwrt/firewall4/commit/e6e82a55206cf7017f26b92f7097f779161b5cac

But were omitted from the corresponding luci-app-firewall commit:

    - https://github.com/openwrt/luci/commit/88a016cbff7eacf3a8248bc4949904abacef6685

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
(cherry picked from commit 73abc0ee6d64bab49889b1d5fbca09f9a8e64745)

luci-app-travelmate: sync with travelmate 2.1.2-1

* fix a station scanning issue on single radio units (mainly a LuCI/JS issue) reported in the forum by multiple users

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

treewide: Backport translations from master

Backport translations from master. Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

timezone data: update to 2023d

Update timezone data to 2023d.

https://mm.icann.org/pipermail/tz-announce/2023-December/000080.html

Summary:
* Ittoqqortoormiit, Greenland changes time zones on 2024-03-31.
* Vostok, Antarctica changed time zones on 2023-12-18.
* Casey, Antarctica changed time zones five times since 2020.

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

luci-app-usteer: Added tooltip while hovering over connected client showing mac, IP(s), hostname in status page

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 0f794ac76c53b154694b8ee9be4772a501faa76f)

luci-app-usteer: Removed save/apply button on status pages, and added "friendly" error message if usteer not running
Added refresh of status page

Add the template pot file that is needed to start translating the app.

Co-authored-by: Sergey Ponomarev <stokito@gmail.com>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 0b2aad03599c4f5c7b513f9274b529e7dd3d7e29)

luci-mod-network: Rework the (multi) mac for static leases

+i18n

Removed Jows widget which hindered management of multi mac entries.

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

luci-mod-network: Make MAC check functions generic.

Also remove a reassigned so.validate function (dead code).

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

luci-mod-network: DHCP tab IPsets ( add NFTsets properties )

See also:

https://github.com/openwrt/openwrt/commit/d7f378796f985c902ff7906767c275c40a15347f

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

luci-app-sshtunnel: sync .po files

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

luci-app-sshtunnel: servers: ProxyCommand option

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

luci-app-banip: sync with banIP-0.9.3-1

* expose the new remote logging/cgi options

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

luci-app-sshtunnel: i18n

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

luci-app-sshtunnel: hide Save and Apply buutons for non form pages

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

luci-app-sshtunnel: servers: make a link to man ssh_config

Use Debian man pages because it has many versions and languages.

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

luci-app-sshtunnel: extract a public key from a key if no .pub

For the Dropbear keys without a .pub we need to fall back and execute the -y command to extract a pubkey from a private.

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

luci-app-sshtunnel: ssh_keys: list keys without a corresponding .pub

The private keys doesn't have any extension so the only way to clearly say that this file is a key is a presence of the corresponding .pub file.
Most of time key files have a prefix id_ e.g. id_rsa etc.

The dropbearkey generates a key without a corresponding .pub file e.g. id_dropbearkey.

So we need to detect a key files by both .pub file or id_ prefix.
Key files without the id_ prefix won't be listed, sorry.

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

luci-app-sshtunnel: generate a new key

Make the Generate a new key as a separate section and move to bottom.
Extend the key name pattern to be an email address so allow symbols @ - +.
Force the id_ prefix for key names.

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

luci-base: comment fixes (sp)

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

treewide: Backport from master and sync translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-proto-ipv6: Add DHCPv6 norelease menu option (#6775)

Signed-off-by: Richard Patterson <richard@helix.net.nz>
(cherry picked from commit 4ad5f8111bc357d88390d914d82f0517ccbcf769)

luci-app-olsr: fix null pointer exception (#6778)

for some 'virtual' interfaces, there don't seem to be network status information

Signed-off-by: Andreas Bräu <ab@andi95.de>
(cherry picked from commit 87da3275eaf7a388e77ad137e09b3bf6d3cf97f3)

luci-app-statistics: lookup -> look up

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

luci-app-openvpn: Add multihome boolean.

Helps when you have multiple IP(v4|v6)

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

luci-mod-network: reword some help-strings

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

luci-mod-network: reword some help-strings

also unburden translators from some static strings.

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

luci-mod-network: reword some help-strings

also unburden translators from some static strings.

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

Revert "Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan"

This reverts commit 6fb71d48a051467c5cc54453cd74df992e9c9e65.

(Not yet ready)

treewide: Backport and sync i18n translations

Backport from master and sync i18n translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6755 from EvanTheB/modemaster

Signed-off-by: Evan Benn <evan.benn@morsemicro.com>
luci-base: Display 'Access Point' in the wireless page instead of 'Master'
(cherry picked from commit c3fc80c92a2ed30214ed039c6189e2c06023117a)

Merge pull request #6723 from knarrff/channel_analysis__base-channel

Signed-off-by: Frank Löffler <frank.loeffler@uni-jena.de>
luci-mod-status: highlight primary 20 MHz channel
(cherry picked from commit 8b651996ff25cff94cf37608d775f0cbf7fd177a)

Merge pull request #6724 from erikrk/channel-analysis-permissions

Signed-off-by: Erik Karlsson <erik.karlsson@genexis.eu>
luci-mod-status: fix ACL for channel analysis
(cherry picked from commit 8be149c4adddc05354b009e1d0597b2ae6fd7532)

Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan

Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
luci-app-strongswan-swanctl: initial commit
(cherry picked from commit 828716ad73be81079ffdaa1592f637efa1747f31)

Merge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: remove instance selection

luci-app-adblock-fast: bugfix: remove instance selection for some smartdns options

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

Merge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast

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

luci-app-adblock-fast: update to 1.1.1-1

* Final (hopefully) attempt to avoid errors if dhcp/smartdns configs are
  missing
* New user experience for picking dnsmasq/smartdns instances to enable the
  adblocking on
* use function from init script to set up output paths
* update paths to run-time files in ACL

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

luci-app-ddns: rename retry_count -> retry_max_count

syncs with openwrt/packages@e3292e4

Also fixes some i18n strings

Closes issue #6752

(cherry picked from commit d349181aaef50e7a545d784176e55f5dc70fabff)

Merge pull request #6763 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: update to 2023-10-25-5

luci-app-https-dns-proxy: update to 2023-10-25-5

* no longer "require uci" in js files
* use L.resolveDefault when loading configs
* improve DNSMASQ config update selection user experience
* switch from uci.get to L.uci.get
* small code improvement of RPCD script

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

Merge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

* create UI elements with an option to pick multiple instances for
  dnsmasq and smartdns

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