project/luci.git
5 years agoMerge pull request #2432 from Rixerx/master
Hannu Nyman [Sat, 5 Jan 2019 18:51:31 +0000 (20:51 +0200)]
Merge pull request #2432 from Rixerx/master

luci-base: update Polish translation

5 years agoluci-base: update Polish translation 2432/head
Krystian Kozak [Sat, 5 Jan 2019 18:33:30 +0000 (19:33 +0100)]
luci-base: update Polish translation

Polish translation has been updated.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
5 years agoMerge pull request #2420 from yangfl/master
Hannu Nyman [Sat, 5 Jan 2019 18:06:16 +0000 (20:06 +0200)]
Merge pull request #2420 from yangfl/master

i18n: update Chinese translation

5 years agoMerge pull request #2384 from davidjb/patch-1
Dirk Brenken [Sat, 5 Jan 2019 17:01:22 +0000 (18:01 +0100)]
Merge pull request #2384 from davidjb/patch-1

luci-app-ddns: check existence of nslookup util rather than making DNS request

5 years agoMerge pull request #2428 from leonghui/update_wiki_links
Dirk Brenken [Sat, 5 Jan 2019 15:55:00 +0000 (16:55 +0100)]
Merge pull request #2428 from leonghui/update_wiki_links

Update docs and packages wiki links

5 years agoluci-app-dnscrypt-proxy: update wiki links 2428/head
leonghui [Sat, 5 Jan 2019 11:10:19 +0000 (11:10 +0000)]
luci-app-dnscrypt-proxy: update wiki links

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
5 years agoluci-app-ddns: update wiki link for global settings
leonghui [Sat, 5 Jan 2019 11:06:59 +0000 (11:06 +0000)]
luci-app-ddns: update wiki link for global settings

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
5 years agodocs: Update UCI wiki link
leonghui [Sat, 5 Jan 2019 11:00:55 +0000 (11:00 +0000)]
docs: Update UCI wiki link

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
5 years agoluci-app-opkg: only show packages with higher version in upgrade tab
Jo-Philipp Wich [Fri, 4 Jan 2019 08:15:49 +0000 (09:15 +0100)]
luci-app-opkg: only show packages with higher version in upgrade tab

Fixes #2422.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2409 from yousong/install-packages
Jo-Philipp Wich [Fri, 4 Jan 2019 07:59:49 +0000 (08:59 +0100)]
Merge pull request #2409 from yousong/install-packages

treewide: fix redirecting to System->Software

5 years agoi18n: update Chinese translation 2420/head
yangfl [Thu, 3 Jan 2019 16:51:56 +0000 (00:51 +0800)]
i18n: update Chinese translation

Signed-off-by: David Yang <mmyangfl@gmail.com>
5 years agotimezone data: update to 2018i
Hannu Nyman [Wed, 2 Jan 2019 19:27:12 +0000 (21:27 +0200)]
timezone data: update to 2018i

Update timezone data to 2018i

http://mm.icann.org/pipermail/tz-announce/2018-December/000053.html
http://mm.icann.org/pipermail/tz-announce/2018-December/000054.html

2018h:
* Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21.
* New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move.
* Metlakatla, Alaska observes PST this winter only.
* Guess Morocco will continue to adjust clocks around Ramadan.
* Add predictions for Iran from 2038 through 2090.

2018i:
* São Tomé and Príncipe switches from +01 to +00 on 2019-01-01.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #2412 from EricLuehrsen/unbound_cache
Hannu Nyman [Wed, 2 Jan 2019 16:05:22 +0000 (18:05 +0200)]
Merge pull request #2412 from EricLuehrsen/unbound_cache

luci-app-unbound: protect against printing large cache dump

5 years agoMerge pull request #2413 from rosysong/nft-qos
Hannu Nyman [Wed, 2 Jan 2019 16:04:53 +0000 (18:04 +0200)]
Merge pull request #2413 from rosysong/nft-qos

luci-app-nft-qos: rework _action_rate function

