Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10117 commits 13 branches 13 tags 306 MiB
Commit graph

10117 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hannu Nyman
8401f59e03 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 4f2ecd88fd)
 2020-09-19 08:58:05 +03:00
Liangbin Lian
dc51a2f845 luci-app-uhttpd: i18n - fix zh-cn translation 
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
 2020-09-15 19:08:15 +03:00
Hannu Nyman
adfc142841 treewide: i18n - backport and sync translations 
Backport translations from master and 19.07.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2020-08-29 21:40:51 +03:00
Stan
2223f8b397
Merge pull request #4393 from stangri/18.06-luci-app-https-dns-proxy 
[18.06] luci-app-https-dns-proxy: add DNSPod.cn DoH
 2020-08-27 14:38:58 -07:00
Stan Grishin
523770c5aa luci-app-https-dns-proxy: add DNSPod.cn DoH 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-08-27 21:37:04 +00:00
Stan
16dfb55ace
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
 2020-07-31 02:53:11 -07:00
Stan Grishin
ac723a12a5 luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-07-31 09:37:10 +00:00
Stan
774c92e08a
Merge pull request #4312 from stangri/18.06-luci-app-https-dns-proxy 
[18.06] luci-app-https-dns-proxy: add OpenDNS servers
 2020-07-29 02:45:26 -07:00
Stan Grishin
0c92a924cd luci-app-https-dns-proxy: add OpenDNS servers 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-07-29 09:41:42 +00:00
jjm2473
23f30cf9ca 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 97780a9ce1)
 2020-07-19 19:48:13 +02:00
Hannu Nyman
c215f31619 treewide: i18n - backport translations 
Backport translations from master & 19.07.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2020-07-18 14:26:51 +03:00
Stan Grishin
5d4442fae2 luci-app-https-dns-proxy: bugfix: remove eDNS support 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-06-25 13:10:22 -07:00
Hannu Nyman
058c3e2387 treewide: i18n - backport translations 
Backport translations from master and 19.07.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2020-06-24 23:31:51 +03:00
Hannu Nyman
5af651b614 treewide: i18n - backport translations 
Backport translations from 19.07 and master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2020-06-17 21:41:49 +03:00
Jo-Philipp Wich
563bd75178
Merge pull request #4107 from fanck0605/patch-1 
[18.06] luci-app-ddns: remove duplicate help.gif
 2020-06-16 17:12:57 +02:00
Stan Grishin
f541468525 luci-app-simple-adblock: racially-neutral names 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-06-13 15:13:51 -07:00
Stan
a972bdb9b9
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
 2020-06-03 08:27:48 -07:00
Stan
ca50085e4a
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
 2020-06-02 06:18:40 -07:00
Stan Grishin
f990543f8c 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:26 +00:00
Chuck
e5c2e49610 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>
 2020-05-27 21:08:28 -07:00
Hannu Nyman
a1994dac44
Merge pull request #4104 from fanck0605/patch-2 
[18.06] luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua
 2020-05-27 12:46:01 +03:00
leonghui
69d17199e8 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 199d4b1d5c

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
Signed-off-by: Chuck <fanck0605@qq.com>
 2020-05-27 01:45:18 -07:00
yangfl
d4424f8847 luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua 
This cherry-picks commit d81c8d0e6b

Signed-off-by: David Yang <mmyangfl@gmail.com>
Signed-off-by: Chuck <fanck0605@qq.com>
 2020-05-27 01:43:09 -07:00
Stan Grishin
cdfb78685c 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:40 +00:00
Hannu Nyman
f5f1ea3316 treewide: i18n - backport translations 
Backport translations from 19.07 and master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2020-05-25 18:13:39 +03:00
Hannu Nyman
bacf57bad1 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>
 2020-05-15 17:12:25 +03:00
Hannu Nyman
de2df034e1 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>
 2020-05-15 17:12:25 +03:00
Hannu Nyman
b4dbbb432e 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 e4baee8d25)
 2020-05-15 17:12:25 +03:00
Jo-Philipp Wich
9b69e8f9cc build: add script to merge master translation into branches 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cab574958c)
 2020-05-15 17:12:25 +03:00
Hannu Nyman
733734ab20
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
 2020-05-14 10:19:34 +03:00
sunnyqeen
3e26f34ad8 luci-mod-admin-full: fixed ipv6 address display in the overview page of luci 
Signed-off-by: sunnyqeen <sunnyqeen@gmail.com>
 2020-05-14 00:10:18 +02:00
Florian Eckert
6d9a0488d6 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 8120e1d484)
 2020-05-13 16:05:08 +02:00
Hannu Nyman
ae3949669b 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:50:01 +03:00
Stan
786dd7928d
Merge pull request #4003 from stangri/18.06-luci-app-vpnbypass 
[18.06] luci-app-vpnbypass: better localizeable resources
 2020-05-03 12:49:28 -07:00
Stan Grishin
292c6d7bb0 luci-app-vpnbypass: better localizeable resources 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-05-03 09:12:54 +00:00
Stan
bbf8e1e76d
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
 2020-05-02 09:21:01 -07:00
Stan
a2185b378d
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
 2020-05-02 09:17:21 -07:00
Stan Grishin
0c35ed08e5 luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-05-02 16:01:06 +00:00
Stan Grishin
a1c1e2d336 luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-05-02 15:32:01 +00:00
Hannu Nyman
1e59ed1799
Merge pull request #3961 from stangri/18.06-luci-app-https-dns-proxy 
[18.06] luci-app-https-dns-proxy: add CIRA Canadian Shiled
 2020-04-24 17:32:23 +03:00
Stan Grishin
f8a3ce0be5 luci-app-https-dns-proxy: add CIRA Canadian Shiled 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-24 10:06:16 +00:00
Hannu Nyman
7cc22e1a65
Merge pull request #3945 from stangri/18.06-luci-app-simple-adblock 
[18.06] luci-app-simple-adblock: bugfix: get package version from opkg
 2020-04-21 19:48:36 +03:00
Stan Grishin
805cf64805 luci-app-simple-adblock: bugfix: get package version from opkg 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-21 00:51:41 +00:00
Hannu Nyman
103da80a18 luci-app-advanced-reboot: fix syntax 
Add the missing ")" to lines 45 and 54.
Fixes 75a4a80c1d
Fixes #3903

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2c812fbd58)
 2020-04-12 09:02:42 +03:00
Hannu Nyman
9e850c7633
Merge pull request #3900 from stangri/18.06-luci-app-simple-adblock 
[18.06] luci-app-simple-adblock: improve i18n
 2020-04-11 15:39:46 +03:00
Stan Grishin
9778609d68 luci-app-simple-adblock: improve i18n 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-11 11:39:43 +00:00
Hannu Nyman
a461961ae1
Merge pull request #3879 from stangri/18.06-luci-app-advanced-reboot 
[18.06] luci-app-advanced-reboot: bring up-to-date with master
 2020-04-11 10:51:12 +03:00
Stan Grishin
a89e4ce332 luci-app-advanced-reboot: improve localization by moving from translate to translatef 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-11 01:11:49 +00:00
Hannu Nyman
35c14af547
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
 2020-04-07 10:18:17 +03:00
Stan Grishin
b3184860e1 luci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS. 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-06 14:00:33 +00:00