Merge pull request #6574 from innovara/patch-1

Fix ATM HEC label on stats.js

(cherry picked from commit 1e84a03932455e79880e10abc88b92343db8d811)

Adding a DNS option to the wireguard peer config generator.
Some clients like iOS require this explicitly, and so this change
adds the appropriate config with some sensible defaults.

Closes #6351

Signed-off-by: Nicholaos Mouzourakis <nevumx@gmail.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 990696d73f982de015df7c7d552daef1a03f50c5)
(cherry picked from commit 5b26887c52097dc9364c9b4f4dfb2d6ba2f08818)

Merge pull request #6352 from nevumx/add-wireguard-peer-addresses-config

luci-proto-wireguard: adding an Addresses option to the wireguard peer config generator
(cherry picked from commit 9d746c75f4023bf3c4bcfe77eaa394fbf0188d95)

luci-proto-sstp: add support for custom port (#6634)

Add support for connecting to a custom SSTP port.
See also: https://github.com/openwrt/packages/pull/22405

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 85ad07c59ee3ab82ac5b55732201d17e6cc3ab9c)

luci-app-example: Update with more documentation, more examples (#6503)

* luci-app-example: Update with more documentation, examples
* Update translations file
* Move more YAML support to .md file, improve README
* luci-app-example: Update with more documentation, examples
* luci-app-example: Fix missed call to load_sample_yaml
* Format with tabs by using jsbeautify

(cherry picked from commit 28f805b2e5f95e04515bd7d045a103cc3a366c2c)

luci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)

Quality of life improvements. Reduce click amounts.
LuCI batches all changes for user-review anyway.

Tested on 23.05.0

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

luci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)

* luci-lib-nixio: Fix add_luci_conffiles adding duplicate files

add_luci_conffiles does not check whether the file already exists
when adding the file, which may result in redundant backups in the
sysupgrade backup.

Signed-off-by: Xiang W <wxjstz@126.com>
(cherry picked from commit c2f679962ddf7f6545adacfcf3068370825c43a9)