5 years agoMerge pull request #2415 from cshoredaniel/pr-luci-app-nut-i18n
Hannu Nyman [Wed, 2 Jan 2019 16:04:16 +0000 (18:04 +0200)]
Merge pull request #2415 from cshoredaniel/pr-luci-app-nut-i18n

luci-app-nut: Add i18n template (pot)

5 years agoluci-app-nut: Add i18n template (pot) 2415/head
Daniel F. Dickinson [Wed, 2 Jan 2019 11:29:17 +0000 (06:29 -0500)]
luci-app-nut: Add i18n template (pot)

Finally noticed that I had been missing doing i18n stuff, so
add the template for this new package I added.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
5 years agoluci-app-nft-qos: rework _action_rate function 2413/head
Rosy Song [Tue, 1 Jan 2019 08:08:10 +0000 (16:08 +0800)]
luci-app-nft-qos: rework _action_rate function

Signed-off-by: Rosy Song <rosysong@rosinson.com>
5 years agotreewide: fix query arguments to admin/system/opkg 2409/head
Yousong Zhou [Tue, 1 Jan 2019 04:58:48 +0000 (04:58 +0000)]
treewide: fix query arguments to admin/system/opkg

Right now the handler only recognizes "query=xx" argument, others will
be ignored.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agotreewide: fix redirecting to System->Software
Yousong Zhou [Sat, 29 Dec 2018 14:10:10 +0000 (14:10 +0000)]
treewide: fix redirecting to System->Software

By replacing url "admin/system/packages" with "admin/system/opkg"

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-app-unbound: protect against printing large cache dump 2412/head
Eric Luehrsen [Sat, 8 Dec 2018 02:19:20 +0000 (21:19 -0500)]
luci-app-unbound: protect against printing large cache dump

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
5 years agoMerge pull request #2408 from YuriPet/master
Hannu Nyman [Sat, 29 Dec 2018 22:09:19 +0000 (00:09 +0200)]
Merge pull request #2408 from YuriPet/master

Update Ukrainian translation

5 years agoluci-app-opkg: update Ukrainian translation 2408/head
Yurii [Sat, 29 Dec 2018 21:30:47 +0000 (23:30 +0200)]
luci-app-opkg: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com
5 years agoluci-app-firewall: update Ukrainian translation
Yurii [Sat, 29 Dec 2018 21:27:55 +0000 (23:27 +0200)]
luci-app-firewall: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com
5 years agoluci-base: update Ukrainian translation
Yurii [Sat, 29 Dec 2018 21:22:54 +0000 (23:22 +0200)]
luci-base: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com
5 years agoluci-base: rework filebrowser initialization
Jo-Philipp Wich [Sat, 29 Dec 2018 13:19:59 +0000 (14:19 +0100)]
luci-base: rework filebrowser initialization

Do not call cbi_init() from the browser field template but lazily initialize
the field, like it is being done for all other widgets as well.

Fixes: #2398
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2387 from TDT-AG/pr/20181220-luci-app-mwan3
Hannu Nyman [Sat, 29 Dec 2018 12:05:26 +0000 (14:05 +0200)]
Merge pull request #2387 from TDT-AG/pr/20181220-luci-app-mwan3

luci-app-mwan3: some changes

5 years agoMerge pull request #2406 from rosysong/nft-qos
Hannu Nyman [Sat, 29 Dec 2018 09:35:01 +0000 (11:35 +0200)]
Merge pull request #2406 from rosysong/nft-qos

luci-app-nft-qos: fix monitor doesn't work when there no ipv6 support.

5 years agoluci-app-nft-qos: fix monitor doesn't work when there no ipv6 support. 2406/head
Rosy Song [Sat, 29 Dec 2018 09:31:12 +0000 (17:31 +0800)]
luci-app-nft-qos: fix monitor doesn't work when there no ipv6 support.

Signed-off-by: Rosy Song <rosysong@rosinson.com>
5 years agoMerge pull request #2401 from musashino205/i18n/po-fix
Hannu Nyman [Thu, 27 Dec 2018 13:26:51 +0000 (15:26 +0200)]
Merge pull request #2401 from musashino205/i18n/po-fix

