luci.mk: fix branch detection in detached HEAD state

When LuCI is checked out via pinned feeds configuration, its source tree will
end up in detached head state, requiring some more magic to figure out the
proper branch.

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

i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-mod-admin-full: change html for compatibility with openwrt theme

Openwrt theme apparently accepts slightly different html than
Bootstrap or Material. Change code to <br /> to make it compatible.

This fixes #1011

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 6a2a62fa4f9b220398fd2ed1a1fe79197b0019c9)

luci-mod-admin-full: place 80211w options behind a check for wpad-full

The default hostapd/wpad mini version does not support ieee80211w
and the option's visibility in LuCI may lead it to be placed in user's
/etc/config/wireless preventing wifi from starting.

Check for hostapd/wpad full before exposing the option.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 07e01d094eb25e1f036e85b8cfc5aceccc56003c)

Merge pull request #998 from hnyman/backport-80211r-80211w

Backport 802.11r and 802.11w LuCI support to lede-17.01

Backport: support for 802.11w Management Frame Protection

Add support for IEEE802.11w Management Frame Protection options
into the wireless config.

Mention in the help text that the full version of wpad/hostapd is
needed.

Currently supported in LEDE by ath9k and ath10k, mwlwifi and mt76.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4ddb6b28168e030263bc4ee7242880b8176637b7)
(cherry picked from commit 4d31f7ca30efc7158f8184885df86b9325ecdcba)

Backport: support for 802.11r fast transition in wireless config

Backports from master the commits that add support for
IEEE802.11r Fast Transition to luci.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f02794f28c343070487bbc794b425f91b675fdb9)
(cherry picked from commit 171c06146ad2a45b1026e3a9779766855964fc2d)
(cherry picked from commit 02bed261881dd60f212f81e7ed3e3afeb4bd890d)
(cherry picked from commit c491c181ea69dc544b49dff66d999f62ebf48619)

luci-base: add hexstring datatype

Add datatype 'hexstring' for input validaiton datatypes.

It will accept any hexadecimal string.

(no length validation, as rangelength can be used for that.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 11f23559e4be78f202aa55d811d5b58cb0ca0a78)

Merge pull request #957 from musashino205/17-dynpnt-add-ja

luci-app-dynapoint: Add Japanese translation

luci-app-adblock: put backup options to global section

this PR reflect the changes made in adblock 2.3.0

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit d3a74836b7abb64591afde6ce0d0eb7a40d308fa)

luci-ssl-openssl: use OpenSSL for key generation, drop px5g

Replace a dependency for px5g with openssl-util. Both LEDE and
Openwrt have now uhttpd versions that can generate keys with
OpenSSL cmd tools if px5g is not found. This change enables an
"OpenSSL-only" version of LuCI without mbedTLS/PolarSSL.

(Note: if px5g is found, uhttpd will prefer that.)

Relevant commits in uhttpd:

LEDE:
https://github.com/lede-project/source/commit/3c4858eeb2bbb3107f87bb3be07d5c172c8e0ef9
https://github.com/lede-project/source/commit/82132540a3efbc98f8f4379b26d4b4541013e69d
https://github.com/lede-project/source/commit/9097dc5ad844c336020be11085e1c8c80390ac9c

Openwrt:
https://github.com/openwrt/openwrt/commit/6ec32832d25335355d205c4601d4a8ca5dfd6808

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b6341bd197aed9640c4d0dcff73019e045978df0)

luci-mod-admin-full: fixes for usbport LED triggers

The previous commit erroneously used "ports" instead of "port" as name for the
option widget, causing wrong uci values to be written.

Also work around some cbi idiosyncrasies regarding MultiValue widgets which
prevented rendering the correct initial selection state.

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

luci-base: fix logic errors in ipmask4 and ipmask6 datatype validators

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

luci-mod-admin-full: admin: change password in Map.parse()

Move the password setting into the .parse() callback to ensure that it is
updated regardless of whether "Save" or "Save & Apply" has been pressed.

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

luci-mod-admin-full: support configuring usbport LED triggers

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

luci-base: mvalue: fix column wrapping

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

luci-mod-admin-full: reload wifi settings page after changing countey code

Reloading the page ensures that the allowed tx power values and channel select
lists are properly populated with the new effective values.

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

luci-mod-admin-full: allow unset txpower value

Sometimes txpower is not set so we should have an option with empty
value to let it stay unset.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

luci-base: datatypes.lua: add missing parentheses in conditional

The missing parens lead to a wrong expression precedence, causing a runtime
error when attempting to compare nil with a number.

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

luci-app-firewall: use new ipmask validation types when applicable

This allows for address specifications like "fdca:1234:0123::abcd/::ffff:ffff:ffff:ffff"
which only match the last 64 bits of an address. This syntax is legal and already supported
by iptables and firewall3.