luci-app-tor: Manage tor-hs onion services (#6476)

* luci-app-tor: Manage Onion services (tor-hs)

The tor-hs packages provides Tor Onion (Hidden) Services.
This is a good option to bypass NAT and have stable access to a router.

Later once the main Tor package gains a support of a Proxy/Bridge configuration.
We can add this to the same luci app as a different view.

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

New app: luci-app-sshtunnel for SSH tunnels (#6424)

* luci-app-sshtunnel: SSH tunnels

The app helps to configure SSH tunnels.
You can also generate an SSH key and see known hosts.

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

luci-app-statistics: regenerate graphs on window resize

Currently graphs are redrawn only based on the refresh interval
(never or every 5/30/60 seconds).
Since the image size is calculated based on the window size,
redraw graphs (once) also after resizing the window.
This also captures window resize due to orientation change
(e.g., for mobile).
Since multiple resize events are fired when dragging the window
border, there is a 250ms delay for debouncing.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 8fcd52f5130acd1a0738ff47f9bba2c9cc42e662)

Merge pull request #6642 from vgaetera/dnsmasq-network-select

luci-mod-network: use network selector for dnsmasq instances
(cherry picked from commit aa1e049f3600f68cf2f52d8a1eb092155bfe8d8a)

Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview

luci-app-dockerman: hide config buttons in overview page
(cherry picked from commit 568b44edb3bf545e424e7c1a3f162e753b190113)

Merge pull request #6525 from hingbong/issue-6524

luci-app-unbound: dns assist in zone-detail add 'unprotected-loop' option #6524
(cherry picked from commit e3466bd83be36bc1d62257fac3e1635fe18133ba)

Merge pull request #6734 from felagund/patch-1

 luci-mod-network: Update wireless.js to clarify Distance Optimization

(cherry picked from commit 647019cc160c394800db32ce82895245adc302ee)

Merge pull request #6711 from systemcrash/dns_nitpick

luci-mod-network: nitpick of CNAME, MX, SRV syntax formatting
(cherry picked from commit d179d789e5f0542fd17eb2fd591909754c200d86)

Merge pull request #6712 from systemcrash/discard_text

luci-mod-network: Extend helptext for RFC1918 rebind_protection
(cherry picked from commit d75626efcdf322a2c16559c11d5a53bab6dbd8a3)

Merge pull request #6706 from vgaetera/fw-redirect-any

luci-app-firewall: allow redirects using ip family any
(cherry picked from commit 3633bea613d47a04053f0ed4d117629d8d7b7fbe)

Merge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields

luci-mod-network: Fix 'instances' fields for dnsmasq dhcp config entries
(cherry picked from commit d353bc50cd45bd0863170a0fa2f4e474405f8354)

Merge pull request #6400 from vintas/patch-2

docs: fix Client side JS API docs link
(cherry picked from commit 6ddbb30ac360393a69bfc4c0566b32bd23d9bcd0)

Merge pull request #6386 from egc112/egc112-openvpn-advanced-lua

openvpn-advanced.lua request to add OpenVPN data-ciphers

(cherry picked from commit 1c5ebc2a0c635130bd4f86f65dce29a686eb24c4)

Merge pull request #6296 from jjm2473/patch-2

luci-theme-bootstrap: set scroll-margin-top for all elements
(cherry picked from commit 16470a0ab89c7bcde66e9ce7334d8e4d0a4265d0)

Merge pull request #6295 from jjm2473/patch-1

luci-mod-status: fix iptables jump on argon theme
(cherry picked from commit 706668243b8617d5c5529ac76e54f84dc57203e3)

Merge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer

luci-app-crowdsec-firewall-bouncer: new app
(cherry picked from commit dd3f5c65470c62ae977de047e975138195bf45e6)

luci-app-crowdsec-firewall-bouncer: add newline correction

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

Merge pull request #5631 from coudu/luci-app-nut-fixes

luci-app-nut: nut-monitor fixes
(cherry picked from commit 51a7e0b8e8db3709feccfa83176ae77372b2b1e7)

Merge pull request #5520 from acooler15/luci-lib-docker

luci-lib-docker: fix chunked decode
(cherry picked from commit 4ade6bd04c6fb29203ade9cb44ecd37ab465a2d6)

luci-proto-modemmanager: Added logging level option and debugmode

Merge github.com:valexi7/luci PR #4328

Signed-off-by: Paul Donald <newtwen@gmail.com>
Signed-off-by: valexi7 <44439515+valexi7@users.noreply.github.com>
(cherry picked from commit 1731fe12b512e10b9c061114d348cd4872422c7a)

Merge pull request #6689 from yggdrasil-openwrt/yggdrasil-2023-11-11

luci-proto-yggdrasil: yggdrasil now supported by netifd
(cherry picked from commit ab3f8254753d18935b1f6d8d015709613b3990a1)

Merge pull request #6690 from yggdrasil-openwrt/rip-luci-app-yggdrasil

luci-app-yggdrasil: remove package in favor of luci-proto-yggdrasil
(cherry picked from commit 8b57cf00120d853318ad2f4f25a196a805f9714d)

Luci-app-usteer: First version of luci-app-usteer

Signed-off-by: Ramon Van Gorkom <github@flightfoil.com>
[most trailing whitespace errors removed]
(cherry picked from commit a6753d44e7bcff305f789e182031fb5f089a8836)

luci-proto-external: migrate from support to cni-protocol to external-protocol

As previously introduced cni protocol support (for netifd) has evolved more
to a multipurpose protocol useful for cni/netavark/some vpn/etc connections
I have decided to rename it from cni-protocol to external-protocol.

That's why also it's luci companion, luci-proto-cni, should be renamed
to luci-proto-external and migrated to support external-protocol.

This patch also adds support for new option in external-protocol, delay.

This closes promise made in #22702 on openwrt packages repository.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 0dd348c87f590861c252194b1720921d8779b4a1)

Merge pull request #6626 from oskarirauta/luci-cni-protocol

luci-proto-cni: protocol update
(cherry picked from commit 88d1893b9c21ce716d9bec4c40f6c9720becf220)

Merge pull request #6719 from Moondarker/advanced-reboot-ver-bump

luci-app-advanced-reboot: bump version number due to changes in code
(cherry picked from commit 6f709303708e70cffff4ec6fd621df97325594bc)

Merge pull request #6715 from systemcrash/32to64hostid

Merge pull request #6709 from Moondarker/mr90x-advanced-reboot

luci-app-advanced-reboot: add support for Mercusys MR90X v1

Merge pull request #6707 from ElbertMai/fix_vxlan6_ui

Merge pull request #6698 from vgaetera/route-defaults-fix

luci-mod-network: fix route defaults

treewide: Backport translations from master and sync

Backport translations from master.
Sync translations.

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

luci-app-travelmate: typo fix

* fixed an encryption description typo in the wireless stations overview

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

luci-mod-network: wireless.js: allow bridges for radius vlan tagged ifaces

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

luci-app-vnstat2: use more efficient way to get database interfaces

The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 3ac4f567dfdfd6ee989ceffb025241e605790b6d)

