project/luci.git
3 years agotreewide: i18n - backport and sync translations
Hannu Nyman [Mon, 28 Sep 2020 13:41:40 +0000 (16:41 +0300)]
treewide: i18n - backport and sync translations

Backport translations from master and 19.07.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #4459 from stangri/18.06-luci-app-vpnbypass
Stan [Mon, 21 Sep 2020 18:41:54 +0000 (11:41 -0700)]
Merge pull request #4459 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: ACL-related update

3 years agoluci-app-vpnbypass: ACL update 4459/head
Stan Grishin [Mon, 21 Sep 2020 18:34:19 +0000 (18:34 +0000)]
luci-app-vpnbypass: ACL update

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoMerge pull request #4450 from stangri/18.06-luci-app-simple-adblock
Stan [Mon, 21 Sep 2020 04:30:45 +0000 (21:30 -0700)]
Merge pull request #4450 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: support for config auto-update

3 years agoluci-app-simple-adblock: support for config auto-update 4450/head
Stan Grishin [Sun, 20 Sep 2020 00:26:30 +0000 (00:26 +0000)]
luci-app-simple-adblock: support for config auto-update

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoluci-base: tweak busybox top regex to accept 'm' in large VSZ
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)

3 years agoluci-app-uhttpd: i18n - fix zh-cn translation
Liangbin Lian [Tue, 15 Sep 2020 14:43:04 +0000 (22:43 +0800)]
luci-app-uhttpd: i18n - fix zh-cn translation

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
3 years agotreewide: i18n - backport and sync translations
Hannu Nyman [Sat, 29 Aug 2020 18:40:51 +0000 (21:40 +0300)]
treewide: i18n - backport and sync translations

Backport translations from master and 19.07.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #4393 from stangri/18.06-luci-app-https-dns-proxy
Stan [Thu, 27 Aug 2020 21:38:58 +0000 (14:38 -0700)]
Merge pull request #4393 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: add DNSPod.cn DoH

3 years agoluci-app-https-dns-proxy: add DNSPod.cn DoH 4393/head
Stan Grishin [Thu, 27 Aug 2020 21:37:04 +0000 (21:37 +0000)]
luci-app-https-dns-proxy: add DNSPod.cn DoH

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoMerge pull request #4319 from stangri/18.06-luci-app-https-dns-proxy
Stan [Fri, 31 Jul 2020 09:53:11 +0000 (02:53 -0700)]
Merge pull request #4319 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security

3 years agoluci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security 4319/head
Stan Grishin [Fri, 31 Jul 2020 09:37:10 +0000 (09:37 +0000)]
luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoMerge pull request #4312 from stangri/18.06-luci-app-https-dns-proxy
Stan [Wed, 29 Jul 2020 09:45:26 +0000 (02:45 -0700)]
Merge pull request #4312 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: add OpenDNS servers

3 years agoluci-app-https-dns-proxy: add OpenDNS servers 4312/head
Stan Grishin [Wed, 29 Jul 2020 09:41:42 +0000 (09:41 +0000)]
luci-app-https-dns-proxy: add OpenDNS servers

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoucitrack: fix bug for exec with params
jjm2473 [Sun, 22 Mar 2020 16:58:46 +0000 (00:58 +0800)]
ucitrack: fix bug for exec with params

In file `/etc/config/ucitrack`
```
config fstab
        option exec '/sbin/block mount'
```
`/sbin/block mount` never be called after fstab changed.

Signed-off-by: jjm2473 <1129525450@qq.com>
(cherry picked from commit 97780a9ce158097e17ed7842ae01e765d5da4955)

3 years agotreewide: i18n - backport translations
Hannu Nyman [Sat, 18 Jul 2020 11:26:51 +0000 (14:26 +0300)]
treewide: i18n - backport translations

Backport translations from master & 19.07.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-https-dns-proxy: bugfix: remove eDNS support
Stan Grishin [Thu, 25 Jun 2020 20:07:23 +0000 (20:07 +0000)]
luci-app-https-dns-proxy: bugfix: remove eDNS support

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agotreewide: i18n - backport translations
Hannu Nyman [Wed, 24 Jun 2020 20:31:51 +0000 (23:31 +0300)]
treewide: i18n - backport translations

Backport translations from master and 19.07.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agotreewide: i18n - backport translations
Hannu Nyman [Wed, 17 Jun 2020 18:41:49 +0000 (21:41 +0300)]
treewide: i18n - backport translations

