Commit graph

14704 commits

Author SHA1 Message Date
Eneas U de Queiroz
49d2a94ebd luci-app-xlc: don't build package for arc
lxc does not build on arc.  Since luci-app-xlc selects lxc, it needs to
check @!arc first.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit c6d196cc82)
2021-04-13 19:12:42 +03:00
Alexander Egorenkov
a953870b3b luci-app-transmission: fix '&nbsp' exception in OpenWrt theme
Convert '&nbsp;' to '&#160;' which is both syntactically correct (semicolon present) and XHTML compliant.

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
(cherry picked from commit afd096edfc)
2021-04-13 19:12:34 +03:00
Stan Grishin
9a135ae4b3
Merge pull request #4975 from stangri/21.02-luci-app-simple-adblock
[21.02] luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
2021-04-11 09:38:48 -07:00
Stan Grishin
4f7ccf0d85 luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-04-10 18:45:01 +00:00
Jo-Philipp Wich
3fff72a3f5 luci-app-commands: prevent page reload on invoking command actions
Fixes: f117b7f ("luci-app-commands: use <button> elements")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 36959dc0d1)
2021-04-09 14:37:03 +02:00
Jo-Philipp Wich
99a089f81b luci-app-commands: use <button> elements
Use <button> instead of <input type=button> elements to fix compatibility
with OpenWrt 2020 theme.

Ref: https://github.com/openwrt/luci/issues/4972
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f117b7f1ec)
2021-04-09 14:31:06 +02:00
Jo-Philipp Wich
6137c9ff33 luci-theme-openwrt-2020: honor CSS definitions passed by views
Legacy Lua views might declare a global `css` variable to inject custom
styles into the template header. Support this mechanism in the OpenWrt 2020
theme as well.

Ref: https://github.com/openwrt/luci/issues/4972
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c5ff3244e9)
2021-04-09 14:31:06 +02:00
Jo-Philipp Wich
7bb2fc4913 luci-compat: update markup for CBI TableSections
Update legacy CBI markup to use actual table, tr, th and td elements
instead of using div element corresponding table classes.

Fixes compatibility with OpenWrt 2020 theme.

Ref: https://github.com/openwrt/luci/issues/4972
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2155868175)
2021-04-09 14:31:06 +02:00
Hannu Nyman
8cdf93e876 treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-09 11:40:47 +03:00
Henrique de Moraes Holschuh
a8c960c5b6 luci-mod-system: implement system.description, system.notes
Implement two new text "options" for UCI system config, intended to
help humans describe the device.

"system.description" is a short, single-line description suitable for
selector UIs in remote administration applications, or remote UCI (over
ubus RPC), etc.  It would also be suitable as a default for LLDP/SNMP
"system description".

"system.notes" is a multi-line, free-form text field that can be used in
any way the user wishes, e.g. to hold installation notes, or unit serial
number and inventory number, location, etc.

Signed-off-by: Henrique de Moraes Holschuh <henrique@nic.br>
2021-04-06 23:20:57 +03:00
Jo-Philipp Wich
d627abeff2 luci-app-dawn: fix custom markup
- Properly indent HTML markup
 - Replace div-based table markup with actual tables
 - Escape SSID, hostname and interface values to prevent potential XSS

Fixes: #4942
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 32f0ff25a2)
2021-03-29 11:52:21 +02:00
Jo-Philipp Wich
adcc2ef446 luci-base: ui.js: fix UICheckbox widget operation when tooltips are set
When a tooltip is rendered for a checkbox widget, an additional node is
placed after the checkbox label element, breaking DOM selectors in
bind(), isChecked(), setValue().

Apparently the functionality was never actually tested.

Fixes: #4938
Fixes: e951236e3 ("luci-base: add tooltip handling")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 95b5c6cd64)
2021-03-29 11:28:15 +02:00
Philip L. McMahon
b60b838027 luci-app-statistics: remove rrd path triple escape
Fixes rendering errors when RRD file names contain IPv6 addresses and the
colon (":") characters are triple escaped.

Adapts the Lua-specific fix in #4340 to Javascript.

Signed-off-by: Philip L. McMahon <philip.l.mcmahon@gmail.com>
(cherry picked from commit d44302b3ac of PR #4358)
2021-03-27 11:06:42 +02:00
Hannu Nyman
0907151172 treewide: Backport translations and sync
Backport translations from master

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-03-27 11:00:11 +02:00
Stan Grishin
9cf8f15fae
Merge pull request #4943 from stangri/21.02-luci-app-vpnbypass
[21.02] luci-app-vpnbypass: client-side rendering
2021-03-24 22:27:28 -07:00
Stan Grishin
5db241b2b5 luci-app-vpnbypass: client-side rendering
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-25 05:26:22 +00:00
Florian Eckert
73b420b09c luci-app-watchcat: sync i18n because of javascript porting
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-22 08:56:05 +01:00
Florian Eckert
e3686d5e9b luci-app-eoip: fix i18n for en
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-22 08:53:14 +01:00
Florian Eckert
8619c8b97f
Merge pull request #4932 from TDT-AG/pr/20210318-openwrt-21.02-luci-app-watchcat
luci-app-watchcat: add support for new features and convert to JavaScript
2021-03-22 08:48:23 +01:00
Florian Eckert
7bc377f67c luci-app-watchcat: change interface selection to device
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 3d48d79321)
2021-03-22 08:46:57 +01:00
Florian Eckert
1e99df56df luci-app-watchcat: fix render fails with XHTML themes
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 0e19741553)
2021-03-22 08:46:43 +01:00
Jo-Philipp Wich
6639e31a06 luci-app-opkg: fix parsing empty package repository indexes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3bcbcbf088)
2021-03-20 17:16:38 +01:00
Paul Spooren
d7568b43ff luci-app-attendedsysupgrade: sync with master branch
Use new LuCI JavaScript code instead of a mix of Lua and JS.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2021-03-18 10:31:02 -10:00
Nicholas Smith
43d644db35 luci-app-watchcat: add support for new features and convert to JavaScript
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit d5c763ee1d)

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Remove po file changes. Does not apply clean. To many changes.
2021-03-18 12:55:26 +01:00
Rui Salvaterra
556353f2d5 luci-mod-system/zram: remove zram_comp_streams
Zram uses per-CPU compression streams [1]. This is a no-op.