luci-mod-status: nftables.js: fix translation of iif expression

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

luci-app-dawn: error message when service not running

Display a nicer error message when the DAWN service is not running

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit 69eeebe23d60736c1d4436162444f7b9c53de3ed)

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

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

luci-app-adblock-fast: sync version with principal package

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

luci-app-statistics: harden sysupgrade_backup

Remove sysupgrade_backup from help.  Also have it check parameters.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 55e0f28b1ec2f86068d1dad9915641e3fb22afbf)

luci-app-statistics: cleanups of bad spacing

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 465bfe24fa89703d073e6830a36a5e8eedc8e4b0)

luci-app-statistics: Add backup/restore for RRD statistics

Add a backup/restore capability for rrd data storage in
luci_statistics.  The data storage is typically in /tmp and does not
survive reboot or sysupgrade.  This adds an option for the
administrator to configure the RRD plugin, so that the RRD data are
are preserved with a backup copy in the overlay file system.

This works for shutdown/reboot, sysupgrade (backup config files,
restore config files, and true sysupgrade).

Also fix a bug where starting luci_statistics for the first time would
not get a restart a running collectd: during install of the package
when it is not included in the base flashed image, collectd might be
started when it got installed/configured before this package gets
installed/configured.  So we need to check if it's running, and
restart it to use the luci_statistics configuration.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit ad98af3a2be6c87b1f36cec05c8c3529831b7787)

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

[23.05] luci-app-adblock-fast: sync with adblock-fast 1.0.1-1

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

* add the new logfile location option
* sync translations

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

luci-mod-network: add missing `throw` route type

Ref: https://forum.openwrt.org/t/x/177040
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b423b4bbcf21d60fd32239699941249ed9c8b7aa)

luci-app-adblock-fast: sync with adblock-fast 1.0.1-1

* improve error/warning/status messaging
* trim rpcd script code from functions shared with principal package
* depends on https://github.com/openwrt/packages/pull/22619

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

luci-lib-ip: fix creating address instances from integers

Ensure that the proper byte order is used when creating IPv4/IPv6/MAC
instances from integer values on big endian systems.

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

luci-app-opkg: fix sorting by size column

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

luci-app-dawn: Bug fixes for JavaScript implementation

Some bug fixes and a small improvements that were discovered after the
initial implementation of the JavaScript version of luci-app-dawn:

* Correctly show multiple APs per client in the hearing map
* Display correct name of all APs in the hearing map
* Show if client is connected to the network in the hearing map. This
  replaces the column for Stations Connected, which is not a property
  of a client but of an AP, and is available still in the network overview.
* Display both hostname and MAC address for clients/APs
* Convert spaces to tabs in dawn-common.js for consistency

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit e8029b08287c666a43d5ef25c7ea83ce7d606903)

luci-mod-status: 29_ports.js: mute zone colors for disconnected ports

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

treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-mod-network: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit d48979217c0b521d0e9d97090cf26c8e7941fa54)

