Merge pull request #2121 from jokdarius/feature/0001-performace-fix

luci-mod-admin-full: performance fix

Merge pull request #2159 from TDT-AG/pr/20180918-luci-theme-material-css-customize

luci-theme-material: make colors configurable

Merge pull request #2126 from rosysong/ipv6

luci-proto-ipv6: fix dependency for IPv6

Merge pull request #2150 from ameer1234567890/material-theme-monospace-font

luci-theme-material: Monospace font for textarea elements

luci-theme-material: make colors configurable

The var() css function can be used to insert the value of a custom property.
A custom.css file is added to change the colors. This file will get included
in the cascade.css file.

The following colors could be costomized in the file costom.css.

--header-bg
--header-color
--menu-bg-color
--menu-color
--submenu-bg-hover
--submenu-bg-hover-active

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

Merge pull request #2154 from dibdot/openvpn-fix

luci-app-openvpn: remove obsolete config options

luci-app-openvpn: remove obsolete config options

* remove obsolete config options according to
  openwrt/openwrt@89b8ba9, fix for #2135
* whitespace/intendation fixes
* replace fieldset leftover with div
* fix finally recipe options transfer to regular config with "Add"

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

Merge pull request #2149 from dibdot/openvpn-fix

luci-app-openvpn: fix template based config creation

Merge pull request #2152 from EricLuehrsen/unbound-1.8.0

luci-app-unbound: add protocol=ip4_local option support

luci-app-unbound: add protocol=ip4_local option support

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

Merge pull request #2122 from rosysong/backup

Backup: add firmware backup for mtdblock devices

luci-theme-material: Monospace font for textarea elements

Signed-off-by: Ameer Dawood <ameer1234567890@gmail.com>

luci-app-openvpn: fix template based config creation

* minimal fix to bring back openvpn config creation based on
openvpn_recipes template, fix for #2146

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

Merge pull request #2148 from ysoyipek/patch-5

luci-base: update Turkish translation

luci-base: update Turkish translation

Add missing translations.

Signed-off-by: Yusuf Soyipek <yusuf@soyipek.com>

Merge pull request #2144 from TDT-AG/pr/20180912-i18n-sync-translations

i18n: sync translations

i18n: sync translations

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

Merge pull request #2071 from Andy2244/luci-app-samba4-timemachine

luci-app-samba4: add macOS and Apple Timemachine support

luci-app-samba4: add macOS compatibility option and Apple Timemachine support

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

Merge pull request #2136 from aft90/luci-app-adblock-query-box-placeholder

luci-app-adblock: use placeholder in query tool

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

luci-app-adblock: update Japanese translation

luci-app-adblock: update Japanese translation

Updated Japanese translations.

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

modules: add backup module for mtdblock devices

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

luci-app-adblock: use placeholder in query tool

Use the placeholder property on the textbox in the query tool so it's more convenient.

Signed-off-by: Andrei Troie <andreitroie90@gmail.com>

Merge pull request #2131 from tano-systems/firewall-fix-russian-translation

luci-app-firewall: fix and update Russian translation

luci-app-firewall: fix and update Russian translation

Add missing translations and update existing not quite correct translations.
Removed redundant <br> tags from translations.

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

luci-base: fix a typo in Russian translation

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

Merge pull request #2110 from stangri/luci-app-https_dns_proxy

luci-app-https_dns_proxy: initial commit

Merge pull request #2120 from TDT-AG/pr/20180830-luci-app-mwan3-fixes

luci-app-mwan3:  fixes and improvements

luci-app-https_dns_proxy: initial commit

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #2129 from Rixerx/master

luci-base: update Polish translation

luci-base: update Polish translation

Updated Polish translations.

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

Merge pull request #2127 from tano-systems/update-russian-translation

luci-base: update Russian translation

Merge pull request #2125 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.5

luci-base: update Russian translation

Add missing translations.

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

luci-proto-ipv6: fix dependency for IPv6

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

Merge pull request #2124 from YuriPet/master

