Commit graph

12312 commits

Author SHA1 Message Date
Stan Grishin
990c9abd0d luci-app-advanced-reboot: bugfix: support new board names for Linksys WRT-devices
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-10 16:49:11 +00:00
Hannu Nyman
777fe39774 luci(-ssl)-nginx: depend on luci-app-opkg
Commit 391e82d6a3 in 2018 added luci-app-opkg dependency to
the 'luci' collection and its derivatives, but as nginx collections
do not depend on main 'luci', they did not get the intended change.

Fixes #4148

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 219f0ce891)
2020-06-09 23:30:57 +03:00
Stan
f35803e935
Merge pull request #4102 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: bugfix: proper processing of failed downloads; decrease reliance on shell commands; proper acl.d file
2020-06-03 08:27:44 -07:00
Hannu Nyman
f1eeb85be6 treewide: i18n - backport translations
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-06-03 17:21:23 +03:00
Stan
8bf301aab3
Merge pull request #4118 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d file; add cloudflare family/protect
2020-06-02 06:18:34 -07:00
Stan Grishin
4ff9c263b0 luci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d file; add cloudflare family/protect
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-30 11:41:12 +00:00
Dirk Brenken
217d331d8d
luci-app-openvpn: fix recipe selection
* add read acl for 'openvpn_recipes', fixed #4112

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b646576696)
2020-05-29 19:17:38 +02:00
Jo-Philipp Wich
dd9624d35a luci-base: luci.js: properly skip comments when finding require tokens
Fixes: #4020, #4022, #4111
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6be8f8dbae)
2020-05-29 10:42:24 +02:00
Stan Grishin
a0cb8b64cd luci-app-simple-adblock: bugfix: proper processing of failed dowloads; decrease reliance on shell commands; proper acl.d file
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-27 00:38:29 +00:00
Hannu Nyman
39d5f2e5a6 treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-25 18:04:15 +03:00
Anton Kikin
515bd927da luci-base: ui.js: fix function declaration in nested statement
Fix "SyntaxError: Strict mode does not allow function declarations
in a lexically nested statement" error that may occur in some old
browsers (detected on QtWebKit 5.212).

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit c00d0d9473)
2020-05-24 18:25:00 +02:00
Brian J. Murrell
c7a1693de5 luci-app-mwan3: Remove unnecessary dependency
There is no need to depend on luci-app-firewall, so remove the dependency.

I have examined the code and cannot see any reason for the dependency
and I have built a router with luci-app-mwan3, and without firewall,
luci-app-firewall and it all functions just fine.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
(cherry picked from commit 70089cc212)
2020-05-24 18:07:54 +02:00
Jo-Philipp Wich
7fca170275 luci-base: firewall.js: remove further zone network/name fallback logic
Fixes: #4093
Fixes: 4052436d8 ("luci-base: firewall.js: don't treat zone name as network fallback")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6f4005d0b)
2020-05-24 17:33:53 +02:00
Hannu Nyman
0c6fd62d65 luci-app-statistics: modify default amount of data items in RRD
Increase the default number of data items in the RRD database
from 100 to 144. That leads to better matching summarising/averaging
moments between day & week and week & month at the averaging intervals:
30sec, 10min, 70 min, 5h10min, 2d13h

Previous 100 led too easily to situations, where the longer period's
more scarce data gets selected for displaying in the graph. That could
happen if the longer period's last data point was stored more recently
than the last data item in the originally required period.
(E.g. if the last "week data item" was more recent than the last
"day data item", the week data was used for the day chart.)

(Note: this change only applies in a live router if the RRD database is
empty. E.g after reboot or after emptying the RRD database dir.)

Reference to discussion at #4065

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 591b918ea4)
2020-05-21 17:19:55 +03:00
Jo-Philipp Wich
8d89f0d4e6 luci-app-vpnbypass: don't clobber permissions of VPN menu
Ref: https://github.com/openwrt/luci/issues/4066
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7f4de85b0b9c4f6bd9a19bf5a44af3825b31e8c1)
2020-05-19 12:43:40 +02:00
Jo-Philipp Wich
b73ca28c42 luci-app-vpn-policy-routing: don't clobber permissions of VPN menu
Ref: https://github.com/openwrt/luci/issues/4066
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4dcab51ca522407cf63a51883bc6505cf24fbd64)
2020-05-19 12:43:40 +02:00
Jo-Philipp Wich
3c441efa02 build: reload rpcd in package postinstall
Send a SIGHUP to rpcd after installing LuCI packages to reload ACL rules.

Also remove redundant code while we're at it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit ca558f4f93)
2020-05-19 12:41:35 +02:00
Jo-Philipp Wich
ecd49247eb treewide: stage ACL rules for legacy applications
Fixes: #3866
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 43e872871a)
2020-05-19 12:38:17 +02:00
Jo-Philipp Wich
ccd9d67598 luci-mod-system: make dropbear pages depend on dropbear executable
Fixes: #4052
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c7686d4b3c)
2020-05-17 19:33:54 +02:00
Hannu Nyman
fb2f363067
Merge pull request #4048 from hnyman/i18n-merge
build/i18n-merge-master: ignore apps deleted in master
2020-05-15 16:45:37 +03:00
Jo-Philipp Wich
ba0fb08d6d luci-mod-network: fix reading static route table value
Ref: https://forum.openwrt.org/t/static-route-shows-incorrect-table/63514
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8747513951)
2020-05-13 17:21:31 +02:00
Hannu Nyman
e4baee8d25 build/i18n-merge-master: ignore apps deleted in master
Refine the code to ignore apps that have been deleted from master
but still exist in release branches. E.g. luci-app-samba