Backport translations from 19.07 and master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #4107 from fanck0605/patch-1
Jo-Philipp Wich [Tue, 16 Jun 2020 15:12:57 +0000 (17:12 +0200)]
Merge pull request #4107 from fanck0605/patch-1

[18.06] luci-app-ddns: remove duplicate help.gif

3 years agoluci-app-simple-adblock: racially-neutral names
Stan Grishin [Sat, 13 Jun 2020 20:46:06 +0000 (20:46 +0000)]
luci-app-simple-adblock: racially-neutral names

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoMerge pull request #4103 from stangri/18.06-luci-app-simple-adblock
Stan [Wed, 3 Jun 2020 15:27:48 +0000 (08:27 -0700)]
Merge pull request #4103 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: proper processing of failed downloads; decrease reliance on shell commands; proper acl.d file

3 years agoMerge pull request #4119 from stangri/18.06-luci-app-https-dns-proxy
Stan [Tue, 2 Jun 2020 13:18:40 +0000 (06:18 -0700)]
Merge pull request #4119 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d file; add cloudflare family/protect

4 years agoluci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d file... 4119/head
Stan Grishin [Sat, 30 May 2020 11:41:26 +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>
4 years agoluci-app-ddns: remove duplicate help.gif 4107/head
Chuck [Wed, 27 May 2020 16:21:57 +0000 (00:21 +0800)]
luci-app-ddns: remove duplicate help.gif

class `cbi-value-description` already contains help.gif
it's not necessary to add one manually

Signed-off-by: Chuck <fanck0605@qq.com>
4 years agoMerge pull request #4104 from fanck0605/patch-2
Hannu Nyman [Wed, 27 May 2020 09:46:01 +0000 (12:46 +0300)]
Merge pull request #4104 from fanck0605/patch-2

[18.06] luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

4 years agoluci-app-ddns: fix typo for has_curlssl() 4104/head
leonghui [Sat, 5 Jan 2019 10:38:25 +0000 (10:38 +0000)]
luci-app-ddns: fix typo for has_curlssl()

Fixes the incorrect message "HTTPS not supported please disable !" when curl with https support is present.
grep returns exit code 0 when a match is found.

This cherry-picks commit 199d4b1d5c45111919ac5c1844ee5e37d14273a1

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
Signed-off-by: Chuck <fanck0605@qq.com>
4 years agoluci-app-ddns: fix huge typo in luasrc/tools/ddns.lua
yangfl [Thu, 2 Aug 2018 02:51:25 +0000 (10:51 +0800)]
luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

This cherry-picks commit d81c8d0e6baf8a8a3e72aec4d6fc9a276d620263

Signed-off-by: David Yang <mmyangfl@gmail.com>
Signed-off-by: Chuck <fanck0605@qq.com>
4 years agoluci-app-simple-adblock: bugfix: proper processing of failed dowloads; decrease relia... 4103/head
Stan Grishin [Wed, 27 May 2020 00:38:40 +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>
4 years agotreewide: i18n - backport translations
Hannu Nyman [Mon, 25 May 2020 15:13:39 +0000 (18:13 +0300)]
treewide: i18n - backport translations

Backport translations from 19.07 and master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agotreewide: i18n - sync translations and backport from 19.07 and master
Hannu Nyman [Fri, 15 May 2020 14:06:51 +0000 (17:06 +0300)]
treewide: i18n - sync translations and backport from 19.07 and master

* sync translations
* backport applicable translations from 19.07 and master

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agobuild: add i18n-merge-openwrt-19.07
Hannu Nyman [Fri, 15 May 2020 13:59:59 +0000 (16:59 +0300)]
build: add i18n-merge-openwrt-19.07

Support backporting translation strings from 19.07 to 18.06 by adding a script for that.

Targeted workflow is:
1) sync 18.06 to apps
2) backport 19.07 translations
3) re-sync 18.06 just in case
4) backport master translations
5) re-sync 18.06 just in case

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agobuild/i18n-merge-master: ignore apps deleted in master
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>
(cherry picked from commit e4baee8d254fef2688381ea33072db5a48cd0495)

4 years agobuild: add script to merge master translation into branches
Jo-Philipp Wich [Wed, 29 Jan 2020 07:29:17 +0000 (08:29 +0100)]
build: add script to merge master translation into branches

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cab574958c580c38ca8dc852d8dada1681d62046)