luci-base: update Ukrainian translation

luci-app-adblock: sync with adblock 3.5.5

* fix cornercase issues in runtime information/json parsing

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

luci-base: update Ukrainian translation

Updated with the latest sync translation.

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

Merge pull request #2123 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>

luci-mod-admin-full: performance fix

* uci:get replaced with direct access of value (functions has 3x better performance in that way)

Signed-off-by: Darius Joksas <jok.darius@gmail.com>

luci-proto-ppp: align keepalive defaults with current OpenWrt

Disabling LCP echos by *not* setting "option keepalive" was broken in
OpenWrt since https://dev.archive.openwrt.org/ticket/2373.html so setting
"0" in LuCI had the effect of reverting back to "5, 1" while the help
suggested otherwise.

Support for "keepalive 0" was fixed with https://git.openwrt.org/555c59230
so align LuCI now to emit "option keepalive 0" instead of removing the
option when entering "0" in the gui.

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

luci-app-mwan3: translate missing text in diagnostic page

Translate missing text.

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

luci-app-mwan3: diagnostic fix physical device lookup

Use diffrent function to get the physical interface name.

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

luci-app-mwan3: change interface enabled option to use flag cbi class

Make mwan3 interface enable config option use cbi flag.

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

luci-app-mwan3: add command to diag_command output view

Add executed command to diagnostic output.

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

Merge pull request #2117 from cshoredaniel/pr-app-nut

luci-app-nut: Add support for NUT configuration

luci-app-nut: Add support for NUT configuration

Adds app to configure NUT (Network UPS Tools), including
nut-server, nut-monitor, and nut-cgi.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>

Merge pull request #2103 from dibdot/force_fix

luci-mod-admin-full: fix forced upgrade

luci-mod-admin-full: fix forced upgrade

* fix logical glitch in forced upgrade logic

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

Merge pull request #2095 from ameer1234567890/remove-colons-unbound

luci-app-unbound: Colons removed from input headers

luci-app-unbound: Colons removed from input headers
Most OpenWrt applications do not have a colon in input headers.
This has been explained in #1566 as well.
This commit removes the said colons.

Signed-off-by: Ameer Dawood <ameer1234567890@gmail.com>

Merge pull request #2075 from dibdot/force_update

luci-mod-admin-full: allow forced upgrade (revised)

luci-mod-admin-full: allow forced upgrade (revised)

* allow 'forced' firmware upgrades, even if the image format check
fails. Useful where flashing back to the OEM versions or switching
between ar71xx and ath79 builds
* option is only visible after first/failed image check
* added warning info (see screenshots below)

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

luci-base: remove fake password field from tab order

Set a negative tabindex on the dummy password field to not break the form
tab order flow.

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

luci-base: mark password template dummy field as hidden

Mark the dummy input field as aria-hidden, should fix #2063.

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

Merge pull request #2068 from ameer1234567890/patch-1

luci-app-minidlna: Colons removed

luci-app-minidlna: Colons removed
Colons have been removed as asked in #1566
Signed-off-by: Ameer Dawood <ameer1234567890@gmail.com>

Merge pull request #2066 from hcwhan/master

the 'infinite' error in zh-cn

Update base.po

Merge pull request #2040 from yangfl/master

luci-app: update Chinese translation

Merge pull request #1989 from hanipouspilot/ncm

luci-proto-ncm: suggest both tty and wdm devices

Merge pull request #2060 from Ansuel/reboo

luci-mod-admin-full: applyreboot doesn't reload page

Merge pull request #2058 from EricLuehrsen/unbound_20180810

luci-app-unbound: add zone-details combined tab

luci-mod-admin-full: applyreboot doesn't reload page

The applyreboot page doesn't reload the page onload of the loding gif. This adds the right function.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

luci-app-firewall: allow "open ports" when no wan zone exists

Arguably this makes little if no wan zone exists but prefer consistency
over heuristics and always render the "open port" shortcut.

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