Previously the unhandled git error from non-existing master
mangled the .po files in the release branch: the 18n header was
removed and all non-ASCII chars were deleted from translation.

Fix this by processing only those files where 'git show' succeeds.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-13 18:06:31 +03:00
Hannu Nyman
bcdb9fdc7f treewide: i18n - backport translations from master
Backport translations from master

1) i18n-sync to sync 19.07 itself
2) i18n-merge-master to backport from master
3) i18n-sync to clean-up, as merge-master makes also errors
4) revert luci-app-samba that gets mishandled  (removal from master causes ???)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-10 16:19:47 +03:00
Hannu Nyman
07e6cfaa89 timezone data: update to 2020a
Update timezone data to 2020a

http://mm.icann.org/pipermail/tz-announce/2020-April/000058.html

2020a:
    Morocco springs forward on 2020-05-31, not 2020-05-24.
    Canada's Yukon advanced to -07 year-round on 2020-03-08.
    America/Nuuk renamed from America/Godthab.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e5fe16c9ea)
2020-05-09 09:48:06 +03:00
Hannu Nyman
5366acbb6d treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-07 22:57:19 +03:00
Hannu Nyman
c835abaa40 treewide: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-07 22:52:56 +03:00
Jo-Philipp Wich
74b3715651 luci-base: optimize some PNG files
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f8cf115d9b)
2020-05-07 20:06:32 +02:00
Jo-Philipp Wich
618a1df922 luci-base: move old cbi icons to luci-compat
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 102124115d)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
20acf73b79 luci-base: replace filebrowser icons with SVG variants
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b34b7fc504)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
4decb6e3f2 luci-app-nlbwmon: use legacy L.dom attribute
Until it is converted to a proper view, we need to use the legacy alias.

Fixes: #3835
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit af6fd6dfab)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
6ca21c45f9 luci-app-nlbw: simplify table CSS
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6efaea2ffb)
2020-05-07 19:40:50 +02:00
Balázs Úr
8767267487 luci-app-nlbwmon: fix typos
Signed-off-by: Balázs Úr <balazs@urbalazs.hu>
(cherry picked from commit 44cef2ab44)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
f3b7f4101f luci-mod-status: convert menu nodes to JSON
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c698cd5ab9)
2020-05-07 19:40:50 +02:00
Florian Eckert
175644e6ac luci-theme-material: fix Makefile file mod
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 0024609a00)
2020-05-07 19:40:50 +02:00
Florian Eckert
ccdfbc2bb1 luci-theme-material: remove useless logging output
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 1b875a610f)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
eca8dee353 luci-theme-bootstrap: rework menu rendering
Utilize the LuCI.ui.menu class to load, traverse and cache the menu tree
in the local session store.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
[only render menu when logged in for 19.07]
(backported from commit 1ac8df2614)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
94f504f178 luci-theme-openwrt: rework menu rendering
Utilize the LuCI.ui.menu class to load, traverse and cache the menu tree
in the local session store.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
[only render menu when logged in for 19.07]
(backported from commit 48269ade61)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
cde76b0295 luci-base: implement JSON endpoint to fetch menu information
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
[require authentication for 19.07]
(backported from commit e56e442d6a)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
9b71880629 luci-base: expose currently dispatched node info to client side JS
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 94a0c57181)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
afad3ccf8f luci-base: convert menu nodes to JSON
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 16853bcd2e)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
ec50f8a784 luci-base: ui.js: hide unsatisfied firstchild menu nodes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7882f3ebdd)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
84e7e46353 luci-base: ui.js: add LuCI.ui.menu.flushCache() function
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 90a51ab3b9)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
5ce7daacda luci-base: ui.js: add LuCI.ui.menu helper class
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 930f28b606)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
8daa236263 luci-base: ui.js: use standard indicator framework to display uci changes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b6e93d54a0)
2020-05-07 19:40:50 +02:00
Jo-Philipp Wich
7159857639 luci-base: luci.js: use standard indicator framework for poll status
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 68b2ce84ec)
2020-05-07 19:40:50 +02:00
Chen Minqiang
7a47df9f07 luci-theme-*: set mediaurlbase if it is the first time to be installed
If we build multi-themes into firmware, each of them set itself
to be the default theme, what theme should it be?

To make it clear, we only set mediaurlbase if the theme is the
first time to be installed/built-in.

This resolve the issue that theme always change to somewhat default
after upgrading the firmware even with a config-keep-upgrade

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(backported from commit fc150636b9)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
9518d7f8c1 luci-theme-bootstrap: fix dynlist overflows
Fixes: #3795
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 015712bba0)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
7c29f560d5 luci-theme-openwrt: work around cssmin bug breaking the minified CSS.
The cssmin utility incorrectly breaks up calc() expressions when
minifying rules. Avoid the problem by trimming uneeded spaces.

Fixes: #3801
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 63057a08dc)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
d16600ff01 themes: generalize indicator markup and styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit ccb7e4a4a7)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
f4137a9225 luci-theme-bootstrap: dynamically adjust body margin
Fixes: #3722
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c99684dff7)
2020-05-07 19:40:49 +02:00