4 years agoMerge pull request #3953 from sunnyqeen/openwrt-18.06
Hannu Nyman [Thu, 14 May 2020 07:19:34 +0000 (10:19 +0300)]
Merge pull request #3953 from sunnyqeen/openwrt-18.06

 luci-mod-admin-full: fixed ipv6 address display in the overview page of luci 18.06

4 years agoluci-mod-admin-full: fixed ipv6 address display in the overview page of luci 3953/head
sunnyqeen [Wed, 22 Apr 2020 12:55:59 +0000 (14:55 +0200)]
luci-mod-admin-full: fixed ipv6 address display in the overview page of luci

Signed-off-by: sunnyqeen <sunnyqeen@gmail.com>
4 years agoluci-app-commands: do not escape pipe on cmd line
Florian Eckert [Mon, 16 Sep 2019 09:02:53 +0000 (11:02 +0200)]
luci-app-commands: do not escape pipe on cmd line

fixes #4036

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 8120e1d484ec6b46768593ea1a8c569fe2a60637)

4 years agotimezone data: update to 2020a
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)

4 years agoMerge pull request #4003 from stangri/18.06-luci-app-vpnbypass
Stan [Sun, 3 May 2020 19:49:28 +0000 (12:49 -0700)]
Merge pull request #4003 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: better localizeable resources

4 years agoluci-app-vpnbypass: better localizeable resources 4003/head
Stan Grishin [Sat, 2 May 2020 22:18:03 +0000 (22:18 +0000)]
luci-app-vpnbypass: better localizeable resources

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3999 from stangri/18.06-luci-app-simple-adblock
Stan [Sat, 2 May 2020 16:21:01 +0000 (09:21 -0700)]
Merge pull request #3999 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources

4 years agoMerge pull request #3993 from stangri/18.06-luci-app-https-dns-proxy
Stan [Sat, 2 May 2020 16:17:21 +0000 (09:17 -0700)]
Merge pull request #3993 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources

4 years agoluci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable... 3999/head
Stan Grishin [Sat, 2 May 2020 16:01:06 +0000 (16:01 +0000)]
luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable... 3993/head
Stan Grishin [Sat, 2 May 2020 15:32:01 +0000 (15:32 +0000)]
luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3961 from stangri/18.06-luci-app-https-dns-proxy
Hannu Nyman [Fri, 24 Apr 2020 14:32:23 +0000 (17:32 +0300)]
Merge pull request #3961 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: add CIRA Canadian Shiled

4 years agoluci-app-https-dns-proxy: add CIRA Canadian Shiled 3961/head
Stan Grishin [Fri, 24 Apr 2020 10:06:16 +0000 (10:06 +0000)]
luci-app-https-dns-proxy: add CIRA Canadian Shiled

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3945 from stangri/18.06-luci-app-simple-adblock 3952/head
Hannu Nyman [Tue, 21 Apr 2020 16:48:36 +0000 (19:48 +0300)]
Merge pull request #3945 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: get package version from opkg

4 years agoluci-app-simple-adblock: bugfix: get package version from opkg 3945/head
Stan Grishin [Tue, 21 Apr 2020 00:51:41 +0000 (00:51 +0000)]
luci-app-simple-adblock: bugfix: get package version from opkg

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-app-advanced-reboot: fix syntax
Hannu Nyman [Sun, 12 Apr 2020 05:57:38 +0000 (08:57 +0300)]
luci-app-advanced-reboot: fix syntax

Add the missing ")" to lines 45 and 54.
Fixes 75a4a80c1dd
Fixes #3903

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2c812fbd58fd7399969185cc501bdba561d98d95)

4 years agoMerge pull request #3900 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Sat, 11 Apr 2020 12:39:46 +0000 (15:39 +0300)]
Merge pull request #3900 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: improve i18n

4 years agoluci-app-simple-adblock: improve i18n 3900/head
Stan Grishin [Sat, 11 Apr 2020 11:39:43 +0000 (11:39 +0000)]
luci-app-simple-adblock: improve i18n

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3879 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Sat, 11 Apr 2020 07:51:12 +0000 (10:51 +0300)]
Merge pull request #3879 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: bring up-to-date with master