luci-app-olsr: fix po errors

5 years agoMerge pull request #2402 from dibdot/travelmate
Dirk Brenken [Thu, 27 Dec 2018 06:24:28 +0000 (07:24 +0100)]
Merge pull request #2402 from dibdot/travelmate

luci-app-travelmate: adapt latest css changes

5 years agoMerge pull request #2400 from dibdot/banip
Dirk Brenken [Thu, 27 Dec 2018 06:24:09 +0000 (07:24 +0100)]
Merge pull request #2400 from dibdot/banip

luci-app-banip: sync with release 0.0.7

5 years agoMerge pull request #2399 from dibdot/adblock
Dirk Brenken [Thu, 27 Dec 2018 06:23:49 +0000 (07:23 +0100)]
Merge pull request #2399 from dibdot/adblock

luci-app-adblock: sync with release 3.6.1

5 years agoluci-app-travelmate: adapt latest css changes 2402/head
Dirk Brenken [Thu, 27 Dec 2018 06:19:24 +0000 (07:19 +0100)]
luci-app-travelmate: adapt latest css changes

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoluci-app-banip: sync with release 0.0.7 2400/head
Dirk Brenken [Wed, 26 Dec 2018 20:56:45 +0000 (21:56 +0100)]
luci-app-banip: sync with release 0.0.7

* determine L3 and L2 network devices to support pppoe interfaces
correctly

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoluci-app-adblock: sync with release 3.6.1 2399/head
Dirk Brenken [Wed, 26 Dec 2018 20:27:11 +0000 (21:27 +0100)]
luci-app-adblock: sync with release 3.6.1

* support new reporting options
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoluci-app-olsr: sync translations 2401/head
INAGAKI Hiroshi [Thu, 27 Dec 2018 02:49:54 +0000 (11:49 +0900)]
luci-app-olsr: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoluci-app-olsr: fix po errors
INAGAKI Hiroshi [Thu, 27 Dec 2018 02:44:21 +0000 (11:44 +0900)]
luci-app-olsr: fix po errors

Fixed po errors in "Selected" in en/de.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoMerge pull request #2393 from RoEng/luci-app-wifischedule-i18n-de-1
Hannu Nyman [Wed, 26 Dec 2018 17:20:54 +0000 (19:20 +0200)]
Merge pull request #2393 from RoEng/luci-app-wifischedule-i18n-de-1

luci-app-wifischedule: New German Translation

5 years agoMerge pull request #2396 from musashino205/l10n/adblk-upd-ja
Hannu Nyman [Wed, 26 Dec 2018 17:20:15 +0000 (19:20 +0200)]
Merge pull request #2396 from musashino205/l10n/adblk-upd-ja

luci-app-adblock: update Japanese translation

5 years agoMerge pull request #2395 from musashino205/l10n/mwan3-upd-ja
Hannu Nyman [Wed, 26 Dec 2018 17:19:48 +0000 (19:19 +0200)]
Merge pull request #2395 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

5 years agoMerge pull request #2397 from musashino205/l10n/base-fix-ja
Hannu Nyman [Wed, 26 Dec 2018 17:19:26 +0000 (19:19 +0200)]
Merge pull request #2397 from musashino205/l10n/base-fix-ja

luci-base: fix Japanese translation

5 years agoMerge pull request #2390 from cshoredaniel/pr-nut-updates
Hannu Nyman [Wed, 26 Dec 2018 17:19:09 +0000 (19:19 +0200)]
Merge pull request #2390 from cshoredaniel/pr-nut-updates

luci-app-nut: Update nut-server settings to match packages master

5 years agoluci-base: fix Japanese translation 2397/head
INAGAKI Hiroshi [Wed, 26 Dec 2018 10:49:18 +0000 (19:49 +0900)]
luci-base: fix Japanese translation

