Commit graph

14798 commits

Author SHA1 Message Date
Dirk Brenken
07063ae51c
luci-app-adblock: expose dns instance option
* expose the 'adb_dnsinstance' option to LuCI under
  Advanced DNS Settings (only relevant for dnsmasq)
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-07-10 16:30:02 +02:00
Anton Kikin
19331bd029 luci-app-nlbwmon: Add translation context for Download/Upload terms
Added a translation context for the terms 'Download' and 'Upload'
used in this application. The reason is that these terms are
translated differently in Russian depending on the context.

If the terms are used in the sense of an action (download file
or upload file) then the translations should be as follows:
- Download = скачать
- Upload   = загрузить

But if they are used in the context of a traffic counter (like
in this application) the correct translations are:
- Download = скачано
- Upload   = загружено

A translation context has been added to all affected PO files
to avoid breaking existing translations. The Russian translation
in PO file is fixed to comply with the used context.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit fb52e86b54)
2021-07-07 17:20:22 +02:00
Jo-Philipp Wich
f161b40e4c luci-app-sqm: only reload view once sqm enable/start completed
Chain the exec calls to enable and start the SQM service and only reload
the view once these operations are complete and return the entire promise
chain from the handler function to ensure that the busy indicator remains
active throughout the entire duration of the operation.

Also replace exec_direct() with exec() as there is no need to bypass ubus
for the init script calls.

Fixes: e76d9cc767 ("luci-app-sqm: fix JS error if service is disabled")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 005c09a293)
2021-07-07 17:20:09 +02:00
Dirk Brenken
0d45661369 luci-app-sqm: fix JS error if service is disabled
* fix a 'resource not found error' if the sqm service has been disabled
  and the dir '/var/run/sqm/available_qdiscs' not exist
* inform the user about this issue and provide a button
  to enable & start the service

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e76d9cc767)
2021-07-07 17:20:09 +02:00
Florian Eckert
e52e1de53a luci-base: do not add validation for named section if readonly is set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 1a2b7fef6c)
2021-07-07 17:18:19 +02:00
Helge Mader
56f453ad13 luci-base: prevent empty field for adding new named section in JavaScript
Suggested-by: Helge Mader <ma@dev.tdt.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 87215e3d1b)
2021-07-07 17:18:16 +02:00
Florian Eckert
215a3141f0 luci-base: change css class btn to cbi-button
The css class btn is only a valid input element on lua rendered pages.
Use instead cbi-button for javascript rendered pages.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 80262bb9a7)
2021-07-07 17:18:13 +02:00
Florian Eckert
c6b41bdecb luci-base: use button tag instead of input tag on named section add
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 97e673b72c)
2021-07-07 17:18:10 +02:00
Florian Eckert
5e1356fe51 luci-app-acl: unset read and write before acl set
If the setting in the view is set to `denied`, only the read list option
is deleted. This is not correct. The write list option must also be
deleted. To ensure that the correct configuration is saved, the write
and read list options are always deleted beforehand and then rewritten.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit f4e8fcb6b5)
2021-07-07 17:18:03 +02:00
Jo-Philipp Wich
eafe171160 luci-mod-status: disable "Set static" lease action on readonly view
Fixes: f6b6a12927 ("luci-mod-status: add support for one-click static lease")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a6d957d6f5)
2021-07-07 17:17:16 +02:00
Jo-Philipp Wich
2b87ea0fc2 luci-app-acl: ensure to set read/write ACL presets as uci lists
The rpcd daemon expects uci list notation for the login.read and login.write
options, so ensure to set them accordingly when chosing the `full access` or
`readonly` presets while configuring an account.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9922c838cd)
2021-07-07 17:17:13 +02:00
DeYu Liu
720a57647b luci-base: Fix time display error
Signed-off-by: DeYu Liu <vito_sam@outlook.com>
(cherry picked from commit 0e4b4c5b42)
2021-07-07 17:17:09 +02:00
Jo-Philipp Wich
1fed9af22c luci-base: validation: disallow mutlicast MACs by default
Extend the MAC address validator to disallow multicast MAC addresses and
add a new optional validator option to require multicast MACs instead of
unicast ones.

