Jo-Philipp Wich [Fri, 30 Oct 2020 20:26:49 +0000 (21:26 +0100)]
Merge pull request #4420 from etactica/mos-nlocal-only-1907
19.07: mosquitto: support notifications_local_only flag
Jo-Philipp Wich [Fri, 30 Oct 2020 20:25:43 +0000 (21:25 +0100)]
Merge pull request #4486 from Robby-/openwrt-19.07-luci-app-firewall-packettoobig
[19.07] luci-app-firewall: rules: add ICMPv6 Packet Too Big (Type 2)
Dirk Brenken [Fri, 30 Oct 2020 19:30:37 +0000 (20:30 +0100)]
luci-app-adblock: change "refresh" action
* change "refresh" action to fix potential white-/blacklist issues
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
a392dbf888f0cdaee211eca9b58becc804ee3458)
Hannu Nyman [Mon, 26 Oct 2020 20:30:28 +0000 (22:30 +0200)]
treewide: i18n - backport and sync translations
Backport translations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Mon, 26 Oct 2020 20:26:08 +0000 (22:26 +0200)]
luci-base: set the fallback default of rollback timeout to 90s
Set the fallback value of the config change rollback timeout
to 90 seconds to match the change in /etc/config/luci by commit
81cf99a50.
That commit changed the value in the config file, but did
not change the underlying fallback values that do get applied
when there is no proper config item in etc/config/luci.
Users sysupgrading from old systems may have carried an ancient
/etc/config/luci (without rollback config) with them, so this
change should help them to see the intended user experience.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
b0fe11ffc4921c606b78ceb9756cc44579689005)
Hannu Nyman [Tue, 13 Oct 2020 15:50:33 +0000 (18:50 +0300)]
treewide: i18n - backport and sync translations
Backport translations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Robby K [Thu, 1 Oct 2020 20:52:58 +0000 (22:52 +0200)]
luci-app-firewall: rules: add ICMPv6 Packet Too Big (Type 2)
The "Match ICMP type" drop-down menu was missing this ICMPv6 type. According to RFC 4890 section 4.3.1 it is essential for communications and must not be dropped. This patch allows for doing this through LuCI.
Signed-off-by: Robby K <robbyke@gmail.com>
Hannu Nyman [Mon, 28 Sep 2020 13:31:38 +0000 (16:31 +0300)]
treewide: i18n - backport and sync translations
Backport transations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan [Mon, 21 Sep 2020 18:41:48 +0000 (11:41 -0700)]
Merge pull request #4458 from stangri/19.07-luci-app-vpnbypass
[19.07] luci-app-vpnbypass: ACL-related update
Stan [Mon, 21 Sep 2020 18:41:19 +0000 (11:41 -0700)]
Merge pull request #4461 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: ACL-related update
Stan Grishin [Mon, 21 Sep 2020 18:37:14 +0000 (18:37 +0000)]
luci-app-vpn-policy-routing: ACL-related update
Signed-off-by: Stan Grishin <stangri@melmac.net>
Stan Grishin [Mon, 21 Sep 2020 18:34:05 +0000 (18:34 +0000)]
luci-app-vpnbypass: ACL update
Signed-off-by: Stan Grishin <stangri@melmac.net>
Stan [Mon, 21 Sep 2020 04:30:28 +0000 (21:30 -0700)]
Merge pull request #4449 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: support for config auto-update
Stan Grishin [Sun, 20 Sep 2020 00:26:19 +0000 (00:26 +0000)]
luci-app-simple-adblock: support for config auto-update
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Sat, 19 Sep 2020 05:46:16 +0000 (08:46 +0300)]
luci-base: tweak busybox top regex to accept 'm' in large VSZ
Tweak the lua regex string for process list, so that processes
with extremely large memory sizes (over 100 MB) are matched.
For those large processes busybox top shows a MB value like '234m'
instead of a normal kB value like 234000.
Fixes #4425
Reference to https://github.com/openwrt/luci/issues/4425#issuecomment-
694073479
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
4f2ecd88fd02c1279041f45ccd758184b153c875)
Hannu Nyman [Thu, 17 Sep 2020 13:59:12 +0000 (16:59 +0300)]
treewide: i18n - backport and sync translations
Backport transations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Wed, 16 Sep 2020 08:27:13 +0000 (10:27 +0200)]
luci-app-nextdns: fix invalid XHTML
Fixes: #4423
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
233cacd9eb6919569f40d346901099956a3111d6)
Jo-Philipp Wich [Wed, 16 Sep 2020 08:23:35 +0000 (10:23 +0200)]
luci-base: dhcp.js: allow hostname to be "*"
Fixes: #4430
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bdcd09496342d3b8609e718e289656427fa0b28c)
Karl Palsson [Wed, 2 Sep 2020 09:09:38 +0000 (09:09 +0000)]
mosquitto: support notifications_local_only flag
Supported since mosquitto 1.5 released in May 2018, and has long
been supported in the init scripts.
Signed-off-by: Karl Palsson <karlp@etactica.com>
Baptiste Jonglez [Sun, 30 Aug 2020 12:22:54 +0000 (14:22 +0200)]
luci-app-opkg: flush menu cache after opkg actions
This is a partial backport of
dc57e4bc6c83d6c869c318256057e3636bfc5d66
Fixes: #4077
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
Hannu Nyman [Sat, 29 Aug 2020 18:37:11 +0000 (21:37 +0300)]
treewide: i18n - backport and sync translations
Backport transations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan [Thu, 27 Aug 2020 21:38:54 +0000 (14:38 -0700)]
Merge pull request #4392 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: add DNSPod.cn DoH
Stan Grishin [Thu, 27 Aug 2020 21:36:51 +0000 (21:36 +0000)]
luci-app-https-dns-proxy: add DNSPod.cn DoH
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Fri, 21 Aug 2020 04:31:33 +0000 (07:31 +0300)]
Merge pull request #4339 from EricLuehrsen/unbound_20200806_1907
[19.07] luci-app-unbound: add rate_limit and dns_assist option support
Hannu Nyman [Sun, 16 Aug 2020 19:47:20 +0000 (22:47 +0300)]
treewide: i18n - backport and sync translations
Backport translations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Sun, 16 Aug 2020 19:42:36 +0000 (22:42 +0300)]
luci-base i18n: fix translations related to password-SSH linkage
Fix translations of themes' headers related to password & SSH.
Adapted backport of commit
641c3b88ae.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Sun, 16 Aug 2020 19:32:56 +0000 (22:32 +0300)]
themes: remove deprecated reference to enabling SSH
Remove the reference to setting a password being linked to SSH capability.
(SSH has been initially enabled since year 2015.)
Backport of commit
258e74c1c
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Sat, 8 Aug 2020 14:46:07 +0000 (16:46 +0200)]
Merge pull request #4340 from plm/remove-rrd-path-double-escape
luci-app-statistics: remove rrd path double escape
Philip L. McMahon [Sat, 8 Aug 2020 04:20:23 +0000 (21:20 -0700)]
luci-app-statistics: remove rrd path double escape
Fixes rendering errors when RRD file names contain IPv6 addresses and the
colon (":") characters are double-escaped.
Reverts escaping added in #2286 in favor of escaping added in #2657.
Signed-off-by: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Eric Luehrsen [Thu, 16 Jul 2020 05:02:52 +0000 (01:02 -0400)]
luci-app-unbound: add rate_limit and dns_assist option support
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
Hannu Nyman [Mon, 3 Aug 2020 17:23:49 +0000 (20:23 +0300)]
treewide: backport and sync translations
Backport translations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan [Fri, 31 Jul 2020 09:53:01 +0000 (02:53 -0700)]
Merge pull request #4318 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security
Stan Grishin [Fri, 31 Jul 2020 09:36:54 +0000 (09:36 +0000)]
luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security
Signed-off-by: Stan Grishin <stangri@melmac.net>
Stan [Wed, 29 Jul 2020 09:45:21 +0000 (02:45 -0700)]
Merge pull request #4311 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: add OpenDNS servers
Stan Grishin [Wed, 29 Jul 2020 09:41:27 +0000 (09:41 +0000)]
luci-app-https-dns-proxy: add OpenDNS servers
Signed-off-by: Stan Grishin <stangri@melmac.net>
Jo-Philipp Wich [Wed, 22 Jul 2020 08:20:42 +0000 (10:20 +0200)]
luci-mod-system: ignore empty /proc/mtd on flash page
A present, but empty /proc/mtd causes validation on the flash page to fail,
preventing any other operation.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
d2d3738d9046339d6374a5957cb790d0d9d62456)
Hannu Nyman [Sat, 18 Jul 2020 11:22:34 +0000 (14:22 +0300)]
treewide: i18n - backport translations
Backport translations from master and sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Florian Eckert [Wed, 15 Jul 2020 13:47:35 +0000 (15:47 +0200)]
Merge pull request #4262 from TDT-AG/pr/
20200713-luci-app-mwan3
luci-app-mwan3: sync changes with mwan3
Florian Eckert [Wed, 8 Jul 2020 09:32:34 +0000 (11:32 +0200)]
luci-app-mwan3: fix diagnostics status page style issues
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
9daf129cbaf6d15716abf77517e4b7ea5d5f8249)
Florian Eckert [Mon, 9 Dec 2019 09:36:49 +0000 (10:36 +0100)]
luci-app-mwan3: use ucitrack is now done with mwan3 procd
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
40957b1c7851cd12833003496cd396ef9a687fcc)
Florian Eckert [Wed, 8 Jul 2020 09:32:34 +0000 (11:32 +0200)]
luci-app-mwan3: fix diagnostics status page style issues
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
9daf129cbaf6d15716abf77517e4b7ea5d5f8249)
Florian Eckert [Mon, 9 Dec 2019 09:36:49 +0000 (10:36 +0100)]
luci-app-mwan3: use ucitrack is now done with mwan3 procd
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
40957b1c7851cd12833003496cd396ef9a687fcc)
Jo-Philipp Wich [Sat, 4 Jul 2020 22:51:59 +0000 (00:51 +0200)]
luci-app-firewall: migrate syn_flood option to synflood_protect on save
Fixes: #4220
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
0abcb39b623f0eff0fbcdfb99fca8f3224701e86)
Jo-Philipp Wich [Fri, 3 Jul 2020 12:30:30 +0000 (14:30 +0200)]
luci-base: ui.js: order menu entries with the same weight by name
The previous server side menu rendering ordered items first by their order
weight value, then by their internal name.
Do the same for client side menu rendering.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
0c479891ae31bbe308c4d6e181c118ec3d65c05f)
Karl Palsson [Tue, 30 Jun 2020 15:40:52 +0000 (15:40 +0000)]
luci-base: allow themes to provide sysauth.htm
Support for sysauth_template was (inadvertently) dropped in refactorings
to support the json menu construction. This does not restore that
functionality, which allowed different templates for every node in the
dispatcher tree, but provides an alternative mechanism that allows a
theme to provide a sysauth.htm template file instead.
Tested-by: Karl Palsson <karlp@etactica.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8f9433127e5d2a576a1207da46d02389b82041a5)
Dirk Brenken [Fri, 26 Jun 2020 17:35:58 +0000 (19:35 +0200)]
luci-app-travelmate: qrcode fix
* escape more special chars which disturb qrcode generation
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
06ce62b65d05806d39099b46102579eeff66aad2)
Stan Grishin [Thu, 25 Jun 2020 20:07:08 +0000 (20:07 +0000)]
luci-app-https-dns-proxy: bugfix: remove eDNS support
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Wed, 24 Jun 2020 20:26:31 +0000 (23:26 +0300)]
treewide: i18n - backport translations
Backport translations from master.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Mon, 15 Jun 2020 17:12:48 +0000 (20:12 +0300)]
treewide: i18n - backport translations
Backport translations from master.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Sun, 14 Jun 2020 14:41:02 +0000 (16:41 +0200)]
luci-base: form.js: fix handling of array sections in JSONMap forms
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
682f628ea611d8d12a2a4b5925851f99c5a4bd20)
Stan Grishin [Sat, 13 Jun 2020 20:45:54 +0000 (20:45 +0000)]
luci-app-simple-adblock: racially-neutral names
Signed-off-by: Stan Grishin <stangri@melmac.net>
Dirk Brenken [Sat, 13 Jun 2020 06:37:59 +0000 (08:37 +0200)]
Merge pull request #4168 from dibdot/adb-19.07
luci-app-adblock [19.07]: sync with adblock 4.0.6
Dirk Brenken [Sat, 13 Jun 2020 06:30:37 +0000 (08:30 +0200)]
luci-app-adblock [19.07]: sync with adblock 4.0.6
* made SafeSearch provider configurable, you can limit
SafeSearch to certain providers
* add an explanation paragraph to report settings
tab (regarding restart requirement)
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
Stan [Thu, 11 Jun 2020 19:56:14 +0000 (12:56 -0700)]
Merge pull request #4153 from stangri/19.07-luci-app-advanced-reboot
[19.07] luci-app-advanced-reboot: bugfix: new board names for Linksys WRT-devices
Stan Grishin [Wed, 10 Jun 2020 16:49:11 +0000 (16:49 +0000)]
luci-app-advanced-reboot: bugfix: support new board names for Linksys WRT-devices
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Tue, 9 Jun 2020 20:23:38 +0000 (23:23 +0300)]
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
219f0ce891a2e59d28a2dd8a1d14a29e35a81185)
Stan [Wed, 3 Jun 2020 15:27:44 +0000 (08:27 -0700)]
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
Hannu Nyman [Wed, 3 Jun 2020 14:21:23 +0000 (17:21 +0300)]
treewide: i18n - backport translations
Backport translations from master.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan [Tue, 2 Jun 2020 13:18:34 +0000 (06:18 -0700)]
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
Stan Grishin [Sat, 30 May 2020 11:41:12 +0000 (11:41 +0000)]
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>
Dirk Brenken [Fri, 29 May 2020 17:09:49 +0000 (19:09 +0200)]
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
b6465766966c9e1d06778eb6d3d0a4be3920606d)
Jo-Philipp Wich [Fri, 29 May 2020 07:56:06 +0000 (09:56 +0200)]
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
6be8f8dbaee90a8a7e8bc87350f21793b9aed35c)
Stan Grishin [Wed, 27 May 2020 00:38:29 +0000 (00:38 +0000)]
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>
Hannu Nyman [Mon, 25 May 2020 15:04:15 +0000 (18:04 +0300)]
treewide: i18n - backport translations from master
Backport translations from master.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Anton Kikin [Sat, 23 May 2020 23:12:20 +0000 (02:12 +0300)]
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
c00d0d9473803eec3248f0f6d7f3404923c80514)
Brian J. Murrell [Fri, 13 Mar 2020 09:42:11 +0000 (05:42 -0400)]
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
70089cc212f92ee5660db69e32b10e552df3c1c5)
Jo-Philipp Wich [Sun, 24 May 2020 15:32:14 +0000 (17:32 +0200)]
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
f6f4005d0baf70f04752747822cda9f1248c47ca)
Hannu Nyman [Thu, 21 May 2020 14:19:55 +0000 (17:19 +0300)]
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
591b918ea4e67d863c74d3d99bd5878c38d06761)
Jo-Philipp Wich [Tue, 19 May 2020 10:28:19 +0000 (12:28 +0200)]
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)
Jo-Philipp Wich [Tue, 19 May 2020 10:27:44 +0000 (12:27 +0200)]
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)
Jo-Philipp Wich [Tue, 3 Mar 2020 08:28:44 +0000 (09:28 +0100)]
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
ca558f4f93451de7afb2a85c017051cb807b3329)
Jo-Philipp Wich [Fri, 10 Apr 2020 21:21:35 +0000 (23:21 +0200)]
treewide: stage ACL rules for legacy applications
Fixes: #3866
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
43e872871a85dce70509c3c97c10e9c61788c378)
Jo-Philipp Wich [Sun, 17 May 2020 17:32:26 +0000 (19:32 +0200)]
luci-mod-system: make dropbear pages depend on dropbear executable
Fixes: #4052
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
c7686d4b3c660dfe44eb2decbedce89c0873649e)
Hannu Nyman [Fri, 15 May 2020 13:45:37 +0000 (16:45 +0300)]
Merge pull request #4048 from hnyman/i18n-merge
build/i18n-merge-master: ignore apps deleted in master
Jo-Philipp Wich [Wed, 13 May 2020 15:20:05 +0000 (17:20 +0200)]
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
87475139516d37d86c038e7432837f6ba409d7a9)
Hannu Nyman [Wed, 13 May 2020 14:49:39 +0000 (17:49 +0300)]
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>
Hannu Nyman [Sun, 10 May 2020 13:16:09 +0000 (16:16 +0300)]
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>
Hannu Nyman [Sat, 9 May 2020 06:45:05 +0000 (09:45 +0300)]
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
e5fe16c9ea405ac8c58607f5083eecd3551ef4ae)
Hannu Nyman [Thu, 7 May 2020 19:57:19 +0000 (22:57 +0300)]
treewide: i18n - backport translations from master
Backport translations from master.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Thu, 7 May 2020 19:52:56 +0000 (22:52 +0300)]
treewide: sync translations
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Thu, 7 May 2020 18:04:55 +0000 (20:04 +0200)]
luci-base: optimize some PNG files
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f8cf115d9b7525d3d9b259c20a4d2e662bcb7e22)
Jo-Philipp Wich [Thu, 7 May 2020 17:15:02 +0000 (19:15 +0200)]
luci-base: move old cbi icons to luci-compat
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
102124115d4c2e204bf4cf1ffafe1d8b304fd0df)
Jo-Philipp Wich [Thu, 7 May 2020 17:38:50 +0000 (19:38 +0200)]
luci-base: replace filebrowser icons with SVG variants
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b34b7fc504ba4ba27dfe7c2c446c3085a923f952)
Jo-Philipp Wich [Sat, 4 Apr 2020 10:00:20 +0000 (12:00 +0200)]
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
af6fd6dfab2ac576033c714cc69520e17f1fa48c)
Jo-Philipp Wich [Wed, 25 Mar 2020 11:48:11 +0000 (12:48 +0100)]
luci-app-nlbw: simplify table CSS
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
6efaea2ffb46f9909038b85cf12e7acf4467ae2e)
Balázs Úr [Fri, 27 Dec 2019 14:31:13 +0000 (15:31 +0100)]
luci-app-nlbwmon: fix typos
Signed-off-by: Balázs Úr <balazs@urbalazs.hu>
(cherry picked from commit
44cef2ab4493d8fb2d0bbdc0831a2e23cd2acf2c)
Jo-Philipp Wich [Tue, 10 Dec 2019 07:49:24 +0000 (08:49 +0100)]
luci-mod-status: convert menu nodes to JSON
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
c698cd5ab9ad9021ac7b92a45d7ba401cb3617d0)
Florian Eckert [Mon, 4 May 2020 10:43:17 +0000 (12:43 +0200)]
luci-theme-material: fix Makefile file mod
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
0024609a0057ffc6adad4fa33bfeb7202b8dd454)
Florian Eckert [Thu, 16 Apr 2020 18:55:30 +0000 (20:55 +0200)]
luci-theme-material: remove useless logging output
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
1b875a610f0cb835f9472b55d726dc339f9af633)
Jo-Philipp Wich [Wed, 15 Apr 2020 20:46:25 +0000 (22:46 +0200)]
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
1ac8df2614336b34109375e62f201cf6bac46734)
Jo-Philipp Wich [Wed, 15 Apr 2020 20:43:05 +0000 (22:43 +0200)]
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
48269ade6163c34f348632bf225e2c6649b0a9c1)
Jo-Philipp Wich [Wed, 15 Apr 2020 20:25:48 +0000 (22:25 +0200)]
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
e56e442d6af125522214a9bc9ab957ac39c5c0c8)
Jo-Philipp Wich [Wed, 15 Apr 2020 20:13:33 +0000 (22:13 +0200)]
luci-base: expose currently dispatched node info to client side JS
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
94a0c571810da25043ca3599561bd9b369c0c65e)
Jo-Philipp Wich [Fri, 6 Dec 2019 20:51:32 +0000 (21:51 +0100)]
luci-base: convert menu nodes to JSON
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
16853bcd2e4224c281731adbfa490d704784ec20)
Jo-Philipp Wich [Sat, 18 Apr 2020 21:05:01 +0000 (23:05 +0200)]
luci-base: ui.js: hide unsatisfied firstchild menu nodes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
7882f3ebdde0364314a45aa6dd8fbc4e766e8ea8)
Jo-Philipp Wich [Thu, 16 Apr 2020 13:13:26 +0000 (15:13 +0200)]
luci-base: ui.js: add LuCI.ui.menu.flushCache() function
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
90a51ab3b9afca0144a93eb967fcd72a230732f0)
Jo-Philipp Wich [Wed, 15 Apr 2020 20:30:00 +0000 (22:30 +0200)]
luci-base: ui.js: add LuCI.ui.menu helper class
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
930f28b606d8a7b3cb511e57bd8028b1979ce5da)
Jo-Philipp Wich [Mon, 13 Apr 2020 10:31:54 +0000 (12:31 +0200)]
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
b6e93d54a0f9c6be310e07a66ac08532ba6400b0)
Jo-Philipp Wich [Mon, 13 Apr 2020 10:41:26 +0000 (12:41 +0200)]
luci-base: luci.js: use standard indicator framework for poll status
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
68b2ce84ece62e3aec98b9be31e61ec5f6cdba2d)
Chen Minqiang [Fri, 3 Apr 2020 10:10:04 +0000 (18:10 +0800)]
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
fc150636b9393e31aa7d5a8d8320b111476ba2f1)
projects / project / luci.git / log