[1] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=116191eddf9d8ddba61de788824dea442b265936

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit 4bf84e29ea)
2021-03-14 14:38:28 +02:00
Rui Salvaterra
8d90ebaba9 luci-mod-system/zram: replace deflate with zstd
Deflate is just too slow for zram. Replace it with zstd, which is much faster at
similar compression ratios.

As a side note, this is an ugly hack. We're hard-coding compression algorithms
which might not be available in the system. The availability should be parsed
from /sys/block/zram0/comp_algorithm.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit 02cadf67b2)
2021-03-14 14:37:13 +02:00
Dirk Brenken
c3b95818fe
luci-app-banip: sync with 0.7.5
* change the wording for black- and whitelist (domain names now
  supported as well as input for IPsets
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-03-14 06:57:31 +01:00
Hannu Nyman
4f905e16cc treewide: i18n translation backport and sync
Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-03-13 09:42:16 +02:00
Stan Grishin
a73ea05dbe
Merge pull request #4907 from stangri/21.02-luci-app-vpn-policy-routing
[21.02] luci-app-vpn-policy-routing: explicit package version
2021-03-12 19:06:21 -08:00
Stan Grishin
61cae0342c
Merge pull request #4904 from stangri/21.02-luci-app-simple-adblock
[21.02] luci-app-simple-adblock: explicit package version
2021-03-12 19:06:02 -08:00
Stan Grishin
1ce58d4583
Merge pull request #4901 from stangri/21.02-luci-app-https-dns-proxy
[21.02] luci-app-https-dns-proxy: explicit package version
2021-03-12 19:05:44 -08:00
Stan Grishin
81bc2c0198
Merge pull request #4898 from stangri/21.02-luci-app-advanced-reboot
[21.02] luci-app-advanced-reboot: explicit package version
2021-03-12 19:05:24 -08:00
Florian Eckert
4c6fb6bb97 luci-theme-openwrt-2020: add missing css success color
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit e0c0e468e6)
2021-03-12 15:03:02 +01:00
Stan Grishin
63382fbb00 luci-app-vpn-policy-routing: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:21:24 +00:00
Stan Grishin
37e4ef4fdb luci-app-simple-adblock: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:20:11 +00:00
Stan Grishin
01618249d4 luci-app-https-dns-proxy: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:19:16 +00:00
Stan Grishin
934673fa98 luci-app-advanced-reboot: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:10:45 +00:00
Stan Grishin
fa6922d586
Merge pull request #4883 from stangri/21.02-luci-app-https-dns-proxy
[21.02] luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020
2021-03-09 20:35:40 -08:00
Stan Grishin
2cccd50cc5
Merge pull request #4886 from stangri/21.02-luci-app-simple-adblock
[21.02] luci-app-simple-adblock: bugfix: template layout on theme-openwrt-2020
2021-03-09 20:35:22 -08:00
Stan Grishin
976b7f5c18
Merge pull request #4889 from stangri/21.02-luci-app-vpn-policy-routing
[21.02] luci-app-vpn-policy-routing: bugfix: template layout on theme-openwrt-2020
2021-03-09 20:35:02 -08:00
Stan Grishin
86eb91d2f4 luci-app-vpn-policy-routing: bugfix: template layout on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:48:58 +00:00
Stan Grishin
1a25f27c25 luci-app-simple-adblock: bugfix: template layout on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:46:33 +00:00
Stan Grishin
855f06be83 luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:42:05 +00:00
Dirk Brenken
988a896e0f
Merge pull request #4854 from EricLuehrsen/unbound_luci_2102
[openwrt-21.02] luci-app-unbound: fix interface selections to match UCI
2021-03-07 07:29:14 +01:00
Eric Luehrsen
fa2412b542 luci-app-unbound: fix interface selections to match UCI
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2021-03-06 21:11:23 -05:00
Dirk Brenken
2e1f950104
luci-app-banip: cosmetics
* fix translation warning
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0dad7fc09e)
2021-03-03 16:37:56 +01:00
Jo-Philipp Wich
493552552f luci-app-firewall: allow negative prefix lengths
Fixes: #4812
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f64b3d5094)
2021-03-01 15:19:06 +01:00
Jo-Philipp Wich
bd39e6abaf luci-base: validation.js: optionally support negative prefixes
Support negative prefix length in the `cidr`, `cidr4`, `cidr6`, `ipmask`,
`ipmask4` and `ipmask6` data types when an optional truish flag is passed
to the datatype name.

Ref: #4812
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cd06e708d8)
2021-03-01 15:19:06 +01:00
Jo-Philipp Wich
3d31dfc2b4 luci-base: network.js: sort interface statuses by metric, then name
Fixes: #4693
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ee422b4c0)
2021-03-01 10:43:43 +01:00
Jo-Philipp Wich
628a1b8c8f luci-app-nlbwmon: fix traffic numbers display in pie chart tooltips
The pie chart tooltips used base 1000 to format traffic numbers while table
cell values were formatted using base 1024. Use base 1024 for both to report
the same values.

Fixes: #4759
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 77d6b28935)
2021-03-01 10:31:01 +01:00