Stan Grishin [Mon, 13 Nov 2023 21:44:46 +0000 (14:44 -0700)]
Merge pull request #6693 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: sync version with principal package
Stan Grishin [Mon, 13 Nov 2023 10:06:28 +0000 (10:06 +0000)]
luci-app-adblock-fast: sync version with principal package
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
69eff2535ed25e55f2c62450790f4abd64710e42)
John Kohl [Sat, 11 Nov 2023 16:19:58 +0000 (11:19 -0500)]
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)
John Kohl [Sat, 11 Nov 2023 02:11:02 +0000 (21:11 -0500)]
luci-app-statistics: cleanups of bad spacing
Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit
465bfe24fa89703d073e6830a36a5e8eedc8e4b0)
John Kohl [Sat, 11 Nov 2023 11:15:16 +0000 (13:15 +0200)]
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)
Stan Grishin [Fri, 10 Nov 2023 19:48:42 +0000 (12:48 -0700)]
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
Dirk Brenken [Fri, 10 Nov 2023 18:12:40 +0000 (19:12 +0100)]
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>
Jo-Philipp Wich [Thu, 9 Nov 2023 15:32:54 +0000 (16:32 +0100)]
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)
Stan Grishin [Wed, 8 Nov 2023 10:01:15 +0000 (10:01 +0000)]
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)
Jo-Philipp Wich [Tue, 7 Nov 2023 21:59:08 +0000 (22:59 +0100)]
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)
Jo-Philipp Wich [Tue, 7 Nov 2023 20:59:25 +0000 (21:59 +0100)]
luci-app-opkg: fix sorting by size column
Fixes: #6120
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
63e5d38db02fa18dd471e974d1410a454e0aa086)
Daniel Vijge [Sun, 5 Nov 2023 20:17:33 +0000 (21:17 +0100)]
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)
Jo-Philipp Wich [Thu, 2 Nov 2023 14:29:16 +0000 (15:29 +0100)]
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)
Jo-Philipp Wich [Thu, 2 Nov 2023 11:05:43 +0000 (12:05 +0100)]
treewide: sync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Paul Dee [Fri, 11 Aug 2023 11:34:45 +0000 (13:34 +0200)]
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)
Paul Dee [Sat, 5 Aug 2023 00:09:22 +0000 (02:09 +0200)]
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)
Paul Dee [Fri, 11 Aug 2023 11:12:26 +0000 (13:12 +0200)]
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)
Paul Dee [Sat, 5 Aug 2023 00:04:17 +0000 (02:04 +0200)]
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)
Paul Dee [Fri, 11 Aug 2023 11:09:17 +0000 (13:09 +0200)]
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)
Paul Dee [Sat, 5 Aug 2023 00:16:31 +0000 (02:16 +0200)]
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)
Paul Dee [Sat, 5 Aug 2023 00:16:07 +0000 (02:16 +0200)]
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)
Sergey Ponomarev [Fri, 8 Sep 2023 09:31:54 +0000 (12:31 +0300)]
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)
Liangbin Lian [Thu, 26 Oct 2023 11:48:49 +0000 (19:48 +0800)]
luci-app-dockerman: fix stats page always blank
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit
0fbbed4a84fb49c968e3ad8a5b76bbf332f42f5c)
Felix Baumann [Sat, 2 Sep 2023 22:49:55 +0000 (00:49 +0200)]
luci-app-dockerman: fix typos
useage > usage
Signed-off-by: Felix Baumann <felix.bau@gmx.de>
(cherry picked from commit
6afe7d91e5ae22008314de46e65310c9cf660edc)
Jo-Philipp Wich [Thu, 19 Oct 2023 22:31:50 +0000 (00:31 +0200)]
luci-app-pagekitec: add missing ACL rules
Fixes: #6615
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9b545a370be764351d1fde9bdde5a12deebf7f57)
Paul Dee [Tue, 1 Aug 2023 22:54:32 +0000 (00:54 +0200)]
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)
Ayushman Tripathi [Thu, 13 Jul 2023 06:19:43 +0000 (11:49 +0530)]
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)
Jo-Philipp Wich [Wed, 26 Jul 2023 13:46:06 +0000 (15:46 +0200)]
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)
Sergey Ponomarev [Sat, 10 Jun 2023 18:51:09 +0000 (21:51 +0300)]
luci-app-firewall: missing variable declaration
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit
b5ba9c3741d7e554463035e623b7d7e52c84d1fb)
Jo-Philipp Wich [Wed, 7 Jun 2023 21:40:04 +0000 (23:40 +0200)]
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)
Rani Hod [Thu, 13 Apr 2023 08:45:03 +0000 (11:45 +0300)]
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)
Christian Marangi [Sun, 30 Jul 2023 21:03:20 +0000 (23:03 +0200)]
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)
Christian Marangi [Sun, 30 Jul 2023 20:58:57 +0000 (22:58 +0200)]
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)
Milad Mohtashamirad [Fri, 7 Jul 2023 01:14:28 +0000 (11:14 +1000)]
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)
清靈語 [Mon, 31 Jul 2023 05:01:29 +0000 (13:01 +0800)]
luci-app-firewall: cleaning up outdated instructions on hardware NAT
(cherry picked from commit
5d1e58166386194dc0156f0c2d1bec5cd2415b13)
Jo-Philipp Wich [Fri, 11 Aug 2023 23:39:25 +0000 (01:39 +0200)]
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)
Liangbin Lian [Tue, 5 Sep 2023 06:26:33 +0000 (14:26 +0800)]
luci-mod-status: fix iptables not showing comments
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit
2ca117c5a6a5c1cd047272548e53435c4d3adebc)
Kristian Skramstad [Wed, 6 Sep 2023 20:16:12 +0000 (22:16 +0200)]
luci-theme-bootstrap: better readability in System Log/Kernel Log.
Signed-off-by: Kristian Skramstad <kristian+github@83.no>
(cherry picked from commit
04d9820f1746ff2a2c19a0e590b80baa830ad4d7)
Jonathan Duncan [Sun, 24 Sep 2023 15:16:35 +0000 (16:16 +0100)]
luci-proto-wireguard: Escape IPv6 endpoints with [] in generated wireguard config
Signed-off-by: Jonathan Duncan <JonathanDuncan@gmail.com>
(cherry picked from commit
527453ff4851a0594f804aa2c572e820706827c8)
Rani Hod [Tue, 10 Oct 2023 11:48:22 +0000 (14:48 +0300)]
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)
Jo-Philipp Wich [Thu, 19 Oct 2023 22:25:39 +0000 (00:25 +0200)]
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)
Jo-Philipp Wich [Tue, 31 Oct 2023 22:53:25 +0000 (23:53 +0100)]
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)
Jo-Philipp Wich [Wed, 25 Oct 2023 21:16:13 +0000 (23:16 +0200)]
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)
Jo-Philipp Wich [Wed, 25 Oct 2023 21:15:16 +0000 (23:15 +0200)]
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)
Jo-Philipp Wich [Wed, 1 Nov 2023 10:39:12 +0000 (11:39 +0100)]
Merge pull request #6665 from andibraeu/openwrt-23.05
[23.05] luci-app-olsr-services: change menu order
Jo-Philipp Wich [Wed, 1 Nov 2023 10:38:49 +0000 (11:38 +0100)]
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
Ayushman Tripathi [Wed, 1 Nov 2023 09:54:35 +0000 (15:24 +0530)]
luci-app-olsr: change menu order and improve etx display for neighbours status view
Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
Jo-Philipp Wich [Tue, 31 Oct 2023 23:48:59 +0000 (00:48 +0100)]
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)
Jo-Philipp Wich [Tue, 31 Oct 2023 23:07:51 +0000 (00:07 +0100)]
luci-app-firewall: fix german SNAT traqnslation entry
Fixes: #6666
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
da202240bf48e6953fb1ec9f715da1408b734a5c)
Andi Bräu [Sun, 29 Oct 2023 10:32:11 +0000 (11:32 +0100)]
luci-app-olsr-services: change menu order
Signed-off-by: Andi Bräu <ab@andi95.de>
Daniel Vijge [Thu, 26 Oct 2023 20:58:03 +0000 (22:58 +0200)]
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>
Dirk Brenken [Fri, 27 Oct 2023 07:22:33 +0000 (09:22 +0200)]
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)
Dirk Brenken [Mon, 30 Oct 2023 18:43:56 +0000 (19:43 +0100)]
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>
Hannu Nyman [Sat, 28 Oct 2023 15:40:12 +0000 (18:40 +0300)]
treewide: Backport i18n translations from master
Sync and backport translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Thu, 26 Oct 2023 22:09:03 +0000 (16:09 -0600)]
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
Stan Grishin [Thu, 26 Oct 2023 14:46:30 +0000 (14:46 +0000)]
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)
Stan Grishin [Thu, 26 Oct 2023 14:31:40 +0000 (08:31 -0600)]
Merge pull request #6650 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: bugfix: localizable entries in overview
Stan Grishin [Wed, 25 Oct 2023 21:46:57 +0000 (21:46 +0000)]
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)
Jo-Philipp Wich [Wed, 25 Oct 2023 20:35:08 +0000 (22:35 +0200)]
luci-lib-jsonc: improve handling of integral numeric values
Properly deal with integral numeric values exceeding the int32_t range
by replacing the cast logic with more fine grained checks:
- Lua numbers which are integers in the first place are directly converted
to JSON integers
- Finite double Lua numbers which are integral are converted to JSON
integer values
- All other numeric values are converted to JSON doubles
This should bring the handling of large integral value in line with the
documented behavior of turning non-fractional Lua numbers into JSON
integers.
Fixes: #6647
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
efcd4879781ee6c428b467052957534a7919d36d)
Hannu Nyman [Sat, 21 Oct 2023 09:01:24 +0000 (12:01 +0300)]
luci-app-statistics: memory: make hiding 'free' configurable
Make hiding the 'free' memory configurable.
Set default as disabled, shown in graph which always scales to 100%.
If enabled, the graph scales to actually used memory,
which enables a more detailed view to memory usage.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
08540c44629ad0fedf5feb2b535c2df182ac3973)
Carsten Spieß [Wed, 23 Aug 2023 10:17:31 +0000 (12:17 +0200)]
luci-app-statistics: missing sensor types added
Added missing graphs for voltage, current, power and fanspeed sensors.
No new or modified translation strings.
Signed-off-by: Carsten Spieß <mail@carsten-spiess.de>
(cherry picked from commit
8262352fe35505909e8fe3f981da039389a6ccc7)
Jo-Philipp Wich [Thu, 19 Oct 2023 21:44:53 +0000 (23:44 +0200)]
luci-mod-status: persist sorting of DHCP lease status tables
Add an ID attribute to the dynamically generated lease status tables to
persist row ordering choice across reloads.
Fixes: #6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
603992560c5ca4b5929047e8e8c70f901f75d7f7)
Jo-Philipp Wich [Thu, 19 Oct 2023 21:42:13 +0000 (23:42 +0200)]
luci-base: ui.js: sorting fixes for tables initialized from markup
- Populate id option from table id attribute
- Update column head sort indicator in UITable.update()
- Don't store sort state for tables without id
Ref: https://github.com/openwrt/luci/issues/6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ee6a4da00b70949eccb5a0a7b69d2c5b98ef1f89)
Jo-Philipp Wich [Thu, 12 Oct 2023 07:38:46 +0000 (09:38 +0200)]
firewall: ipsets.js: validate set names
Ensure that user supplied set name values conform to the nftables identifier
syntax constraints.
Fixes: #6633
Fixes: 0484343903 ("luci-app-firewall: implement IPsets GUI")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
755edf6fbf65fa2f6b778e7edfd8b56fd1742f70)
Paul Dee [Wed, 30 Aug 2023 20:34:25 +0000 (22:34 +0200)]
luci-network-interfaces: Add IPv6 lifetime options
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
598b1eb272a39a36c37d00463b089260d8167ccb)
Hannu Nyman [Sun, 8 Oct 2023 15:03:49 +0000 (18:03 +0300)]
treewide: Backport translations from master
Backport from master and sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Fri, 6 Oct 2023 22:42:51 +0000 (16:42 -0600)]
Merge pull request #6622 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: bugfix: working re-download
Dirk Brenken [Fri, 6 Oct 2023 14:29:14 +0000 (16:29 +0200)]
luci-app-banip: fix last, incomplete commit
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
127ca64a672ba4b748ea230cce79b0c4cc1c8207)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 6 Oct 2023 14:25:43 +0000 (16:25 +0200)]
luci-app-banip: sync with banIP-0.9.1
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
71de98eea77f567f81da411595990997ea324bc0)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Sergey Ponomarev [Thu, 31 Aug 2023 09:00:51 +0000 (12:00 +0300)]
luci-app-banip: Remove unused unspecified option
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit
737619f8b27483a3ad4975a2008beef27157dd04)
Stan Grishin [Thu, 5 Oct 2023 14:55:29 +0000 (14:55 +0000)]
luci-app-adblock-fast: bugfix: working re-download
* bugfix: add missing dl command to RPCD script
* improve output of error messages/link to README
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
d15a1fb6939684583b327f7388a1473c7d49841d)
Stan Grishin [Fri, 29 Sep 2023 18:00:24 +0000 (12:00 -0600)]
Merge pull request #6604 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: update to 1.0.0-4
Stan Grishin [Thu, 28 Sep 2023 21:28:51 +0000 (21:28 +0000)]
luci-app-adblock-fast: update to 1.0.0-4
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
4a40a7ad72777d0e8c03c1b8c7249f2cc6cfb770)
Stan Grishin [Thu, 28 Sep 2023 03:36:00 +0000 (21:36 -0600)]
Merge pull request #6599 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: update to 1.0.0-3
Stan Grishin [Tue, 26 Sep 2023 22:54:37 +0000 (22:54 +0000)]
luci-app-adblock-fast: update to 1.0.0-3
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
8d502df1b0951c415b236ccfd7a3b8ae104b765f)
Hannu Nyman [Sat, 9 Sep 2023 07:19:29 +0000 (10:19 +0300)]
treewide: Backport translations and sync
Backport translations from master and sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Mon, 4 Sep 2023 01:04:35 +0000 (18:04 -0700)]
Merge pull request #6558 from stangri/openwrt-23.05-luci-app-adblock-fast
[23.05] luci-app-adblock-fast: initial commit
Stan Grishin [Mon, 4 Sep 2023 01:03:52 +0000 (18:03 -0700)]
Merge pull request #6560 from stangri/openwrt-23.05-luci-app-https-dns-proxy
[23.05] luci-app-https-dns-proxy: rewrite in javascript
Stan Grishin [Tue, 29 Aug 2023 18:42:10 +0000 (18:42 +0000)]
luci-app-https-dns-proxy: rewrite in javascript
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
6df7b92a50485d7a7c61c38c5abeaf96ad69a28c)
Stan Grishin [Mon, 28 Aug 2023 21:30:42 +0000 (21:30 +0000)]
luci-app-adblock-fast: initial commit
* Depends on https://github.com/openwrt/packages/pull/21943
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
81fc75739c13881ba339d02017ec3a5d2a32948d)
Florian Eckert [Fri, 1 Sep 2023 07:51:21 +0000 (09:51 +0200)]
luci-proto-modemmanager: also allow none for preferredmode config option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
3f2320e0aa140d6e59dedeca97a523e0be4a399b)
Florian Eckert [Thu, 17 Aug 2023 13:25:00 +0000 (15:25 +0200)]
luci-proto-modemmanger: register missing error codes
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
818bf22b8b7e78216cfec2eb6d73694c02618ec7)
Florian Eckert [Thu, 17 Aug 2023 13:19:11 +0000 (15:19 +0200)]
luci-proto-modemmanager: delete removed error codes
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
1e6f52ac69239491e58fb0615100b912719db8f6)
Florian Eckert [Wed, 9 Aug 2023 11:48:33 +0000 (13:48 +0200)]
luci-proto-modemmanager: add allowed and preferred mode
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
5b925ea92b2d3a2f068f9835e533c8cfd86c427a)
Ayushman Tripathi [Sun, 25 Jun 2023 19:53:48 +0000 (01:23 +0530)]
luci-app-olsr: migrate to js
Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io> [fixup commit message]
(cherry picked from commit
ebd09332b4330001ecd3a86d1b379e0afc3bafee)
Jo-Philipp Wich [Thu, 24 Aug 2023 14:46:02 +0000 (16:46 +0200)]
luci-mod-status: 29_ports.js: attempt to use getBuiltinEthernetPorts
Try to use the new luci/getBuiltinEthernetPorts RPC call to enumerate known
ports and fall back to manual board.json parsing if the call is unavailable
yet. The fallback code will be dropped in a while when everything settled.
Ref: #6534, #6538
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ed059e4cd3ee9b15aabcc974b4e66b0090b920ae)
Jo-Philipp Wich [Thu, 24 Aug 2023 14:44:40 +0000 (16:44 +0200)]
luci-base: rpc: add call to enumerate builtin ethernet ports
Add a new luci/getBuiltinEthernetPorts RPC call which returns a consolidated
list of known ethernet ports found in `/etc/board.json`.
Add an x86/64 specific workaround which attempts to enumerate missing
ethernet devices too.
Ref: #6534, #6538
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
98e37433e7f33b3e2ee751250e04b194a0aa6a0b)
Jo-Philipp Wich [Thu, 24 Aug 2023 13:01:57 +0000 (15:01 +0200)]
treewide: sync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 21 Aug 2023 14:37:11 +0000 (16:37 +0200)]
luci-base: http.uc: fix eof detection in temporary upload files
Binary string comparisons in ucode are currently unsafe, so use the
`length()` function to determine the just read data chunk size in
order to test for end of file.
Fixes: #6530
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b4594b3d111171510d2581e9f0ce30bee78bd214)
Jo-Philipp Wich [Mon, 21 Aug 2023 13:44:36 +0000 (15:44 +0200)]
luci-lua-runtime: dispatcher.lua: re-add post_on() dispatch action
Existing legacy Lua controllers still use the `post_on()` node dispatch
action, so restore this functionality.
Fixes: #6531
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
18b637fed9f58b7a3f146a004ecd5b0aef2cb058)
Jo-Philipp Wich [Mon, 21 Aug 2023 13:35:41 +0000 (15:35 +0200)]
luci-lua-runtime: dispatcher.lua: re-add test_post_security()
While no LuCI code utilizes this function anymore, some existing legacy
Lua controllers expect the function to exist, so restore it.
Fixes: #6532
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2fd74a8239c3986bb2e741e907b2a90f2833f073)
Jo-Philipp Wich [Mon, 21 Aug 2023 08:09:34 +0000 (10:09 +0200)]
luci-mod-network: routes.js: enforce interface setting
Fixes: #6521
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a6a428fe60b6fd306bef6d0559bc1d78372b0e56)
Jo-Philipp Wich [Mon, 21 Aug 2023 07:28:18 +0000 (09:28 +0200)]
luci-base: dispatcher.uc: improve error reporting for actionless nodes
In case a - potentially auto-created, intermediate - node is requested, reply
with a clean HTTP 404 error instead of an internal assertion about an unknown
action type.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
86f04d85fc774db9cb7e60a34a50f936d8d7be23)
Jo-Philipp Wich [Mon, 21 Aug 2023 07:24:32 +0000 (09:24 +0200)]
luci-base: dispatcher.uc: satisfy auto-created intermediate nodes
When we auto-create intermediate parent nodes, make sure that those nodes
are marked as satisfied, so that it is possible to dispatch their actual
child nodes.
This aligns the behavior with the old Lua based dispatcher implementation.
Fixes: #6529
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ec8cf9e83cd4e4afdf0a00910e057a890600e8a8)
Hannu Nyman [Thu, 10 Aug 2023 17:12:27 +0000 (20:12 +0300)]
treewide: Backport and sync trasnlations
Backport from master, sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Tue, 8 Aug 2023 18:49:31 +0000 (20:49 +0200)]
ucode-mod-html: fix build with gcc 5
Older gcc versions raise a `label at end of compound statement` error due
to the empty default case. Fix the problem by adding an explicit `break`
statement.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b3d661cd84760a0cdf084a25f21556a07e369d33)
Jo-Philipp Wich [Mon, 7 Aug 2023 21:36:36 +0000 (23:36 +0200)]
luci-base: runtime.uc: fix error500() invocation on theme failure
In case no single theme could be loaded successfully, the runtime class
failed to properly invoke the `error500()` method, which is only available
through the passed environment at this point.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9763e3e9d320b5128f374117d0ff95ab8cc7f626)
Jo-Philipp Wich [Mon, 7 Aug 2023 21:33:56 +0000 (23:33 +0200)]
luci-base: dispatcher.uc: fix `N_()` fallback implementation
The fallback implementation of `N_()` accessed the wrong variable, a
global `n` instead of the local `args`. Adjust the expression to reference
the correct variable.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
107ed061a8b68f080df122770690d513f52eeed0)
Jo-Philipp Wich [Mon, 7 Aug 2023 21:29:50 +0000 (23:29 +0200)]
luci-base: dispatcher.uc: fix error500() reporting in fallback case
Fix the `error500()` fallback code path to properly output the given error
message in case rendering the error template failed.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a435d4e11a1f0701200ad392000dbaf0d0135405)
Hannu Nyman [Sat, 5 Aug 2023 16:00:34 +0000 (19:00 +0300)]
luci-mod-network: Adjust DNS/DHCP tab order
Adjust the order of tabs in the DNS/DHCP page.
Based on estimated importance of tabs
* move common (old) tabs to be earlier
* move the less frequently used (new) tabs later
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
7735bc1fdd2a98dbce15d52c1b1546d442cfcd40)