Jo-Philipp Wich [Fri, 13 Jan 2023 20:26:52 +0000 (21:26 +0100)]
luci-app-nlbwmon: validate date input
Fixes: #6188
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
7c7ac8bf0d9d554d19f5d21226110743899b8802)
Jo-Philipp Wich [Fri, 13 Jan 2023 20:16:58 +0000 (21:16 +0100)]
luci-app-openvpn: fix potential XSS in pageswitch template
Ensure to escape URL instance parameter displayed in the heading.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
25983b9fa572a640a7ecd077378df2790266cd61)
Jo-Philipp Wich [Fri, 13 Jan 2023 19:52:17 +0000 (20:52 +0100)]
luci-mod-system: fix potential stored XSS
Make sure to escape the key contents in the delete confirmation dialog.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
0186d7eae0e123a409e9919a83fdfecc7945c984)
Stan Grishin [Tue, 3 Jan 2023 20:21:18 +0000 (13:21 -0700)]
Merge pull request #6182 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: additional error messages
Stan Grishin [Tue, 3 Jan 2023 19:56:08 +0000 (19:56 +0000)]
luci-app-pbr: additional error messages
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
a748f86fec61d7c390ff0f9ee4a007fadfa936f7)
Hannu Nyman [Mon, 2 Jan 2023 19:45:19 +0000 (21:45 +0200)]
luci-app-statistics: provide defaul minimal scale for some graphs
Avoid cryptic "200m" axis items for really small values by setting
a default minimal y-axis max value for some of the conntrack, cpu,
cpufreq, load and ping graphs (mainly percentages). The axis
automatically scales upward if necessary, so this just provides
a minimal "at least" scale for the y-axis.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
d9e548fe0c619c0935926a1dfe4a8f8b9ff810a2)
Hannu Nyman [Thu, 29 Dec 2022 10:05:50 +0000 (12:05 +0200)]
luci-app-statistics: Adjust also default_timespan to 2hour
Adjust also default_timespan option to be 2hour, as that change was
forgotten in
4b49b456. (That seems to have no practical relevance, as
LuCI seems to offer the first item from the period list in any case.)
Fixes: 4b49b456 luci-app-statistics: set shortest period data/graph to 2 hours
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
3aedb609cea9df548fe8a21a0b98e3f01a801200)
Hannu Nyman [Wed, 28 Dec 2022 07:20:22 +0000 (09:20 +0200)]
treewide: Backport translations from master - i18n
Backport translations.
Sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Tue, 27 Dec 2022 19:20:36 +0000 (20:20 +0100)]
luci-base: ui.js: support div based table markup in UITable.update()
Constructing UITable instances from existing, div based markup is
supported but the UITable.update() implementation did not account
for that, leading to defunct data updates on tables built from div
based markup.
Fix this issue by extending UITable.update() to consider a div based
table structure as well, like we do in UITable.initFromMarkup() already.
Fixes: #5713
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
deed6827b2eb0b58ee8c1d810a584a9589108eac)
Richard Yu [Wed, 21 Dec 2022 10:07:06 +0000 (18:07 +0800)]
luci-app-natmap: add forward_port option and update stun_server description
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit
1a4ac922829aa8088608374a3bd7445fbf2a6f96)
Stan Grishin [Mon, 19 Dec 2022 21:09:43 +0000 (14:09 -0700)]
Merge pull request #6160 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: update to 1.0.1-1
Richard Yu [Mon, 19 Dec 2022 21:04:30 +0000 (23:04 +0200)]
luci-app-natmap: add new package
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit
cc01c0bffa9030318c39cf493c42c48d22500ec3)
Jo-Philipp Wich [Mon, 19 Dec 2022 14:29:47 +0000 (15:29 +0100)]
luci-proto-autoip: fix protocol name
Fixes: 2965e527f5 ("luci-proto-autoip: add protocol support for avahi-autoipd")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ae47caf383c6da53f2345bd225c49b875cb0d514)
Jo-Philipp Wich [Mon, 19 Dec 2022 14:28:06 +0000 (15:28 +0100)]
luci-proto-autoip: add protocol support for avahi-autoipd
Fixes: #6162
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2965e527f578abda1dc58dd540343422455be3ac)
Stan Grishin [Mon, 19 Dec 2022 03:58:01 +0000 (03:58 +0000)]
luci-app-pbr: update to 1.0.1-1
* add more error/warning messages
* better error/ubus error handling
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
54c3ba32f9a2327ca4fdb9c419fb842108b17894)
Florian Eckert [Mon, 12 Dec 2022 13:58:38 +0000 (14:58 +0100)]
luci-base: fix button handling for named sections
If more than one named section is added to the page, it is currently the
case, that the first button is always switched on or off during input
validation of the uci section name. This is because the usage of the
'document.querySelector' function is to imprecise. Changing the search
start to the element to be created, fixes this.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
440a2e79a762b4152ccb7e41c90a2826d9fb3538)
Stan Grishin [Mon, 12 Dec 2022 03:37:07 +0000 (20:37 -0700)]
Merge pull request #6143 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: Detect missing iptables & error-proofing WebUI
Stan Grishin [Mon, 12 Dec 2022 03:00:37 +0000 (03:00 +0000)]
luci-app-pbr: Detect missing iptables & error-proofing WebUI
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
f8cbfa11c6583f298f505b103c73781f6349eba8)
Paul Dee [Sun, 11 Dec 2022 13:30:02 +0000 (15:30 +0200)]
luci-mod-network: (wireless) Expose 802.11v settings.
Tested on: 21.02.1
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
82595509093ae1e538c23f131d468766c00092f2)
Paul Dee [Sun, 11 Dec 2022 13:29:47 +0000 (15:29 +0200)]
luci-mod-network: (wireless) Expose 802.11k settings.
Tested on: 21.02.1
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
b88156961f14a2b5a14fce8db3d54817a0cc686f)
Paul Dee [Sun, 11 Dec 2022 13:29:24 +0000 (15:29 +0200)]
luci-mod-network: (wireless) Expose multicast_to_unicast setting.
From https://w1.fi/cgit/hostap/commit/?id=
34f7c699a6bcb5c45f82ceb6743354ad79296078
add support for multicast_to_unicast conversion in the wireless settings
Tested on: 21.02.1
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
b2101a23a9116c65c903df6c1d02db16d6da579f)
Hannu Nyman [Tue, 6 Dec 2022 11:37:47 +0000 (13:37 +0200)]
luci-app-statistics: set shortest period data/graph to 2 hours
Change the shortest defined statistics period from 1 hour to 2 hours.
In practice, this only changes the graph for the shortest period
to show 2 hours of data instead of 1 hour.
The underlying database is not changed:
there are currently 288 data items for each period,
so with the 30 seconds default step, the shortest data series
contains 288 x 0.5 min = 144 min > 2 hours of data.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
4b49b45641b34094bd3be8b34de026303dc70f4a)
Jo-Philipp Wich [Mon, 5 Dec 2022 15:35:29 +0000 (16:35 +0100)]
treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Tue, 22 Nov 2022 09:08:44 +0000 (10:08 +0100)]
luci-base: ui.js: table enhancements
- Gracefully handle cells without innerText
- Properly handle `DocumentFragment` call values on table update
- Introduce ability to fetch actual cell value for sorting purposes from
`data-value` attribute
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
90a2b1eaeb58b7169b31fdc097c5bfe6f557c778)
Jo-Philipp Wich [Wed, 9 Nov 2022 19:26:14 +0000 (20:26 +0100)]
luci-base: cbi.js: await L.ui load before updating tables
On legacy views, the `L.ui` JavaScript class is not automatically loaded,
so request it before updating tables.
Fixes: e0e6989a4a ("luci-base: introduce new LuCI.ui.Table class")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bdfdd95a273f6fc73017795805dcfe6ee1ae8a8e)
Jo-Philipp Wich [Wed, 27 Jul 2022 15:19:08 +0000 (17:19 +0200)]
luci-base: revise array sorting
Refactor various sort operations throughout luci-base to use the new
L.naturalCompare() comparator function.
This primarily ensures that embedded numbers are sorted numerically and
not in a lexicographical way.
It also simplifies some code as a side effect.
Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
37422e891a47f15659356ce75b6f6cce831e0041)
Jo-Philipp Wich [Wed, 27 Jul 2022 14:31:10 +0000 (16:31 +0200)]
luci-base: luci.js: add array sort utilities
Add two new utility functions L.naturalCompare() and L.sortedArray() to
simplify sorting arrays naturally.
Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8199b2ce9a7d36359aedea1ad9dab157134a46c2)
y04 [Fri, 24 Jun 2022 23:45:55 +0000 (01:45 +0200)]
luci-base: optimized icons filesizes
Optimized PNG filesize without any quality loss.
Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit
37477ca6142c6e9e96f210c3a1973a44f814de09)
Jo-Philipp Wich [Tue, 17 May 2022 19:47:33 +0000 (21:47 +0200)]
luci-base: ui.js: add required CSS class to dynlist widget
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
d6dbedd9e2c77f44be0f64ee8128401a293f77f4)
Jo-Philipp Wich [Mon, 16 May 2022 14:04:56 +0000 (16:04 +0200)]
luci-base: luci.js: remove wrong CSS class from page footer
The `control-group` class is meant for gapless grouping of inputs with
buttons, while the page actions are just distinct buttons in a row.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
4e090e38d2cb606936768847ab0f5526f95be793)
INAGAKI Hiroshi [Wed, 27 Jul 2022 01:57:50 +0000 (10:57 +0900)]
luci-theme-material: fix typo in recovery mode message
Fix the message from "Sytem" to "System" and merge with the existing
message on the other themes.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit
2a558393636e1775f0c9b64ab9fe62a6a43b833e)
y04 [Fri, 24 Jun 2022 23:43:23 +0000 (01:43 +0200)]
luci-theme-material: optimized image filesize
Optimized PNG filesize from 6280 to 3939 bytes. Visually looks the same, technically the image is 99.9% identical.
Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit
ec8bdab76c1c25f36d13f0053357417aec82dd14)
Quentin Baker [Fri, 17 Jun 2022 03:59:39 +0000 (23:59 -0400)]
luci-theme-material: CSS Fix for previous update
Commit
b0f13ef Changed the color of a CSS element from a bright blue to
a dark blue. This resulted in a modal with difficult-to-read text (black
text on dark blue).
This commit sets the modal text-color to #000, in line with style
guidelines.
Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit
4ee2bc644acc4bd112f870cf1e689f86f99c5736)
Quentin Baker [Mon, 6 Jun 2022 01:35:25 +0000 (21:35 -0400)]
luci-theme-material: Update brand logo/colors
I have updated the brand.png logo to the 2020 version, and I have
made a small adjustment to the CSS to reflect its slightly larger
vertical height.
I also have made small tweaks to the system theme colors to use
the brand colors as recommended on page 5 of the logo usage
guidelines document avalible at
openwrt/branding/blob/master/openwrt-styleguide.pdf
Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit
b0f13efa9ce45e7b0ad096e0c1bd5e55bec23b8e)
Miguel Angel Mulero Martinez [Wed, 4 May 2022 08:53:35 +0000 (10:53 +0200)]
luci-material-theme: replace margin by gap in ifacebadge
Material is a "flex" theme. Better to use "gap" in place of "margin" to
add some space between elements inside "flex" elements.
This fixes the problem specially when there are text elements inside the
"flex" and don't hurt when there are images.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
1cd615787a648e3a8fda5d8c20b38b42a62a6d16)
Miguel Angel Mulero Martinez [Mon, 2 May 2022 07:47:36 +0000 (09:47 +0200)]
luci-material-theme: fix localizated left menu
The latest fix to fix the logout worked, but it was not applied to all
the resolutions, and I have observed the same problem exists for the
dasboard optional component.
Looking at the code, it seems only the components without submenu, have the
data-title element, so this fix modifies the style for all of them, not
relying on the position or text content.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
56aeaa8ac8b2a8a9864f3c8290fb10c39ed3173a)
Miguel Angel Mulero Martinez [Sun, 1 May 2022 07:23:04 +0000 (09:23 +0200)]
luci-material-theme: align text buttons center
The text inside the buttons is aligned to the top. This change mades
it aligned to the center.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
9e73a04adbff4dcebd643400da689291b8320d74)
Miguel Angel Mulero Martinez [Sat, 30 Apr 2022 08:36:22 +0000 (10:36 +0200)]
luci-material-theme: make control-group flex
The control-group div does not flex. The buttons overflow the screen.
This change mades them flex.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
17ddeb7b579160b5367047bbfaa079090090b888)
Miguel Angel Mulero Martinez [Sat, 30 Apr 2022 07:57:02 +0000 (09:57 +0200)]
luci-material-theme: align td text width 33%
The CSS applies a different padding for td elements with 33% width. This
misaligns the text from this td to the others td.
This change modifies the CSS to apply the same padding to all of the
sibling td.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
3333fd6695cbd2e7a6055f01542242a3b7c111ec)
Miguel Angel Mulero Martinez [Fri, 29 Apr 2022 22:32:58 +0000 (00:32 +0200)]
luci-material-theme: adjust data-title for logout
The data-title attribute style depends on the content in the css rule.
When translated to other language, the css rule fails.
This change uses the position and not the content to apply the style.
Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit
f8e52aa85d305a73a276b45805d758ba20d759fe)
Miguel Angel Mulero Martinez [Fri, 29 Apr 2022 14:32:58 +0000 (16:32 +0200)]
luci-theme-material: fix size of progressbar text
The text of the progressbar is bigger than the progressbar height. This removes the font-size element that produced that.
Signed-off-by: Miguel Angel Mulero <mcgivergim@gmail.com>
(cherry picked from commit
35fb253adb482d1f485245b0f8858b6713a99151)
Jo-Philipp Wich [Thu, 28 Apr 2022 14:06:25 +0000 (16:06 +0200)]
luci-base: ui: resolve aliases and rewrites on obtaining menu node children
Extend LuCI.ui.menu.getChildren() to resolve aliases and rewrites prior to
returning the menu nodes. This allows aliasing entire menu trees instead of
just single pages.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab)
Russell Morris [Wed, 20 Apr 2022 23:35:05 +0000 (18:35 -0500)]
luci-app-advanced-reboot: Add support for Linksys EA7500 v2
Signed-off-by: Russell Morris <rmorris@rkmorris.us>
(cherry picked from commit
d56f6bb3af6ed02b587cc3c69eb94b9e0ed8d109)
Daniell Crossman [Wed, 20 Apr 2022 08:09:40 +0000 (16:09 +0800)]
luci-app-rp-pppoe-server: use netlist template
pppoe-server init script is expecting an interface name,
not a physical device name in the pppoe config.
Signed-off-by: Daniell Crossman <dc@dx.id.au>
(cherry picked from commit
f2eb7275249d3e0c5cf5cc21ec77bab885ad19ff)
Florian Eckert [Tue, 12 Apr 2022 11:01:14 +0000 (13:01 +0200)]
luci-mod-system: mount sections are always mounted unless they are explicitly not mounted
fixes #4862
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
5abb2847ba7267a2c9cdbcb8ef506f0be7015047)
Jo-Philipp Wich [Wed, 30 Mar 2022 12:09:10 +0000 (14:09 +0200)]
luci-base: ucitrack: fix broken affects logic
Changes on a given configuration should trigger change events on affected
configurations, not the other way around.
Fixes: #5745
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
71106351344ea390e0f510e3f9ad34685bacc1ee)
Anna Tikhomirova [Sat, 19 Mar 2022 23:24:42 +0000 (02:24 +0300)]
luci-app-openvpn: fix openvpn config corruption on upload
Signed-off-by: Anna Tikhomirova <vamp@vampik.ru>
(cherry picked from commit
64b80b8f118753930357a236ce96ed5e4d720cda)
Jo-Philipp Wich [Thu, 20 Oct 2022 08:13:38 +0000 (10:13 +0200)]
luci-app-ddns: gracefully handle missing control file
In case `pcall()` fails, `ctrl` will contain an error message.
Fixes: 3395656b9f ("luci-app-ddns: get rid of luci-lib-ipkg depdency")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
74283264a34083725a71a0f62de423a514efa402)
Jo-Philipp Wich [Thu, 20 Oct 2022 08:07:21 +0000 (10:07 +0200)]
luci-app-ddns: get rid of luci-lib-ipkg depdency
Invoking opkg to obtain the installed package version is very slow and
resource intensive, parse the related control file directly to avoid
the extraneous dependency and resource consumption.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
3395656b9f687fd5e071a7805e0ba4c83f62906d)
Paul Dee [Tue, 18 Oct 2022 22:48:51 +0000 (00:48 +0200)]
luci-app-ddns: string fix
Attempts to address issue #6028
Also made proximate strings more clear.
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(backported from commit
3f81a06c0aeef198f6f5dc73d78ea24716ba3b5d)
Stan Grishin [Sun, 4 Dec 2022 17:55:44 +0000 (10:55 -0700)]
Merge pull request #6127 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: initial commit
Stan Grishin [Sat, 3 Dec 2022 02:32:45 +0000 (02:32 +0000)]
luci-app-pbr: initial commit
Depends on https://github.com/openwrt/packages/pull/20010
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
eb21c74b6f7c96226bdf3ca3601e628599041a45)
Stan Grishin [Fri, 2 Dec 2022 19:19:41 +0000 (12:19 -0700)]
Merge pull request #6122 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: localizable error/warning messages
Hannu Nyman [Thu, 1 Dec 2022 19:52:22 +0000 (21:52 +0200)]
timezone data: update to 2022g
Update timezone data to 2022g.
* https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html
- In the Mexican state of Chihuahua, the border strip near the US
will change to agree with nearby US locations on 2022-11-30.
The strip's western part, represented by Ciudad Juárez, switches
from -06 all year to -07/-06 with US DST rules, like El Paso, TX.
The eastern part, represented by Ojinaga, will observe US DST next
year, like Presidio, TX.
- A new Zone America/Ciudad_Juarez splits from America/Ojinaga.
- Much of Greenland, represented by America/Nuuk, stops observing
winter time after March 2023, so its daylight saving time becomes
standard time.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[adapt the commit in master, lua instead of ucode]
Stan Grishin [Tue, 29 Nov 2022 22:42:59 +0000 (22:42 +0000)]
luci-app-simple-adblock: localizable error/warning messages
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
6a4251ff9ad5832e861f9582a88cfd053dcbc436)
Julien Cassette [Sun, 6 Nov 2022 22:42:31 +0000 (23:42 +0100)]
luci-proto-wireguard: fix generated AllowedIPs
This corrects the option `AllowedIPs` in generated peer configurations,
and allows to customize it via a dropdown list.
Fixes: #5956
Signed-off-by: Julien Cassette <julien.cassette@gmail.com>
[correct fixes tag, slightly adjust option description]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
73aca68b9e35857ec155f33ca1b1fb5358d69e52)
Stan Grishin [Sun, 20 Nov 2022 05:26:08 +0000 (22:26 -0700)]
Merge pull request #6097 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: update to 1.9.3-1
Stan Grishin [Mon, 14 Nov 2022 19:26:17 +0000 (19:26 +0000)]
luci-app-simple-adblock: update to 1.9.3-1
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
ec31047e357afc19806b7f3d5781389769fada81)
Hannu Nyman [Sat, 12 Nov 2022 21:10:27 +0000 (23:10 +0200)]
treewide: Backport translations from master
Backport translations from master and sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Tue, 8 Nov 2022 18:39:02 +0000 (11:39 -0700)]
Merge pull request #6087 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: bugfix: allow empty leds field
Stan Grishin [Tue, 8 Nov 2022 18:06:06 +0000 (18:06 +0000)]
luci-app-simple-adblock: bugfix: allow empty leds field
* fixes error mentioned in https://github.com/openwrt/luci/pull/6075#issuecomment-
1306581739
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
41fee33c20681d514377666515aad9d3bcbfb7f5)
Stan Grishin [Tue, 8 Nov 2022 01:11:40 +0000 (17:11 -0800)]
Merge pull request #6084 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: convert to js
Stan Grishin [Fri, 4 Nov 2022 00:10:03 +0000 (00:10 +0000)]
luci-app-simple-adblock: convert to js
Thanks @dibdot, @jow-!
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Update applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js
Co-authored-by: Vasili Sviridov <vsviridov@exceede.com>
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Thanks @dibdot, @jow-, @vsviridov!
* this includes changes made during review
Co-authored-by: Vasili Sviridov <vsviridov@exceede.com>
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
0b895b17940089f854221b340fafae83bcbb2a99)
Hannu Nyman [Mon, 31 Oct 2022 18:06:11 +0000 (20:06 +0200)]
timezone data: update to 2022f
Update timezone data to 2022f.
* http://mm.icann.org/pipermail/tz-announce/2022-October/000075.html
- Mexico will no longer observe DST after 2022, except for areas
near the US border that continue to observe US DST rules.
On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
from -07 (-06 with DST) to year-round -06.
- Fiji will not observe DST in 2022/3.
For now, assume DST is suspended indefinitely.
- Simplify four Ontario zones.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[adapt the commit in master, lua instead of ucode]
Kevin Darbyshire-Bryant [Sun, 18 Sep 2022 08:09:42 +0000 (09:09 +0100)]
luci-mod-status: nftables.js: correct icmp display
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit
6a03a884301f1acbc1cb1651a06b96ac92cc8596)
Jo-Philipp Wich [Thu, 27 Oct 2022 14:08:11 +0000 (16:08 +0200)]
luci-mod-network: gracefully handle empty channel lists
Avoid undefined value access when the channel list is empty.
Fixes: #5937, #5951
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9af8486517e87eea837fbce0ce787fc89ab46627)
Stan Grishin [Mon, 24 Oct 2022 17:41:27 +0000 (10:41 -0700)]
Merge pull request #6053 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: bugfix: identify nft set support
Stan Grishin [Mon, 24 Oct 2022 17:18:43 +0000 (17:18 +0000)]
luci-app-simple-adblock: bugfix: identify nft set support
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
4dc98fefcac468917227bd9037bf6a71cbed9b67)
Hannu Nyman [Mon, 24 Oct 2022 16:00:38 +0000 (19:00 +0300)]
timezone data: update to 2022e
Update timezone data to 2022e.
* http://mm.icann.org/pipermail/tz-announce/2022-September/000073.html
* http://mm.icann.org/pipermail/tz-announce/2022-October/000074.html
- Palestine transitions are now Saturdays at 02:00.
- Simplify three Ukraine zones into one.
- Jordan and Syria switch from +02/+03 with DST to year-round +03.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
10d762eab70a9bcd233cd8cb79e32742fb2c4038)
Jo-Philipp Wich [Tue, 18 Oct 2022 21:17:16 +0000 (23:17 +0200)]
Merge pull request #6036 from myrlyn/openwrt-22.03_dmfix
luci-app-dockerman: change default to nil if data.blkio_weight is not defined
Stan Grishin [Tue, 18 Oct 2022 18:09:29 +0000 (11:09 -0700)]
Merge pull request #6024 from stangri/openwrt-22.03-luci-proto-nebula
[22.03] luci-proto-nebula: add nebula protocol support
Dirk Brenken [Tue, 18 Oct 2022 16:59:52 +0000 (18:59 +0200)]
luci-app-adblock: sync with adblock 4.1.5
* add a new DNS report parameter to change the top statistics dynamically in the range of 10-50, see #19622 in the package repo for reference.
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
79cbbc01ce0271490ee8f66f7cf1a9a1ca56f64d)
Signed-off-by: Dirk Brenken <dev@brenken.org>
myrlyn [Tue, 18 Oct 2022 16:04:35 +0000 (17:04 +0100)]
luci-app-dockerman: change default to nil if data.blkio_weight is not defined
Signed-off-by: Jonathon Walker <jonathon.l.walker@gmail.com>
Viktor Tsvetkov [Fri, 24 Dec 2021 11:36:35 +0000 (12:36 +0100)]
sysauth: add autocomplete and id attributes to login inputs
this let browser automatically fill according to HTML spec for input elements.
luci-theme-bootstrap and luci-base are affected.
Signed-off-by: Viktor Tsvetkov <zwetvik@gmail.com>
[indentation fix]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
3e9d9a9dbb045c24eb93643838f8e8e3b9074e4b)
Jo-Philipp Wich [Sat, 15 Oct 2022 12:27:31 +0000 (14:27 +0200)]
treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Sat, 15 Oct 2022 12:18:57 +0000 (14:18 +0200)]
luci-app-nut: use filesystem dependencies for configuration files
Don't use uci dependencies for nut related config files as the nut packages
ship with completely commented out uci files. Such files do not satisfy the
uci menu dependencies as those expect at least one section within the file.
To solve this issue, use a regular file dependency on /etc/config/nut_*
instead.
Supersedes: #5964
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bfc0fcfe6e97b1b39317f42d96debf3286c42696)
Jo-Philipp Wich [Sat, 15 Oct 2022 12:13:17 +0000 (14:13 +0200)]
Merge pull request #6027 from neheb/apple
[22.03]backport iOS changes from master
Rosen Penev [Fri, 14 Oct 2022 20:22:42 +0000 (13:22 -0700)]
luci-theme-openwrt-2020: quantize png image
Small size reduction.
From: 5908
To: 3896
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit
54664523996e03bf99b6e4006b113d5956ec75f8)
Rosen Penev [Tue, 11 Oct 2022 21:50:40 +0000 (14:50 -0700)]
luci-theme-openwrt-2020: add iOS webapp support
This way instead of opening a Safari tab, it opens in its own instance.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit
28193247bcdd6e03ae2336f8f647f438f2713149)
Rosen Penev [Mon, 10 Oct 2022 22:47:47 +0000 (15:47 -0700)]
luci-theme-openwrt-2020: add iOS icon support
Used when adding LuCI to Springboard. Image generated from logo.svg.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit
1be885064e65f4c96189e7f63f29dcbb7040f3cb)
Stan Grishin [Fri, 14 Oct 2022 12:02:56 +0000 (12:02 +0000)]
luci-proto-nebula: add nebula protocol support
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
d55913cfa44c81280111d093807c6830b3584d8d)
Jo-Philipp Wich [Fri, 14 Oct 2022 10:53:53 +0000 (12:53 +0200)]
Merge pull request #6018 from pymumu/master
[openwrt-22.03] luci-app-smartdns: update to 1.2022.38
Nick Peng [Fri, 14 Oct 2022 09:46:16 +0000 (17:46 +0800)]
luci-app-smartdns: update to 1.2022.38
Signed-off-by: Nick Peng <pymumu@gmail.com>
Florian Eckert [Wed, 12 Oct 2022 11:57:16 +0000 (13:57 +0200)]
Merge pull request #6017 from jcassette/issue-4926-22.03
[22.03] luci-app-ddns: fix creation of custom service (fix #4926)
Julien Cassette [Sun, 2 Oct 2022 18:14:19 +0000 (20:14 +0200)]
luci-app-ddns: fix creation of custom service (fix #4926)
The `service_name` option must be empty for custom services,
otherwise an error is raised in `dynamic_dns_updater.sh`.
Signed-off-by: Julien Cassette <julien.cassette@gmail.com>
(cherry picked from commit
85ff9db2bffd3d2bf119300d9297f1b524608e1b)
Stan Grishin [Wed, 5 Oct 2022 06:41:19 +0000 (23:41 -0700)]
Merge pull request #6005 from stangri/openwrt-22.03-luci-app-https-dns-proxy
[22.03] luci-app-https-dns-proxy: update to 2021-11-22-7 (settings for Canary…
Stan Grishin [Tue, 4 Oct 2022 22:23:28 +0000 (22:23 +0000)]
luci-app-https-dns-proxy: update to 2021-11-22-7 (settings for Canary Domains)
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
060e671c82f7d9abf3e581347a5162ef8b16f63c)
Hannu Nyman [Tue, 4 Oct 2022 20:02:08 +0000 (23:02 +0300)]
treewide: Backport and sync translations
Backport translations from master.
Sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Fri, 30 Sep 2022 07:59:39 +0000 (09:59 +0200)]
luci-app-opkg: relax dependency parsing
Align depdendency parse logic with opkg to properly process certain
malformed dependency specifications. In particular do not require a
depdendency specification to end after the closing paren of a version
constraint and perform non-greedy matching in order to extract the
first version constraint only.
Fixes: #5997
Ref: https://forum.openwrt.org/t/x/138328
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
84ba6a5c36072f74721d535104735757b005c8d6)
Jo-Philipp Wich [Wed, 21 Sep 2022 12:47:41 +0000 (14:47 +0200)]
luci-mod-system: sshkeys.js: prevent XSS through pubkey comments
Ensure to not display public key comments verbatim in order to prevent
injection of markup.
Reported-by: Eric McDonald <ericmcdonald@protonmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
944b55738e7f9685865d5298248b7fbd7380749e)
Dirk Brenken [Sat, 10 Sep 2022 17:01:46 +0000 (19:01 +0200)]
luci-app-adblock: sync with adblock 4.1.4
* removed the unused 'adb_dnsinotify' parameter
* removed the 'adb_maxqueue' parameter,
the queue size will be automatically set by the number of cpu cores
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
b3e1f956e60244200a1630964e83d33217cf0091)
Jo-Philipp Wich [Tue, 6 Sep 2022 21:51:19 +0000 (23:51 +0200)]
luci-app-upnp: make nftables compatible
Make luci.upnp rpcd backend plugin compatible with miniupnpd-nftables.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
82eec98944714c2b61f6e54291bc8f22983bb122)
Hannu Nyman [Fri, 2 Sep 2022 21:29:20 +0000 (00:29 +0300)]
timezone data: update to 2022c
Update timezone data to 2022c.
http://mm.icann.org/pipermail/tz-announce/2022-August/000071.html
http://mm.icann.org/pipermail/tz-announce/2022-August/000072.html
* Iran no longer observes DST after 2022.
* Rename Europe/Kiev to Europe/Kyiv.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
10bcb228a7fc02a8e9ecb1ff584fd63b77a55afd)
Florian Eckert [Fri, 2 Sep 2022 11:22:24 +0000 (13:22 +0200)]
Merge pull request #5955 from brvphoenix/backport
[22.03] luci-app-frpc: backport
ZiMing Mo [Sat, 30 Apr 2022 07:55:40 +0000 (15:55 +0800)]
luci-app-frpc: fix service status bar style
mod the service status bar to use normaly 'cbi-section' class style.
Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
[squash commits, add balnk line between commit subject and message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
fbd3a40c3e364c91a9effc1193456c8b3303b880)
Van Waholtz [Thu, 24 Mar 2022 03:40:04 +0000 (11:40 +0800)]
luci-app-frpc: sync translations - i18n
Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
Hannu Nyman [Thu, 1 Sep 2022 15:08:56 +0000 (18:08 +0300)]
luci-mod-network: Offer ft-over-air by default for 802.11r
OpenWrt commit
2984a0420 (
0588b124e in 22.03) changed the default 802.11r
Fast Transition method to be ft-over-air instead of ft-over-ds.
Offer ft-over-air as the first item in the drop-down list, so that
it gets selected by default when 802.11r option is enabled.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
2c3c7f5c50efd71bf87c068359cb0110a513186f)
Van Waholtz [Thu, 24 Mar 2022 03:40:04 +0000 (11:40 +0800)]
luci-app-frpc: add settings for log
Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
(cherry picked from commit
0dbe3198bfe1feda71efddb62d6c198a69e0dcc1)
Ren Zongjia [Fri, 24 Dec 2021 07:14:14 +0000 (15:14 +0800)]
luci-app-frpc: Set the disable_log_color option to false by default
Signed-off-by: Ren Zongjia <acooler15@foxmail.com>
(cherry picked from commit
9f831e75e5764eb42a16b3ae5851b7524e1341c1)
Van Waholtz [Fri, 28 Jan 2022 11:32:20 +0000 (19:32 +0800)]
luci-app-frpc: use anonymous sections
1. Use anonymous sections and add name options to specify the proxy name
2. Add server name field for visitor mode
Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
(cherry picked from commit
973a4b5e679d22988671f7019103f0aa0833d4c6)