Fixes https://bugs.lede-project.org/index.php?do=details&task_id=417

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

luci-base: add ipmask, ipmask4 and ipmask6 validators

These validators accept IP address specifications in the form

 - address
 - address/bits
 - address/netmask

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

luci-base: datatypes.lua: cleanup white space

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

luci-app-dynapoint: Add Japanese translation

Added Japanese translations.

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

Merge pull request #953 from musashino205/mount-fix-disp

luci-mod-admin-full: Fix display problems of mount

Merge pull request #947 from danrl/proto-wireguard

luci-proto-wireguard: enable addressing for tunnel interfaces

Merge pull request #817 from ascob/luci-app-dynapoint

luci-app-dynapoint: new package

Merge pull request #917 from aa65535/master

luci-base:adjust the code order

Merge pull request #946 from chloe-jeong/trunk-ko

Updates korean languages.

Merge pull request #861 from ynezz/master

luci-mod-admin-full: Store system time into RTC also

Merge pull request #859 from feckert/realtime_wlan

luci-mod-admin-full: show realtime wlan graph only if iw command is installed

luci-base: sync translations

Recently a string to be translated were added to Lua source, so
I synchronized po templates and po file of each language with Lua
source.

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

luci-mod-admin-full: Fix display problems of mount

Fixed some display problems where the UUID label of the drop down
list does not exist and the positions of other labels are misplaced
in mount settings page.

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

luci-app-dynapoint: new package

Add luci-app-dynapoint to repo
LuCI Support for DynaPoint
Dynapoint allows dynamic access point creation
and deletion depending on changes of certain network conditions.
More information: https://github.com/thuehn/dynapoint

Signed-off-by: Tobias Ilte <tobias.ilte@campus.tu-berlin.de>

Merge pull request #948 from musashino205/wifi-fix-disp

luci-mod-admin-full: Fix display problem of wifi_add

luci-mod-admin-full: Fix display problem of wifi_add

Fixed an issue where the network name is displayed as "%q" on wlan
connection destination network settings page.

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

luci-proto-wireguard: enable addressing for tunnel interfaces

Enable static addresses on WireGuard tunnel interfaces without requiring
an static address interface.

This removes the requirement to use a static address interface on top of a
WireGuard tunnel interface in the majority of cases. In the past, users have
been confused by the current approach and asked for a simpler way to configure
WireGuard interfaces.

Signed-off-by: Dan Luedtke <mail@danrl.com>

luci-app-firewall: Updates korean language.

Initial korean language support for luci-app-firewall.

Signed-off-by: Weongyo Jeong <weongyo@gmail.com>

luci-base: Updates korean language.

Signed-off-by: Weongyo Jeong <weongyo@gmail.com>

Merge pull request #942 from musashino205/tmate-upd-ja

luci-app-travelmate: Update Japanese translation

Merge pull request #943 from SvenRoederer/patch-1

freifunk-common: bump version as of recent changes

freifunk-common: bump version as of recent changes

the updates for olsr-0.9.5 compatibility should have changed the release-number

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>

luci-app-travelmate: Update Japanese translation

Added some translations of recently added strings.

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

luci-app-travelmate: sync translations

Recently several strings to be translated ware added to Lua source, so I updated po templates and japanese po file.

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

Merge pull request #939 from dibdot/master

luci-app-travelmate: update gui elements

Merge pull request #938 from cshore-firmware/pull-request-statistics-df

app-statistics: df: Don't separate disk usage types

luci-app-travelmate: update gui elements

* update gui elements to reflect changes in travelmate 0.3.x

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

i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-mod-admin-full: fix help text for wifi join options

Clarify the help text in the wifi join dialog.
Reference to #793, #876, #897

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #933 from musashino205/wifischd-upd-ja

luci-app-wifischedule: Update Japanese translation

luci-app-wifischedule: Update Japanese translation

Added a Japanese translation of recently added string.

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

Merge pull request #930 from cshore-firmware/pull-request-fix-webadmin

base: webadmin: Don't take substring of nil variable

Merge pull request #929 from bittorf/master

luci-app-olsr: adapt to changed behavior of new OLSRd v0.9.5

luci-app-olsr: adapt to changed behavior of new OLSRd v0.9.5

controller/olsr.lua:
drop HTTP-headers which are now emitted, we do not need them

status-olsr/neighbors.htm:
olsr ETX value now without muliplication 1024x

Signed-off-by: Bastian Bittorf <bb@npl.de>
Signed-off-by: Freifunk UFO <ufo@rund.freifunk.net>

luci-ssl-openssl: update note about px5g's SSL library usage

px5g still requires libmbedtls (in LEDE) or libpolarssl (in Openwrt).