Fixed Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoluci-app-adblock: update Japanese translation 2396/head
INAGAKI Hiroshi [Wed, 26 Dec 2018 10:39:44 +0000 (19:39 +0900)]
luci-app-adblock: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoluci-app-adblock: sync translations
INAGAKI Hiroshi [Wed, 26 Dec 2018 10:05:08 +0000 (19:05 +0900)]
luci-app-adblock: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoluci-app-mwan3: update Japanese translation 2395/head
INAGAKI Hiroshi [Wed, 26 Dec 2018 09:50:50 +0000 (18:50 +0900)]
luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoluci-app-shadowsocks-libev: add zh-cn translation
Yousong Zhou [Wed, 26 Dec 2018 03:34:56 +0000 (03:34 +0000)]
luci-app-shadowsocks-libev: add zh-cn translation

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-app-wifischedule: New German Translation 2393/head
Roland Engert [Wed, 26 Dec 2018 01:14:50 +0000 (02:14 +0100)]
luci-app-wifischedule: New German Translation

New German Translation of wifischedule.po

Signed-of-by: Roland Engert <Roland.Engert@web.de>
5 years agoluci-base: fix zh-tw translation
Gyrotron [Tue, 25 Dec 2018 22:19:02 +0000 (03:49 +0530)]
luci-base: fix zh-tw translation

Fixes #1092

Signed-off-by: Simmar Kalsi simmarkalsi@gmail.com
[reword commit message subject]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-app-nut: Update settings to match packages master 2390/head
Daniel F. Dickinson [Fri, 21 Dec 2018 01:45:24 +0000 (20:45 -0500)]
luci-app-nut: Update settings to match packages master

A number of settings in openwrt-packages master are missing; add them.
The 'extra' adhoc options (override, default, other, and otherflag) we
leave to UCI only because they require dynamic creation of config
sections.
There were some options that didn't belong in the section they were
in; remove them.
Include the option for the USB serial port permissions for serial USB
devices over USB serial port (on the OpenWrt device).
And finally, fix the title of the UPS Server global settings.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
5 years agoluci-app-nut: nut_server: Alphabetize driver options
Daniel F. Dickinson [Thu, 20 Dec 2018 06:37:10 +0000 (01:37 -0500)]
luci-app-nut: nut_server: Alphabetize driver options

There are a *lot* of options, so list them in alphabetical order
for easier updates to the app (alphabetizing by translation doesn't
make sense since the order would need to change depending on language).

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
5 years agoMerge pull request #2389 from dibdot/adblock
Dirk Brenken [Sat, 22 Dec 2018 17:53:04 +0000 (18:53 +0100)]
Merge pull request #2389 from dibdot/adblock

luci-app-adblock: minor fixes

5 years agoluci-app-adblock: minor fixes 2389/head
Dirk Brenken [Sat, 22 Dec 2018 17:37:45 +0000 (18:37 +0100)]
luci-app-adblock: minor fixes

* use new XHR default on report page
* fix wrong string.find syntax

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoluci-lib-jsonc: prevent infinite recursion in stringify
Jo-Philipp Wich [Fri, 21 Dec 2018 12:16:16 +0000 (13:16 +0100)]
luci-lib-jsonc: prevent infinite recursion in stringify

Also increase the stack size as needed to prevent crashes when serializing
deeply nested tables.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years ago_I18N_ luci-app-mwan3: i18n update de translation 2387/head
Florian Eckert [Thu, 20 Dec 2018 11:06:22 +0000 (12:06 +0100)]
_I18N_ luci-app-mwan3: i18n update de translation

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-app-mwan3: show supported tracking methodes if needed bin is installed
Florian Eckert [Fri, 21 Dec 2018 09:15:36 +0000 (10:15 +0100)]
luci-app-mwan3: show supported tracking methodes if needed bin is installed

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-app-mwan3: add uptime/downtime to status page
Florian Eckert [Fri, 21 Dec 2018 09:00:26 +0000 (10:00 +0100)]
luci-app-mwan3: add uptime/downtime to status page

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-app-mwan3: add tracking methode nping
Florian Eckert [Thu, 20 Dec 2018 13:59:42 +0000 (14:59 +0100)]
luci-app-mwan3: add tracking methode nping

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoMerge pull request #2386 from cshoredaniel/pr-uhttpd-spelling
Jo-Philipp Wich [Fri, 21 Dec 2018 07:30:11 +0000 (08:30 +0100)]
Merge pull request #2386 from cshoredaniel/pr-uhttpd-spelling