Fixes: #5166
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 00e41c3c49)
2021-07-07 17:17:02 +02:00
Dirk Brenken
d9430378f9 luci-app-openvpn: create base directory if not available
* trivial fix for never ending ticket #3454

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b6f36ca91b)
2021-07-07 17:17:02 +02:00
Paul Spooren
a56934fb0f luci-app-attendedsysupgrade: fix typo
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit cef330a1c8)
2021-07-06 17:46:42 -10:00
Jo-Philipp Wich
afea1dac74 Revert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static IP was fixed"
This reverts commit 463e910119.

This change causes the entire static lease to get deleted when attempting
to change the MAC address.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 91f46d765b)
2021-07-03 07:21:24 +02:00
Jo-Philipp Wich
0ededb9bcc luci-mod-network: fix saving bridge VLANs without member ports
Calling `uci.set()` with an empty array yields an invalid argument error,
make sure to pass `null` instead in this case.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1f566bfe2)
2021-07-02 20:48:09 +02:00
Jo-Philipp Wich
ae00d0f712 luci-mod-network: work around jsmin bug
The jsmin minifier incorrectly transforms the expression `/\*/.test(...)`
into `/\* /.test(...)`, causing the VLAN filter dialog to not recognize
PVID settings in the configuration.

Work around the issue by using an equivalent `\x2a` escape sequence instead.

Ref: https://forum.openwrt.org/t/x/99222/28
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2869c9cf32)
2021-07-02 20:48:09 +02:00
Jo-Philipp Wich
f66be1fe72 treewide: fix typo in "Enable VLAN filtering" label
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c48d8f4a2c)
2021-07-01 21:16:56 +02:00
Jo-Philipp Wich
d1d452ed2f luci-mod-status: don't set '-' hostname when creating static lease
Fixes: #5153
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e3357deb7d)
2021-07-01 21:15:25 +02:00
Jo-Philipp Wich
49aa9c61db luci-mod-network: enforce IPv4 mode for traceroute call
Recent busybox traceroute applet versions support both IPv4 and IPv6 and
default to IPv6 when running a route trace to an IPv6 enabled target
host. Pass the `-4` flag to enforce IPv4 mode in this case.

Fixes: #5155
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c4f4294615)
2021-07-01 21:15:15 +02:00
Jo-Philipp Wich
165e411cd4 luci-mod-network: parse ports without tag/pvid annotation as well
Fixes: 01eac366f6 ("luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e57f8663af)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
4c05263573 luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports
The previous code naively looked for a `t` in the entire port spec,
wrongly matching untagged ports having a `t` in their name, such
as `eth0`.

Rework the logic to be more strict when parsing the port member
specification to avoid this issue.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 01eac366f6)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
ccf7c1e036 luci-mod-network: refactor device configuration
Since all netifd device types inherit generic device settings, we can
simplify various aspects of the device configuration ui and drop unused
code while we're at it.

 - Remove setIfActive() helper, superseded by commit
   f3f74bd0fe ("luci-base: form.js: consider aliased options in AbstractValue.remove()")

 - Remove most dependency constraints to make all generic device settings
   available for all device types

 - Add MTU value validation to disallow exceeding parent device MTU for
   VLAN interfaces

 - Dynamically update placeholder values when changing base or parent
   device options

 - Undo VLAN network config hack since all options are available now.
   Reverts commit
   3c6b59504a ("luci-mod-interfaces: simplify configuring MAC address of 802.1q devices")

 - Do not suggest inactive wireless networks as existing device or base
   device choices

 - Disallow specifying names of already existing network devices when
   creating new device settings

 - Fix a number of multicast dependency specifications

 - Drop now unused functions

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f689d0d208)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
0eb87ea65e luci-mod-network: change port status layout in vlan filter config
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 36350e9867)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
8504470ad8 build: add script to find commits suitable for cherry picking
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ead87320bade6f924991f4310271582a760edb4)
2021-07-01 21:13:56 +02:00
Dirk Brenken
7d5318b9ae
luci-app-adblock: sync with latest version
* expose new reporting option to LuCI
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 83778c1452)
2021-07-01 06:41:37 +02:00
Florian Eckert
06d63dc283
Merge pull request #5145 from msylgj/patch-2
luci-app-frpc/frps:add service status display
2021-06-29 08:58:19 +02:00
SiYao Mo
ad08c8e912 luci-app-frpc/frps:add service status display
reference from luci-app-smartdns
Special thanks to Nick Peng <pymumu@gmail.com>

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 18:01:54 +08:00
Florian Eckert
d67e0daa8b
Merge pull request #5142 from msylgj/patch-2
luci-app-frpc: allow hostname in server address
2021-06-24 08:22:36 +02:00
Siyao Mo
1878aab778 luci-app-frpc: allow hostname in server address
Sometimes, our frp server cannot use a static ip address.
So perhaps we should allow people to use hostname in server address.

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 00:18:59 +08:00
Florian Eckert
891eff7f1c luci-app-nlbwmon: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:53:18 +02:00
Florian Eckert
74c16549a1 luci-base: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:53:03 +02:00
Florian Eckert
71def4a101 luci-app-watchcat: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:50 +02:00
Florian Eckert
abc50bd1ae luci-app-banip: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:28 +02:00
Florian Eckert
d35a1a7866 luci-app-adblock: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:12 +02:00
Anton Kikin
2e6b6ec0dc luci-mod-network: Support for disabling routes
Support for disabling routes in netifd was added in commit [1]. This commit
adds support for disabling routes through the LuCI interface.

