summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4796 from stangri/18.06-luci-app-simple-adblockopenwrt-18.06Stan Grishin2021-02-093-10/+9
|\ | | | | [18.06] luci-app-simple-adblock: bugfix: default values for ListValue
| * luci-app-simple-adblock: bugfix: default values for ListValueStan Grishin2021-02-103-10/+9
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4767 from stangri/18.06-luci-app-https-dns-proxyStan Grishin2021-02-054-6/+30
|\ | | | | [18.06] luci-app-https-dns-proxy: add nextdns.io and quad 101 providers
| * luci-app-https-dns-proxy: add nextdns.io and quad 101 providersStan Grishin2021-02-054-6/+30
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4731 from stangri/18.06-luci-app-https-dns-proxyStan Grishin2021-01-135-2/+33
|\ | | | | [18.06] luci-app-https-dns-proxy: DSCP tagging support
| * luci-app-https-dns-proxy: DSCP tagging supportStan Grishin2021-01-135-2/+33
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4683 from stangri/18.06-luci-app-simple-adblockStan2020-12-212-6/+125
|\ | | | | [18.06] luci-app-simple-adblock: README URL update
| * luci-app-simple-adblock: README URL updateStan Grishin2020-12-212-6/+125
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4680 from stangri/18.06-luci-app-https-dns-proxyStan2020-12-219-21/+106
|\ | | | | [18.06] luci-app-https-dns-proxy: WebUI for dnsmasq config update, quad9 bootstrap IPv6
| * luci-app-https-dns-proxy: WebUI for dnsmasq config update, quad9 bootstrap IPv6Stan Grishin2020-12-219-21/+106
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* treewide: i18n - backport and sync translationsHannu Nyman2020-11-1445-301/+305
| | | | | | | Backport translations from master and 19.07. Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* luci-app-hd-idle: rename .po files to match app nameHannu Nyman2020-11-0126-0/+0
| | | | | | | | Rename .po(t) files from hd_idle.po to hd-idle.po in order to get them noticed in weblate. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit 74c17ea84ce55baccdc7be986216fd03865edf7d)
* treewide: i18n - backport and sync translationsHannu Nyman2020-10-31105-843/+896
| | | | | | | Backport translations from master and 19.07. Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* timezone data: update to 2020dHannu Nyman2020-10-312-5/+6
| | | | | | | | | | | | | | | | Update timezone data to 2020d 2020b: http://mm.icann.org/pipermail/tz-announce/2020-October/000059.html Macquarie Island has stayed in sync with Tasmania since 2011. Casey, Antarctica is at +08 in winter and +11 in summer. 2020c: http://mm.icann.org/pipermail/tz-announce/2020-October/000060.html 2020d: http://mm.icann.org/pipermail/tz-announce/2020-October/000062.html Palestine ends DST earlier than predicted, on 2020-10-24. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit ce3402a4530e06b1b5479e56caf9b8bb3a07dc15)
* treewide: i18n - backport and sync translationsHannu Nyman2020-09-2848-491/+405
| | | | | | | Backport translations from master and 19.07. Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Merge pull request #4459 from stangri/18.06-luci-app-vpnbypassStan2020-09-215-12/+101
|\ | | | | [18.06] luci-app-vpnbypass: ACL-related update
| * luci-app-vpnbypass: ACL updateStan Grishin2020-09-215-12/+101
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4450 from stangri/18.06-luci-app-simple-adblockStan2020-09-205-8/+157
|\ | | | | [18.06] luci-app-simple-adblock: support for config auto-update
| * luci-app-simple-adblock: support for config auto-updateStan Grishin2020-09-205-8/+157
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* luci-base: tweak busybox top regex to accept 'm' in large VSZHannu Nyman2020-09-191-1/+1
| | | | | | | | | | | | | | 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)
* luci-app-uhttpd: i18n - fix zh-cn translationLiangbin Lian2020-09-151-1/+1
| | | | Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
* treewide: i18n - backport and sync translationsHannu Nyman2020-08-2965-475/+499
| | | | | | | Backport translations from master and 19.07. Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Merge pull request #4393 from stangri/18.06-luci-app-https-dns-proxyStan2020-08-274-1/+21
|\ | | | | [18.06] luci-app-https-dns-proxy: add DNSPod.cn DoH
| * luci-app-https-dns-proxy: add DNSPod.cn DoHStan Grishin2020-08-274-1/+21
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4319 from stangri/18.06-luci-app-https-dns-proxyStan2020-07-312-2/+2
|\ | | | | [18.06] luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare security
| * luci-app-https-dns-proxy: fix bootstrap_dns for cloudflare securityStan Grishin2020-07-312-2/+2
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #4312 from stangri/18.06-luci-app-https-dns-proxyStan2020-07-294-1/+74
|\ | | | | [18.06] luci-app-https-dns-proxy: add OpenDNS servers
| * luci-app-https-dns-proxy: add OpenDNS serversStan Grishin2020-07-294-1/+74
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* ucitrack: fix bug for exec with paramsjjm24732020-07-191-1/+1
| | | | | | | | | | | | 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)
* treewide: i18n - backport translationsHannu Nyman2020-07-1870-450/+425
| | | | | | | Backport translations from master & 19.07. Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* luci-app-https-dns-proxy: bugfix: remove eDNS supportStan Grishin2020-06-253-7/+50
| | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* treewide: i18n - backport translationsHannu Nyman2020-06-2419-63/+63
| | | | | | Backport translations from master and 19.07. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* treewide: i18n - backport translationsHannu Nyman2020-06-17122-884/+736
| | | | | | Backport translations from 19.07 and master. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Merge pull request #4107 from fanck0605/patch-1Jo-Philipp Wich2020-06-161-1/+1
|\ | | | | [18.06] luci-app-ddns: remove duplicate help.gif
| * luci-app-ddns: remove duplicate help.gifChuck2020-05-271-1/+1
| | | | | | | | | | | | | | class `cbi-value-description` already contains help.gif it's not necessary to add one manually Signed-off-by: Chuck <fanck0605@qq.com>
* | luci-app-simple-adblock: racially-neutral namesStan Grishin2020-06-133-45/+49
| | | | | | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #4103 from stangri/18.06-luci-app-simple-adblockStan2020-06-034-21/+229
|\ \ | | | | | | [18.06] luci-app-simple-adblock: bugfix: proper processing of failed downloads; decrease reliance on shell commands; proper acl.d file
| * | luci-app-simple-adblock: bugfix: proper processing of failed dowloads; ↵Stan Grishin2020-05-274-21/+229
| | | | | | | | | | | | | | | | | | decrease reliance on shell commands; proper acl.d file Signed-off-by: Stan Grishin <stangri@melmac.net>
* | | Merge pull request #4119 from stangri/18.06-luci-app-https-dns-proxyStan2020-06-027-8/+124
|\ \ \ | |_|/ |/| | [18.06] luci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d file; add cloudflare family/protect
| * | luci-app-https-dns-proxy: decrease reliance on shell commands; proper acl.d ↵Stan Grishin2020-05-307-8/+124
|/ / | | | | | | | | | | file; add cloudflare family/protect Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #4104 from fanck0605/patch-2Hannu Nyman2020-05-271-36/+35
|\ \ | |/ |/| [18.06] luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua
| * luci-app-ddns: fix typo for has_curlssl()leonghui2020-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * luci-app-ddns: fix huge typo in luasrc/tools/ddns.luayangfl2020-05-271-35/+34
|/ | | | | | | This cherry-picks commit d81c8d0e6baf8a8a3e72aec4d6fc9a276d620263 Signed-off-by: David Yang <mmyangfl@gmail.com> Signed-off-by: Chuck <fanck0605@qq.com>
* treewide: i18n - backport translationsHannu Nyman2020-05-254-11/+11
| | | | | | Backport translations from 19.07 and master. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* treewide: i18n - sync translations and backport from 19.07 and masterHannu Nyman2020-05-15520-22364/+17669
| | | | | | | * sync translations * backport applicable translations from 19.07 and master Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* build: add i18n-merge-openwrt-19.07Hannu Nyman2020-05-151-0/+22
| | | | | | | | | | | | | 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>
* build/i18n-merge-master: ignore apps deleted in masterHannu Nyman2020-05-151-3/+8
| | | | | | | | | | | | | | 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)
* build: add script to merge master translation into branchesJo-Philipp Wich2020-05-151-0/+17
| | | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit cab574958c580c38ca8dc852d8dada1681d62046)
* Merge pull request #3953 from sunnyqeen/openwrt-18.06Hannu Nyman2020-05-141-1/+1
|\ | | | | luci-mod-admin-full: fixed ipv6 address display in the overview page of luci 18.06
| * luci-mod-admin-full: fixed ipv6 address display in the overview page of lucisunnyqeen2020-05-141-1/+1
| | | | | | | | Signed-off-by: sunnyqeen <sunnyqeen@gmail.com>