luci-app-uhttpd: Correct spelling in two places

5 years agoluci-app-uhttpd: Correct spelling in two places 2386/head
Daniel F. Dickinson [Fri, 21 Dec 2018 03:25:32 +0000 (22:25 -0500)]
luci-app-uhttpd: Correct spelling in two places

Had 'at list' instead 'at least' for the help text on listing
HTTP/HTTPS listening addresses.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
5 years agoluci-app-ddns: check existence of nslookup util rather than making DNS request 2384/head
David Beitey [Fri, 21 Dec 2018 02:51:56 +0000 (02:51 +0000)]
luci-app-ddns: check existence of nslookup util rather than making DNS request

This saves a DNS request whenever the check is performed.  For systems with nameservers configured in `/etc/resolv.conf`, nslookup will sent a request to those servers (eg bypassing /etc/hosts), thus taking a lot more time than necessary.  For servers that are remote, this will take a *lot* longer than just checking if the nslookup util exists.

This change follows in the same vein as all the other checks and just using `which` without actually invoking the util's functionality.

Signed-off-by: David Beitey <david@davidjb.com>
5 years agoMerge pull request #2383 from TDT-AG/pr/20181220-luci-theme-material
Jo-Philipp Wich [Thu, 20 Dec 2018 14:06:12 +0000 (15:06 +0100)]
Merge pull request #2383 from TDT-AG/pr/20181220-luci-theme-material

luci-theme-material: make top level menu fontcolor configurable

5 years agoluci-theme-material: make top level menu fontcolor configurable 2383/head
Florian Eckert [Mon, 17 Dec 2018 12:57:15 +0000 (13:57 +0100)]
luci-theme-material: make top level menu fontcolor configurable

If you change the color of the submenues then the colors of the toplevel
should also be changed into the same color.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agocsstidy: update to latest Git HEAD
Jo-Philipp Wich [Thu, 20 Dec 2018 12:02:11 +0000 (13:02 +0100)]
csstidy: update to latest Git HEAD

1d56201 prepare: do not consider "overflow" to be a shorthand for -x, -y

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2351 from TDT-AG/pr/20181204-modules
Jo-Philipp Wich [Thu, 20 Dec 2018 09:52:06 +0000 (10:52 +0100)]
Merge pull request #2351 from TDT-AG/pr/20181204-modules

modules: use configurable poll interval

5 years agoluci-base: use default poll interval 2351/head
Florian Eckert [Thu, 20 Dec 2018 09:10:26 +0000 (10:10 +0100)]
luci-base: use default poll interval

Replace all XHR poll time number with -1 so they will use the default
poll interval time value from "/etc/config/luci". If this is not set then
5 seconds as default is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-app-*: use default poll interval
Florian Eckert [Thu, 20 Dec 2018 09:09:58 +0000 (10:09 +0100)]
luci-app-*: use default poll interval

Replace all XHR poll time number with -1 so they will use the default
poll interval time value from "/etc/config/luci". If this is not set then
5 seconds as default is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agomodules: use configurable poll interval
Florian Eckert [Tue, 18 Dec 2018 14:46:53 +0000 (15:46 +0100)]
modules: use configurable poll interval

Make poll interval configurable. Use option from

----
config core 'main'
    option pollinterval '5'
---

This will only be used if the interval option is less or equal zero.
If the poll interval is not configured then a default value of 5 seconds
is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoMerge pull request #2380 from dibdot/adblock
Dirk Brenken [Thu, 20 Dec 2018 07:51:35 +0000 (08:51 +0100)]
Merge pull request #2380 from dibdot/adblock

luci-app-adblock: sync with release 3.6.0

5 years agoluci-app-adblock: sync with release 3.6.0 2380/head
Dirk Brenken [Wed, 19 Dec 2018 16:33:29 +0000 (17:33 +0100)]
luci-app-adblock: sync with release 3.6.0