4 years agoluci-app-advanced-reboot: improve localization by moving from translate to translatef 3879/head
Stan Grishin [Sat, 11 Apr 2020 01:11:49 +0000 (01:11 +0000)]
luci-app-advanced-reboot: improve localization by moving from translate to translatef

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3854 from stangri/18.06-luci-app-https-dns-proxy
Hannu Nyman [Tue, 7 Apr 2020 07:18:17 +0000 (10:18 +0300)]
Merge pull request #3854 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS

4 years agoluci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS. 3854/head
Stan Grishin [Mon, 6 Apr 2020 14:00:33 +0000 (14:00 +0000)]
luci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS.

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3830 from stangri/18.06-luci-app-https-dns-proxy
Hannu Nyman [Fri, 3 Apr 2020 12:57:25 +0000 (15:57 +0300)]
Merge pull request #3830 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: better service control & buttons styling

4 years agoMerge pull request #3827 from stangri/18.06-luci-app-vpnbypass
Hannu Nyman [Fri, 3 Apr 2020 12:56:33 +0000 (15:56 +0300)]
Merge pull request #3827 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: better service control & buttons styling

4 years agoMerge pull request #3822 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Fri, 3 Apr 2020 12:51:12 +0000 (15:51 +0300)]
Merge pull request #3822 from stangri/18.06-luci-app-simple-adblock

[18..06] luci-app-simple-adblock: better service control & buttons styling

4 years agoluci-app-https-dns-proxy: better service control & buttons styling 3830/head
Stan Grishin [Fri, 3 Apr 2020 12:50:35 +0000 (12:50 +0000)]
luci-app-https-dns-proxy: better service control & buttons styling

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-app-vpnbypass: better service control & buttons styling 3827/head
Stan Grishin [Fri, 3 Apr 2020 12:32:47 +0000 (12:32 +0000)]
luci-app-vpnbypass: better service control & buttons styling

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-app-simple-adblock: better service control & buttons styling 3822/head
Stan Grishin [Fri, 3 Apr 2020 12:25:40 +0000 (12:25 +0000)]
luci-app-simple-adblock: better service control & buttons styling

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3794 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Sun, 29 Mar 2020 07:02:06 +0000 (10:02 +0300)]
Merge pull request #3794 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: better status/error display, better service control

4 years agoluci-app-simple-adblock: better status/error display 3794/head
Stan Grishin [Sun, 29 Mar 2020 05:22:51 +0000 (05:22 +0000)]
luci-app-simple-adblock: better status/error display

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-base: iface_get_network(): fix condition
Jo-Philipp Wich [Wed, 4 Mar 2020 07:19:01 +0000 (08:19 +0100)]
luci-base: iface_get_network(): fix condition

Fixes: #3717
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-base: iface_get_network(): fix condition
Jo-Philipp Wich [Tue, 3 Mar 2020 19:36:54 +0000 (20:36 +0100)]
luci-base: iface_get_network(): fix condition

Fixes: #3715
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-base: cbi.js: fix unintended number sign overflow in format
Jo-Philipp Wich [Tue, 3 Sep 2019 17:25:39 +0000 (19:25 +0200)]
luci-base: cbi.js: fix unintended number sign overflow in format

Fixes: #3003
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 6d9a23af60f796e14dd9652d4f401db1a5ac456f)

4 years agoMerge pull request #3423 from stangri/18.06-luci-app-https-dns-proxy
Hannu Nyman [Thu, 19 Dec 2019 18:53:11 +0000 (20:53 +0200)]
Merge pull request #3423 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: package name change, support for RFC8484 binary

4 years agoluci-app-https-dns-proxy: package name change, support for RFC8484 binary 3423/head
Stan Grishin [Thu, 19 Dec 2019 18:20:27 +0000 (11:20 -0700)]
luci-app-https-dns-proxy: package name change, support for RFC8484 binary

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoi18n: sync translations
Hannu Nyman [Sat, 30 Nov 2019 09:35:52 +0000 (11:35 +0200)]
i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #3368 from stangri/18.06-luci-app-advanced-reboot
Florian Eckert [Thu, 28 Nov 2019 06:25:40 +0000 (07:25 +0100)]
Merge pull request #3368 from stangri/18.06-luci-app-advanced-reboot

luci-app-advanced-reboot: better information for snapshots

4 years agoluci-app-advanced-reboot: better information for snapshots 3368/head
Stan Grishin [Wed, 27 Nov 2019 15:32:46 +0000 (08:32 -0700)]
luci-app-advanced-reboot: better information for snapshots

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3338 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Wed, 20 Nov 2019 06:24:47 +0000 (08:24 +0200)]
Merge pull request #3338 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: add logger messages, README update