treewide: rework uci change display

 - Use native rpcd uci changes format instead of incompletely converting
   back and forth between the old and the new format
 - Rework uci changelog template to print the equivalent uci commands
   for the various changes
 - Rework theme headers to properly count the uncomitted changes
 - Rework theme CSS to properly style new changelog

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

luci-app-unbound: add zone-details combined tab

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

luci-app: update Chinese translation

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

Merge pull request #2053 from YuriPet/master

luci-base: corrected Ukrainian translation

Update base.po: corrected translation errors

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

Merge pull request #2042 from Ansuel/apprebooy

luci-mod-admin-full: improve applyreboot page

luci-mod-admin-full: fix broken applyreboot page

This improve applyreboot page and fix problem with luci-nginx that doesn't refresh the page when the router reboot.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

Merge pull request #2043 from Ansuel/materialfix

luci-theme-material: fix theme for applyreboot page changes

luci-theme-material: fix theme for applyreboot page changes

This rename style.css to casade.css (like the other themes) and fix the css to display the header even in the applyreboot page

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

Merge pull request #2041 from farmergreg/to-be-or-not-to-be

Correct grammar in apply_widget.htm

Correct grammar in apply_widget.htm

This patch corrects "to get" to "to be" in apply_widget.htm
This shell command was used to find and make the change in
all impacted files:

find . -type f -exec sed -i 's/Waiting for configuration to get applied/Waiting for configuration to be applied/g' {} +

Signed-off-by: Gregory L. Dietsche <gregory.dietsche@cuw.edu>

luci-base: update Chinese translation

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

Merge pull request #2038 from musashino205/l10n/samba4-upd-ja

luci-app-samba4: update Japanese translation

luci-app-samba4: update Japanese translation

Updated Japanese translations.

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

Merge pull request #2037 from Rixerx/master

luci-base: update Polish translation

luci-base: update Polish translation

Updated Polish translations.

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

Merge pull request #2026 from alanswanson/master

luci-mod-admin-full: Fix DSL Stats display of dB statistics

luci-mod-admin-full: Fix DSL Stats display of dB statistics
Line attenuation, signal attenuation, noise margin and aggregate transmit power really need to show
decimal digits. Fixes commit 88713f6 from issue #2003 due to excess changes from %s to %d.

Merge pull request #2029 from yangfl/master

luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

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

Merge pull request #2017 from chris5560/master-ddns

luci-app-ddns: remove myself as PKG_MAINTAINER

Merge pull request #2015 from chris5560/master

luci-app-radicale: remove myself as PKG_MAINTAINER

luci-theme-bootstrap: fix CSS regression in kernel/system log pages

An unrelated removed some crucial fixes due to improper rebasing.

Fixes: 7ba4eb1a4 ("luci-theme-bootstrap: add styling for input-adjacent buttons")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #2021 from dibdot/travelmate

luci-app-travelmate: "final" fixes

Merge pull request #2019 from dibdot/adblock

luci-app-adblock: "final" fixes

luci-app-travelmate: "final" fixes

during intense testing with different browsers (Chrome/Firefox/partly IE
in a VM) I found & fixed some more minor things:

* re-add accidently removed "apply_on_parse" attribute in overview cbi
* fixed a corner case where the "Restart" button not works correctly
* Removed leftovers from last commit

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

luci-app-adblock: "final" fixes

during intense testing with different browsers (Chrome/Firefox/partly IE
in a VM) I found & fixed some more minor things:

* remove needless hook & include from overview page
* fix possible JS error in Runtime Information
* Align CSS color with "LuCI standard"

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

Merge pull request #2001 from Rixerx/master

luci-base: update Polish translation

luci-app-ddns: remove myself as PKG_MAINTAINER

remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

luci-app-radicale: remove myself as PKG_MAINTAINER

remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Merge pull request #2012 from jempatel/master

fix compilation failure when luasrcdiet is being copied to non existing directory

fix compilation failure when luasrcdiet is being copied to non existing directory

Signed-off-by: Jaymin Patel <jem.patel@gmail.com>