* add adblock dns query reporting via tcpdump (see readme for details)
* fix tld compression on low memory systems (< 64 MB)
* fix various small issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoMerge pull request #2381 from musashino205/l10n/base-upd-ja
Hannu Nyman [Wed, 19 Dec 2018 18:36:15 +0000 (20:36 +0200)]
Merge pull request #2381 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

5 years agoluci-base: update Japanese translation 2381/head
INAGAKI Hiroshi [Wed, 19 Dec 2018 18:01:24 +0000 (03:01 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoi18n: sync translations
INAGAKI Hiroshi [Wed, 19 Dec 2018 17:21:14 +0000 (02:21 +0900)]
i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoMerge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system
Jo-Philipp Wich [Wed, 19 Dec 2018 06:49:56 +0000 (07:49 +0100)]
Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system

luci-mod-system: add translation for led trigger names

5 years agoluci-theme-bootstrap: fix textarea height after CSS minification
Jo-Philipp Wich [Sun, 16 Dec 2018 14:08:05 +0000 (15:08 +0100)]
luci-theme-bootstrap: fix textarea height after CSS minification

Fixes #2378
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2377 from sotux/master-luci-app-aria2
Hannu Nyman [Sat, 15 Dec 2018 13:46:05 +0000 (15:46 +0200)]
Merge pull request #2377 from sotux/master-luci-app-aria2

luci-app-aria2: fix the log option

5 years agoluci-app-aria2: fix the log option 2377/head
Zheng Qian [Sat, 15 Dec 2018 13:38:40 +0000 (21:38 +0800)]
luci-app-aria2: fix the log option

According to the package aria2, the log option
is enable_logging, so fix this option name.

As luci-app-aria2 can't set custom log file dir,
the default log file is /var/log/aria2.log but not
in the config file dir.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoMerge pull request #2375 from sotux/master-luci-app-aria2
Jo-Philipp Wich [Fri, 14 Dec 2018 06:14:18 +0000 (07:14 +0100)]
Merge pull request #2375 from sotux/master-luci-app-aria2

luci-app-aria2: fix showRPCURL when using https

5 years agoluci-app-aria2: fix showRPCURL when using https 2375/head
Zheng Qian [Fri, 14 Dec 2018 05:32:18 +0000 (13:32 +0800)]
luci-app-aria2: fix showRPCURL when using https

if login luci-admin with https, RPC protocol should be https or wss.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-base: update Simplified Chinese translation
Zheng Qian [Fri, 14 Dec 2018 01:14:35 +0000 (09:14 +0800)]
luci-base: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-base: fix table compare upon writing ipaddr changes
Jo-Philipp Wich [Thu, 13 Dec 2018 11:14:37 +0000 (12:14 +0100)]
luci-base: fix table compare upon writing ipaddr changes

Fixes: b33192a03 ("luci-base: support cidr list notation for option ipaddr and ip6addr")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: properly option ipaddr in single cidr string notation as well
Jo-Philipp Wich [Thu, 13 Dec 2018 10:57:16 +0000 (11:57 +0100)]
luci-base: properly option ipaddr in single cidr string notation as well

When an interface configuration specifies both "option ipaddr 1.2.3.4/24"
and "option netmask", then netifd will ignore the netmask in favor to the
prefix encoded in the cidr string.

Support this variant as well by treating a sole cidr string value as
singöe-item cidr list.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: fix typo in german translation
Jo-Philipp Wich [Thu, 13 Dec 2018 10:44:17 +0000 (11:44 +0100)]
luci-base: fix typo in german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: update german translation
Jo-Philipp Wich [Thu, 13 Dec 2018 10:41:24 +0000 (11:41 +0100)]
luci-base: update german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: resync translation templates
Jo-Philipp Wich [Thu, 13 Dec 2018 10:36:35 +0000 (11:36 +0100)]
luci-base: resync translation templates

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: support cidr list notation for option ipaddr and ip6addr
Jo-Philipp Wich [Thu, 13 Dec 2018 10:31:50 +0000 (11:31 +0100)]
luci-base: support cidr list notation for option ipaddr and ip6addr

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: cbi.js: update deps on dynlist changes, honor placeholder
Jo-Philipp Wich [Thu, 13 Dec 2018 10:27:52 +0000 (11:27 +0100)]
luci-base: cbi.js: update deps on dynlist changes, honor placeholder

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo
Jo-Philipp Wich [Thu, 13 Dec 2018 07:26:44 +0000 (08:26 +0100)]
Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo

luci-app-openvpn: re-add options comp_lzo and comp_noadapt

5 years agoluci-app-openvpn: re-add options comp_lzo and comp_noadapt 2372/head
Martin Schiller [Thu, 13 Dec 2018 07:08:24 +0000 (08:08 +0100)]
luci-app-openvpn: re-add options comp_lzo and comp_noadapt

* re-add config option comp_lzo according to
  openwrt/openwrt@3850b41
* re-add config option comp_noadapt. This has never been removed
  from openwrt

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
5 years agocsstidy: update to latest Git head
Jo-Philipp Wich [Wed, 12 Dec 2018 15:24:59 +0000 (16:24 +0100)]
csstidy: update to latest Git head

33594b4 ("csstidy: do not dequote selector strings")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2369 from tano-systems/fix-changelog-mistake
Jo-Philipp Wich [Wed, 12 Dec 2018 09:47:06 +0000 (10:47 +0100)]
Merge pull request #2369 from tano-systems/fix-changelog-mistake

luci-base: fix UCI changelog markup mistake

5 years agobuild: add build option to minify *.css files
Jo-Philipp Wich [Wed, 12 Dec 2018 08:34:44 +0000 (09:34 +0100)]
build: add build option to minify *.css files

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agocontrib: add csstidy package
Jo-Philipp Wich [Wed, 12 Dec 2018 08:27:44 +0000 (09:27 +0100)]
contrib: add csstidy package

Package a fork of the CSSTidy C++ implementation for CSS minification
use in a later commit.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: fix UCI changelog markup mistake 2369/head
Anton Kikin [Tue, 11 Dec 2018 23:05:59 +0000 (02:05 +0300)]
luci-base: fix UCI changelog markup mistake

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
5 years agoMerge pull request #2361 from stokito/master
Hannu Nyman [Tue, 11 Dec 2018 16:39:40 +0000 (18:39 +0200)]
Merge pull request #2361 from stokito/master

CONTRIBUTING.md

5 years agoluci-app-nlbwmon: rewrite display section
Jo-Philipp Wich [Tue, 11 Dec 2018 10:49:41 +0000 (11:49 +0100)]
luci-app-nlbwmon: rewrite display section

 - Move CSS and JS code to external files
 - Use responsive table markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-lib-httpclient: prevent nil access with invalid IP address literals
Jo-Philipp Wich [Tue, 11 Dec 2018 08:17:42 +0000 (09:17 +0100)]
luci-lib-httpclient: prevent nil access with invalid IP address literals

Fixes: a54baf7be ("luci-lib-httpclient: revamp URL handling")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-lib-httpclient: revamp URL handling
Jo-Philipp Wich [Tue, 11 Dec 2018 07:57:36 +0000 (08:57 +0100)]
luci-lib-httpclient: revamp URL handling

 - Introduce a parse_url() helper which properly deals with literal IPv4
   and IPv6 host parts and returns the decomposed uri string as table
 - Properly format IPv6 literals in autogenerated Host headers
 - Omit default port numbers in Host headers and calculated redirect URLs.

Supersedes PR #2337.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2285 from dengqf6/luci-ssl-nginx
Jo-Philipp Wich [Tue, 11 Dec 2018 05:56:35 +0000 (06:56 +0100)]
Merge pull request #2285 from dengqf6/luci-ssl-nginx

luci-ssl-nginx: fix dependencies

5 years agoMerge pull request #2367 from yglb/master
Jo-Philipp Wich [Tue, 11 Dec 2018 05:55:22 +0000 (06:55 +0100)]
Merge pull request #2367 from yglb/master

luci-theme-rosy: Fixed insufficient container container width