luci-app-siitwizard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 28e7201bcb547fed70c0b3dd9c64fe88d6d37d78)

luci-proto-wireguard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 992cca55ae3d6599d177bdb3b9bfc2b679c650e5)

luci-app-attendedsysupgrade: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 987ae1abb86528e6acf6f80a418af6c49c7e2ea4)

luci-app-statistics: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit d34e052811f23cb191a38a2170166a7d5e84a5c9)

luci-mod-system: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 677da57a28f10428eb99488afef8e068614d4ea6)

luci-base: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 2c3018d426e7a8afe06b529075aa43df2f8096f8)

luci-app-minidlna: move album covers to advanced tab

Also remove o.default = o.enabled

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

luci-app-dockerman: fix stats page always blank

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 0fbbed4a84fb49c968e3ad8a5b76bbf332f42f5c)

luci-app-dockerman: fix typos

useage > usage

Signed-off-by: Felix Baumann <felix.bau@gmx.de>
(cherry picked from commit 6afe7d91e5ae22008314de46e65310c9cf660edc)

luci-app-pagekitec: add missing ACL rules

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

luci-mod-network: Static Leases improvements

Under DHCP and DNS, Static Leases tab:
Add extra fields and booleans
Add 'ignore' value for ip field
Add description text for fields
Enable wildcards in mac addresses

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit f73abffa2aa64a91e6c16ddae7966a5c35e73fe1)

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix tag

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix var name

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js use load for script & fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix view

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js fix view

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js
(cherry picked from commit 00cfca13b5cd01ee86194e3f859b81e1db475b8a)

luci-theme-openwrt-2020: import bootstrap radio/checkbox styling rules

Import the radio and checkbox styling rules from the default Bootstrap
theme and adapt colors and margins to the OpenWrt 2020 one.

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

luci-app-firewall: missing variable declaration

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

luci-base: ui.js: set `autocomplete="new-password"` for password fields

Attempt to prevent Firefox from randomly filling nonesense into arbitrary
password fields such as the WireGuard private key field by setting the
`autocomplete="new-password"` attribute on any password type fields.

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

luci-mod-dashboard: hide wireless pane when there are no radios

Implements feature request #4472.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
(cherry picked from commit b5836cd8252866a5d8993511bcd920b2bd3afe06)

luci-mod-status: improve channel graph for 5GHz radio

Improve channel graph for 5GHz radio by using dotted lines to identify
the intermediate channel, full line to identify the different channel
band and bold line to identify the different section of the wifi
channels.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 69a8e4a98dd71ca7315684debc8e98eb273b03ef)

luci-mod-status: fix wrong position of channel for 5GHz radio

Channel tag for 5GHz radios is wrong and is confusing for any user
that wants to better identify the used channel from the graph.

Add some additional logic to better position the channel tag.

Fixes: #6419
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 6d722ccdaeede14b9f42643176522bbb4f75e89c)

luci-mod-status: channel_analysis.js: fix stale scan result.

When the new result is empty, including when another scan is running in the background, the table was emptied, but the graph persisted.
With this change, the list will persist and missing APs will be shown faded.

Signed-off-by: Milad Mohtashamirad <miladmohtashamirad@gmail.com>
(cherry picked from commit 03f16840593c2b4db0628bcdce4ebd2956723e03)

luci-app-firewall: cleaning up outdated instructions on hardware NAT

(cherry picked from commit 5d1e58166386194dc0156f0c2d1bec5cd2415b13)

luci-mod-network: wireless.js: remove form reset button

The form reset button on the wireless page has no function as no input
field is present outside of modal configuration views, so drop it to
avoid confusion.

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

luci-mod-status: fix iptables not showing comments

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 2ca117c5a6a5c1cd047272548e53435c4d3adebc)

luci-theme-bootstrap: better readability in System Log/Kernel Log.

Signed-off-by: Kristian Skramstad <kristian+github@83.no>
(cherry picked from commit 04d9820f1746ff2a2c19a0e590b80baa830ad4d7)