Additionally hidden the route options descriptions in the header of the
routes table (they are still available in the modal view).

[1]: https://git.openwrt.org/?p=project/netifd.git;a=commit;h=327da9895327bc56b23413ee91a6e6b6e0e4329d

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit bfe8a01040)
2021-06-21 12:53:21 +02:00
Florian Eckert
95b3633055 luci-mod-status: switch to html table for wlan channel analysis
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 8f8ce8613f)
2021-06-21 12:21:44 +02:00
Jo-Philipp Wich
ecc58e7fcb luci-theme-openwrt-2020: fix spinning disk animation
Fixes: #4824
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e8a6f0bb7c)
2021-06-21 12:06:44 +02:00
Florian Eckert
b1567baf0c luci-app-nlbwmon: show force reload button even if data are available
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a7be13ff05)
2021-06-21 12:03:31 +02:00
Florian Eckert
dbb2cb9523 luci-app-nlbwmon: adjused the display export page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 04c4499be7)
2021-06-21 12:03:06 +02:00
Florian Eckert
5cdce5d96a luci-app-nlbwmon: change force reload html element to button
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit d6443a6293)
2021-06-21 12:03:06 +02:00
Florian Eckert
4ab591a24d luci-app-nlbwmon: add missing cbi-button class for database backup
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6f6ec9f56c)
2021-06-21 12:03:06 +02:00
Florian Eckert
ec2712335a luci-app-nlbwmon: fix url
When moving this application to the service section, the links were
forgotten to be changed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7a36518329)
2021-06-21 12:03:06 +02:00
Florian Eckert
eee3d4bef4 luci-app-nlbwmon: move into menu entry into service section
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 9e91737566)
2021-06-21 12:03:06 +02:00
Jo-Philipp Wich
d365470f66 luco-app-ksmbd, luci-app-omcproxy: use relative luci.mk include path
Fixes: #5134
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2f0ffd9d82)
2021-06-18 14:29:20 +02:00
Jo-Philipp Wich
8b663587f9 luci-mod-network: only consider bridge vlans belonging to the current device
In case multiple bridges with bridge vlans are declared, LuCI did not
correctly filter the VLANs to show only the ones belonging to the
bridge being configured currently.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6f1eacb01)
2021-06-17 09:39:38 +02:00
Yu Hua
83f6606a6d luci-lib-docker: add container export support
commit from https://github.com/lisaac/luci-lib-docker

Signed-off-by: Yu Hua <hue715@gmail.com>
(cherry picked from commit fe795d5278)
2021-06-16 14:52:05 +02:00
Jo-Philipp Wich
199533a08e treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-06-15 10:06:26 +02:00
Jo-Philipp Wich
5ca9e86cbf rpcd-mod-luci: bump version
Fixes: a78b74784d ("rpcd-mod-luci: refactor host hint gathering")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a26b53314d)
2021-06-15 10:03:22 +02:00