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

10095 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Hannu Nyman
3252808722
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
 2020-04-03 15:57:25 +03:00
Hannu Nyman
be69e1ac46
Merge pull request #3827 from stangri/18.06-luci-app-vpnbypass 
[18.06] luci-app-vpnbypass: better service control & buttons styling
 2020-04-03 15:56:33 +03:00
Hannu Nyman
e0a6127cea
Merge pull request #3822 from stangri/18.06-luci-app-simple-adblock 
[18..06] luci-app-simple-adblock: better service control & buttons styling
 2020-04-03 15:51:12 +03:00
Stan Grishin
6d2a667205 luci-app-https-dns-proxy: better service control & buttons styling 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-03 12:50:35 +00:00
Stan Grishin
b27d5e0a90 luci-app-vpnbypass: better service control & buttons styling 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-03 12:32:47 +00:00
Stan Grishin
a06b27d5f8 luci-app-simple-adblock: better service control & buttons styling 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-04-03 12:25:40 +00:00
Hannu Nyman
13bc6982bd
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
 2020-03-29 10:02:06 +03:00
Stan Grishin
a9f8500720 luci-app-simple-adblock: better status/error display 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2020-03-29 05:22:51 +00:00
Jo-Philipp Wich
4fc4c794a0 luci-base: iface_get_network(): fix condition 
Fixes: #3717
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-03-04 08:19:01 +01:00
Jo-Philipp Wich
e513230622 luci-base: iface_get_network(): fix condition 
Fixes: #3715
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-03-03 20:36:54 +01:00
Jo-Philipp Wich
41e2258d6d 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 6d9a23af60)
 2020-01-29 14:41:34 +01:00
Hannu Nyman
868abc1a56
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
 2019-12-19 20:53:11 +02:00
Stan Grishin
6070efe485 luci-app-https-dns-proxy: package name change, support for RFC8484 binary 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-12-19 11:43:05 -07:00
Hannu Nyman
3a3d8f4939 i18n: sync translations 
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2019-11-30 11:35:52 +02:00
Florian Eckert
f01d93b331
Merge pull request #3368 from stangri/18.06-luci-app-advanced-reboot 
luci-app-advanced-reboot: better information for snapshots
 2019-11-28 07:25:40 +01:00
Stan Grishin
8b4d454ac6 luci-app-advanced-reboot: better information for snapshots 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-27 08:32:46 -07:00
Hannu Nyman
ab9c8128d8
Merge pull request #3338 from stangri/18.06-luci-app-advanced-reboot 
[18.06] luci-app-advanced-reboot: add logger messages, README update
 2019-11-20 08:24:47 +02:00
Stan Grishin
b6e00b7a21 luci-app-advanced-reboot: add logger messages, README update 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-19 16:55:51 -07:00
Hannu Nyman
af8310fd15
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
 2019-11-19 19:29:53 +02:00
Stan Grishin
71e229e2cb luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-19 09:54:37 -07:00
Jo-Philipp Wich
7a3f0dd6d4 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 13e9e3e9e8)
 2019-11-16 18:28:39 +01:00
Hannu Nyman
9866be5204
Merge pull request #3313 from stangri/18.06-luci-app-advanced-reboot 
luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers
 2019-11-16 11:22:50 +02:00