luci-proto-wireguard: Escape IPv6 endpoints with [] in generated wireguard config

Signed-off-by: Jonathan Duncan <JonathanDuncan@gmail.com>
(cherry picked from commit 527453ff4851a0594f804aa2c572e820706827c8)

luci-app-ksmbd: add UI for multiple interfaces

/etc/config/ksmbd supports multiple interfaces (in config globals->
option interface) but the current UI only supports selecting a single
one. This patch adds support for selecting multiple interfaces, based on
how luci-app-samba4 does it.

Closes: #6620
Suggested-by: @AndroKev
Signed-off-by: Rani Hod <rani.hod@gmail.com>
(cherry picked from commit 55643d2075ee6cc4b6c4e16dd8e45b9899fe02fb)

luci-mod-network: rework DHCP relay settings

 - Drop completely bogus 'ID' option, it's not handled by anything
 - Clarify relay from / relay to / accept from options

Fixes: #6639
Fixes: a627744bb5 ("luci-mod-network: 'relay' tab added")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 88326b809ba9388a1b11b1c4226ccb07e5911261)

luci-mod-status: 29_ports.js: handle devices without speed indication

Use carrier state to distinguish connected/no link states and simply
print "Connected" if no speed indication is available.

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

luci-mod-status: protect against infinite recursion in port status

When attempting to resolve VLAN devices, protect against potential deep
recursion due to invalid bridge configs referencing themselves.

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

luci-mod-status: add ACL to allow access to getBuiltinEthernetPorts

Fixes: ed059e4cd3 ("luci-mod-status: 29_ports.js: attempt to use getBuiltinEthernetPorts")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 575ce5512df534b52185af877d26192adde6a9b5)

Merge pull request #6665 from andibraeu/openwrt-23.05

[23.05] luci-app-olsr-services: change menu order

Merge pull request #6669 from Ayushmanwebdeveloper/openwrt-23.05

[23.05] luci-app-olsr: change menu order and improve etx display for neighbours status view

luci-app-olsr: change menu order and improve etx display for neighbours status view

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-mod-network: relax RA server mode requirements

Allow RA server mode on all but some known incompatible interface protocols.

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

luci-app-firewall: fix german SNAT traqnslation entry

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

luci-app-olsr-services: change menu order

Signed-off-by: Andi Bräu <ab@andi95.de>

luci-app-dawn: Implement in JavaScript

This commit re-implements luci-app-dawn in JavaScript, removing the older
lua implementation. Besides a 1-to-1 port, there are some
changes/improvements:

* In both the network overview and the hearing map, replace MAC addresses
  by host name if known.
* In the hearing map, the table is sortable. If the same client is
  connected to multiple access points/frequencies the MAC/host name is
  listed twice, whereas in the lua implementation the second MAC address
  was empty to show it was referring to the same client. This means the
  table can be sorted on any column, and the information remains correct.
* The view in the network overview is a bit different. This table is not
  sortable, because LuCi doesn't seem to like a table inside a table for
  sorting.
* Align the column names between the network overview and the hearing
  table.
* Add tooltips for abbreviations in column names.

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit ea8c0aa2a1a1ff9f29ffd452049a7b749298ed17)
[apply latest Makefile changes that did not get backported to 23.05]
Signed-off-by: Nick Hainke <vincent@systemli.org>

luci-app-travelmate: fix ACL typo

* fix long standing ACL path typo

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

luci-app-travelmate: sync with travelmate 2.1.1

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

treewide: Backport i18n translations from master

Sync and backport translations.

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

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

[23.05] luci-app-https-dns-proxy: add status->overview include file

luci-app-https-dns-proxy: add status->overview include file

* add status->overview include file
* sync version to principal package
* minor code formatting/styling fixes for js files
* improve HTTP/2 and HTTP/3 detection in RPCD script

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

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

[23.05] luci-app-adblock-fast: bugfix: localizable entries in overview

luci-app-adblock-fast: bugfix: localizable entries in overview

* bugfix: localizable entries in overview
* update grammar/naming for buttons
* prepare for pause button
* add status include file to show service status

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