4 years agoluci-app-advanced-reboot: add logger messages, README update 3338/head
Stan Grishin [Tue, 19 Nov 2019 23:55:51 +0000 (16:55 -0700)]
luci-app-advanced-reboot: add logger messages, README update

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3335 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Tue, 19 Nov 2019 17:29:53 +0000 (19:29 +0200)]
Merge pull request #3335 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors

4 years agoluci-app-advanced-reboot: bugfix: luci error on reboot, logger errors 3335/head
Stan Grishin [Tue, 19 Nov 2019 16:54:37 +0000 (09:54 -0700)]
luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agotreewide: fix "Unhandled token" errors with Lua CBI maps
Jo-Philipp Wich [Sat, 16 Nov 2019 17:23:43 +0000 (18:23 +0100)]
treewide: fix "Unhandled token" errors with Lua CBI maps

The `data-type` attribute is used to bind datatype validators to a widget
while some templates used the same attribute to denote the name of the
underlying widget.

Change the `data-type` attributes referring to the widget name to
`data-widget` in order to stop the JS token error spam.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 13e9e3e9e8633c7a54fe5fec1481e9df62594982)

4 years agoMerge pull request #3313 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Sat, 16 Nov 2019 09:22:50 +0000 (11:22 +0200)]
Merge pull request #3313 from stangri/18.06-luci-app-advanced-reboot

luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers

4 years agoluci-app-advanced-reboot: show OpenWrt info on compatible NAND routers 3313/head
Stan Grishin [Fri, 15 Nov 2019 23:42:13 +0000 (16:42 -0700)]
luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-app-firewall: fix stored XSS in rule-details.lua
Jo-Philipp Wich [Fri, 15 Nov 2019 18:05:05 +0000 (19:05 +0100)]
luci-app-firewall: fix stored XSS in rule-details.lua

A previous fix to this file failed to address a second instance of the
same issue.

Fixes: c048f23ba ("luci-app-firewall: fix stored XSS in rule- and forward detail pages")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-compat: add transitional package
Jo-Philipp Wich [Thu, 14 Nov 2019 10:21:09 +0000 (11:21 +0100)]
luci-compat: add transitional package

Add an empty luci-compat package to allow forward compatibility with
openwrt-19.07 and master for packages that support all three branches.

Ref: https://forum.openwrt.org/t/luci-compat-and-18-06/48369
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-app-nlbwon: fix parsing relative interval values from config
Jo-Philipp Wich [Wed, 13 Nov 2019 16:08:58 +0000 (17:08 +0100)]
luci-app-nlbwon: fix parsing relative interval values from config

Fixes: #3302
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2e8aa301aa2a1aa07438de8dd962c21f0c8559f2)

4 years agoluci-lib-jsonc: store large JSON integer values as Lua doubles
Jo-Philipp Wich [Wed, 13 Nov 2019 08:03:38 +0000 (09:03 +0100)]
luci-lib-jsonc: store large JSON integer values as Lua doubles

Fixes: #3293
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8da8f38bf97c925f6f113d3b4793edb23e7e0dc2)

4 years agoluci-mod-admin-full: proper SSID escaping in wifi join and iface overview
Jo-Philipp Wich [Tue, 5 Nov 2019 13:32:09 +0000 (14:32 +0100)]
luci-mod-admin-full: proper SSID escaping in wifi join and iface overview

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-mod-system: validate log_ip as "host" instead of just ipaddr
Yousong Zhou [Mon, 4 Nov 2019 03:03:13 +0000 (03:03 +0000)]
luci-mod-system: validate log_ip as "host" instead of just ipaddr

Fixes FS#2444

A replicate of commit 90051b685 on master branch

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
4 years agoMerge pull request #3246 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Tue, 29 Oct 2019 05:25:47 +0000 (06:25 +0100)]
Merge pull request #3246 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: bugfix: call to action has no parent node

4 years agoluci-app-vpnbypass: bugfix: call to action has no parent node 3246/head
Stan Grishin [Mon, 28 Oct 2019 23:35:10 +0000 (16:35 -0700)]
luci-app-vpnbypass: bugfix: call to action has no parent node

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3225 from stangri/18.06-luci-app-vpnbypass
Jo-Philipp Wich [Mon, 28 Oct 2019 09:14:53 +0000 (10:14 +0100)]
Merge pull request #3225 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: better service control buttons