In LEDE it is also possible to replace px5g with openssl-util and
achieve "openssl-only" build without libmbedtls, as uhttpd can also
generate keys with openssl commandline tools if px5g is not present.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #919 from kuoruan/luci-app-wifischedule

Luci app wifischedule: minor changes

Merge pull request #927 from jp-bennett/master

[luci-app-fwknopd] Remove usage of dynamic tag.

[luci-app-fwknopd] Remove usage of dynamic tag.
Also adds NAT-DNS as a default setting, and enables a QR-code per access.conf entry
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>

luci-app-wifischedule: minor changes

* Formatting codes.
* Move to services sub menu.
* Update Simplified Chinese translation.
* And some other small changes.

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

Merge pull request #923 from kuoruan/i18n-zh-cn

Update Simplified Chinese translation

luci-app-privoxy: Update Simplified Chinese translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

luci-base: Update Simplified Chinese translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

luci-base: update LuaSrcDiet download location

Update the googlecode download address to the current one.

Change hash to SHA256 at the same time.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-base:adjust the code order

The `cbi_validate_field` should be after data initialized.

Signed-off-by: Jian Chang <aa65535@live.com>

Merge pull request #916 from musashino205/shairplay-add-ja

luci-app-shairplay: Add Japanese translation

luci-app-shairplay: Add Japanese translation

Added Japanese translations and po templates.

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

Merge pull request #908 from SvenRoederer/update_community-profiles/master

community-profiles: update Berlin

luci-theme-bootstrap: tune default style select boxes

The previous styling made select dropdowns look like disabled text input
fields on Chrome browsers.

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

Merge pull request #914 from musashino205/wifischd-upd-ja

luci-app-wifischedule: Update Japanese translation

luci-app-wifischedule: Update Japanese translation

Added some translations of recently added strings.

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

Merge pull request #912 from kuoruan/luci-app-wifischedule

Luci-app-wifischedule: Update translation

luci-app-wifischedule: Add Simplified Chinese translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

luci-app-wifischedule: Add more translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

Merge pull request #909 from musashino205/uhttpd-add-ja

luci-app-uhttpd: Add Japanese translation

luci-app-uhttpd: Add Japanese translation

Added Japanese translation.

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

luci-app-uhttpd: Add po templates

Added po template (.pot) file.

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

community-profiles: update Berlin

since Kathleen-0.2.0 Release there is a new owm-api-url

Signed-off-by: Sven Roederer devel-sven@geroedel.de

base: webadmin: Don't take substring of nil variable

When converting interface names to UCI network names
webadmin fails if there is no UCI network name because
webadmin failed to ensure uciname has a value before
attempting to take a substring.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>

Merge pull request #906 from musashino205/tmate-add-ja

luci-app-travelmate: Add Japanese translation

luci-app-travelmate: Add Japanese translation

Added Japanese translations.

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

Merge pull request #905 from musashino205/upnp-upd-ja

luci-app-upnp: Update Japanese translation

Merge pull request #904 from musashino205/firewall-upd-ja

luci-app-firewall: Update Japanese translation

luci-app-upnp: Update Japanese translation

Added some translations and fixed mistranslated string.

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

luci-app-firewall: Update Japanese translation

Added some translations for the schedule settings and others.

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

Merge pull request #901 from musashino205/wifischd-add-ja

luci-app-wifischedule: Add Japanese translation

Merge pull request #903 from musashino205/stat-fix-ja

luci-app-statistics: Fix mistranslations for Japanese

luci-app-statistics: Fix mistranslations for Japanese

Fixed some mistranslations for Japanese.

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

luci-app-statistics: fix mistranslation of Japanese

Fixed some mistranslations of Japanese.

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

luci-app-wifischedule: Add Japanese translation

Added Japanese translations and po templates.

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

luci-ssl: depend on mbedtTLS

LEDE uses mbedTLS as default SSL provider now and PolarSSL becomes EOL at the
end of 2016.

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

Merge pull request #898 from musashino205/adblock-upd-ja

luci-app-adblock: Update Japanese translation

luci-app-adblock: Update Japanese translation

Added some translations of recently added strings.

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

Merge pull request #896 from musashino205/stat-upd-ja

luci-app-statistics: Update Japanese translation

luci-app-statistics: Update Japanese translation

Added translations for each plugins.

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

i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #840 from TouchStar/support_proto_qmi

luci-proto-qmi: Added support for QMI Cellular

Merge pull request #895 from musashino205/qos-upd-ja

luci-app-qos: Update Japanese translation

luci-base: luci.sys.iptparser: properly check for table support

Do not assume that the "raw" table is present on any system, instead check
/proc/net/ip{,6}_tables_names to determine which iptables tables are available.

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

luci-app-qos: Update Japanese translation

Add some translations.

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

Merge pull request #894 from musashino205/p910nd-upd-ja

luci-app-p910nd: Update Japanese translation