Merge pull request #2427 from leonghui/fix_has_curlssl_typo

luci-app-ddns: fix typo for has_curlssl()

Merge pull request #2430 from dibdot/banip

luci-app-banip: sync with release 0.1.0

Merge pull request #2432 from Rixerx/master

luci-base: update Polish translation

luci-app-ddns: remove first grep

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>

luci-base: update Polish translation

Polish translation has been updated.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>

Merge pull request #2420 from yangfl/master

i18n: update Chinese translation

Merge pull request #2384 from davidjb/patch-1

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

Merge pull request #2428 from leonghui/update_wiki_links

Update docs and packages wiki links

luci-app-banip: sync with release 0.1.0

* add new backup functionality, see
https://github.com/openwrt/packages/pull/7880 for details

Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-dnscrypt-proxy: update wiki links

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>

luci-app-ddns: update wiki link for global settings

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>

docs: Update UCI wiki link

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>

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.

Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>

luci-app-opkg: only show packages with higher version in upgrade tab

Fixes #2422.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2409 from yousong/install-packages

treewide: fix redirecting to System->Software

i18n: update Chinese translation

Signed-off-by: David Yang <mmyangfl@gmail.com>

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>

Merge pull request #2412 from EricLuehrsen/unbound_cache

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

Merge pull request #2413 from rosysong/nft-qos

luci-app-nft-qos: rework _action_rate function

Merge pull request #2415 from cshoredaniel/pr-luci-app-nut-i18n

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

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>

luci-app-nft-qos: rework _action_rate function

Signed-off-by: Rosy Song <rosysong@rosinson.com>

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>

treewide: fix redirecting to System->Software

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

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

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

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>

Merge pull request #2408 from YuriPet/master

Update Ukrainian translation

luci-app-opkg: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com

luci-app-firewall: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com

luci-base: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com

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>

Merge pull request #2387 from TDT-AG/pr/20181220-luci-app-mwan3

luci-app-mwan3: some changes

Merge pull request #2406 from rosysong/nft-qos

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

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

Signed-off-by: Rosy Song <rosysong@rosinson.com>

Merge pull request #2401 from musashino205/i18n/po-fix

luci-app-olsr: fix po errors

Merge pull request #2402 from dibdot/travelmate

luci-app-travelmate: adapt latest css changes

Merge pull request #2400 from dibdot/banip

luci-app-banip: sync with release 0.0.7

Merge pull request #2399 from dibdot/adblock

luci-app-adblock: sync with release 3.6.1

luci-app-travelmate: adapt latest css changes

Signed-off-by: Dirk Brenken <dev@brenken.org>

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>

luci-app-adblock: sync with release 3.6.1

* support new reporting options
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-olsr: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

luci-app-olsr: fix po errors

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

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

Merge pull request #2393 from RoEng/luci-app-wifischedule-i18n-de-1

luci-app-wifischedule: New German Translation

Merge pull request #2396 from musashino205/l10n/adblk-upd-ja

luci-app-adblock: update Japanese translation

Merge pull request #2395 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

Merge pull request #2397 from musashino205/l10n/base-fix-ja

luci-base: fix Japanese translation

Merge pull request #2390 from cshoredaniel/pr-nut-updates

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

luci-base: fix Japanese translation

Fixed Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

luci-app-adblock: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

luci-app-adblock: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

luci-app-shadowsocks-libev: add zh-cn translation

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

luci-app-wifischedule: New German Translation

New German Translation of wifischedule.po

Signed-of-by: Roland Engert <Roland.Engert@web.de>

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>

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>

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>

Merge pull request #2389 from dibdot/adblock

luci-app-adblock: minor fixes

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>

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>

_I18N_ luci-app-mwan3: i18n update de translation

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-mwan3: show supported tracking methodes if needed bin is installed

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-mwan3: add uptime/downtime to status page

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-mwan3: add tracking methode nping

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

Merge pull request #2386 from cshoredaniel/pr-uhttpd-spelling

luci-app-uhttpd: Correct spelling in two places

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>

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>

Merge pull request #2383 from TDT-AG/pr/20181220-luci-theme-material

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

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>

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>

Merge pull request #2351 from TDT-AG/pr/20181204-modules

modules: use configurable poll interval

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>

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>

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>

Merge pull request #2380 from dibdot/adblock

luci-app-adblock: sync with release 3.6.0

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>

Merge pull request #2381 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system

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

luci-theme-bootstrap: fix textarea height after CSS minification

Fixes #2378
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2377 from sotux/master-luci-app-aria2

luci-app-aria2: fix the log option

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>

Merge pull request #2375 from sotux/master-luci-app-aria2

luci-app-aria2: fix showRPCURL when using https

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>

luci-base: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>

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>

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>

luci-base: fix typo in german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: update german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: resync translation templates

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: support cidr list notation for option ipaddr and ip6addr

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: cbi.js: update deps on dynlist changes, honor placeholder

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo

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

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>

csstidy: update to latest Git head

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

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2369 from tano-systems/fix-changelog-mistake

luci-base: fix UCI changelog markup mistake

build: add build option to minify *.css files

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

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>

luci-base: fix UCI changelog markup mistake

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>

Merge pull request #2361 from stokito/master

CONTRIBUTING.md