4 years agoluci-app-openvpn: fix traceback for undefined fs value
Florian Eckert [Thu, 24 Oct 2019 07:16:12 +0000 (09:16 +0200)]
luci-app-openvpn: fix traceback for undefined fs value

This will fix the traceback for undefined fs value.
The bug was added by the cherry-pick commit
ca781af2f8052d2469d3e6f533208c9e6e9648d4 from master branch.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
4 years agoluci-app-openvpn: add missing proto param for ipv6
Florian Eckert [Mon, 14 Oct 2019 08:44:25 +0000 (10:44 +0200)]
luci-app-openvpn: add missing proto param for ipv6

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 18037444b57104a0a62f6c1c16f308ee2dd81a36)
Update commit to apply cleanly

4 years agoluci-app-vpnbypass: better service control buttons 3225/head
Stan Grishin [Sun, 20 Oct 2019 22:42:34 +0000 (15:42 -0700)]
luci-app-vpnbypass: better service control buttons

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-proto-vpnc: expose defaultroute option in proto_vpnc.lua
Whitronic [Thu, 8 Nov 2018 11:25:43 +0000 (11:25 +0000)]
luci-proto-vpnc: expose defaultroute option in proto_vpnc.lua

Sometimes people only want the VPN connection to be a route to a specific
network, not the default gateway for all traffic.

I've tested this on my router and works fine!

Submitted-by: Whitronic <joao.f.vieira@gmail.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f4212285d474a9f75a55d7c39ae1ac70dc04d1e0)

4 years agoMerge pull request #3213 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Fri, 18 Oct 2019 14:58:06 +0000 (16:58 +0200)]
Merge pull request #3213 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: bugfix: properly restart dnsmasq

4 years agoluci-app-vpnbypass: bugfix: properly restart dnsmasq 3213/head
Stan Grishin [Fri, 18 Oct 2019 14:14:40 +0000 (07:14 -0700)]
luci-app-vpnbypass: bugfix: properly restart dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoMerge pull request #3171 from stangri/18.06-luci-app-simple-adblock
Florian Eckert [Mon, 14 Oct 2019 09:36:32 +0000 (11:36 +0200)]
Merge pull request #3171 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: fix invalid <br> entries

4 years agoluci-app-simple-adblock: bugfix: fix invalid <br> entries 3171/head
Stan Grishin [Thu, 10 Oct 2019 12:12:33 +0000 (05:12 -0700)]
luci-app-simple-adblock: bugfix: fix invalid <br> entries

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agoluci-base: fix CSRF prevention for arcombine targets
Jo-Philipp Wich [Wed, 9 Oct 2019 07:55:44 +0000 (09:55 +0200)]
luci-base: fix CSRF prevention for arcombine targets

The dispatcher failed to propagate the child target post security
requirements to the arcombine() dispatch target so far - fix this
by recursively testing the post security requirements.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f8c6eb67cd9da09ee20248fec6ab742069635e47)

4 years agoMerge pull request #3138 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Wed, 2 Oct 2019 06:24:47 +0000 (08:24 +0200)]
Merge pull request #3138 from stangri/18.06-luci-app-vpnbypass

luci-app-vpnbypass: fix dispatcher bug when VPN node is present

4 years agoluci-app-vpnbypass: fix dispatcher bug when VPN node is present 3138/head
Stan Grishin [Wed, 2 Oct 2019 01:22:47 +0000 (18:22 -0700)]
luci-app-vpnbypass: fix dispatcher bug when VPN node is present

Signed-off-by: Stan Grishin <stangri@melmac.net>
4 years agotimezone data: update to 2019c
Hannu Nyman [Sat, 28 Sep 2019 18:45:21 +0000 (18:45 +0000)]
timezone data: update to 2019c

Update timezone data to 2019c

http://mm.icann.org/pipermail/tz-announce/2019-September/000057.html

2019c:
* Fiji observes DST from 2019-11-10 to 2020-01-12.
* Norfolk Island starts observing Australian-style DST.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit cf887ba62f4a2aec06ec169eba3f3829967ee344)

4 years agoMerge pull request #3113 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Tue, 24 Sep 2019 16:30:42 +0000 (19:30 +0300)]
Merge pull request #3113 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: dnsmasq.ipset option support