Merge pull request #956 from lucize/master

Add luci-proto-ncm for comgt-ncm

Merge pull request #1063 from stangri/luci-app-simple-adblock

luci-app-simple-adblock: initial commit

Merge pull request #1026 from danrl/mwan

luci-app-mwan3: initial commit

Merge pull request #1025 from danrl/cshark

luci-app-cshark: initial commit

luci-app-firewall: adjust drop_invalid default (#1068)

Since firewall3 commit b33f78371e7c7b6a131c2b6c01673cbd4b3c13d1 the
drop_invalid option is off by default.

Adjust LuCI view to properly handle the changed semantics.

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

Merge pull request #1066 from TDT-GmbH/openvpn-fix-refactoring

luci-app-openvpn: fix prettify refactoring

luci-app-openvpn: fix prettify refactoring

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

Merge pull request #1065 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: updated service start/enable logic.

luci-app-vpnbypass: updated service start/enable logic.

luci-app-simple-adblock: initial commit of companion package to simple-adblock

luci-app-simple-adblock: bumped version number to match main package

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

Merge pull request #1059 from TDT-GmbH/openvpn_prettify

luci-app-openvpn: prettify openvpn-advanced parameter set

luci-app-openvpn: prettify openvpn-advanced parameter set

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

Merge pull request #1057 from TDT-GmbH/base-dhcp-de

luci-base: update german translation

luci-base: update german translation

Added some missing german translations

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

Merge pull request #1054 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: directly enable service from Web UI.

luci-app-vpnbypass: directly enable service from Web UI.

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

Merge pull request #1047 from hafu/ffp-profile

community-profiles: update Potsdam

i18n: sync translations

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

Merge pull request #1051 from luizluca/pt-br-update

luci-app-wireguard: Add pt-br translation

luci-app-wireguard: Add pt-br translation

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

updated community-profile for potsdam

- fixed ssid
- disable IPv6
- added more interface settings
- added settings for 5GHz wifi
- added ssidscheme
- added dhcp leasetime setting
- added LinkQualityAlgorithm for olsrd

Signed-off-by: Hannes Fuchs <hannes.fuchs@gmx.org>

Merge pull request #997 from hnyman/madwifi-cleanup

treewide: cleanup references to madwifi

meshwizard: cleanup references to madwifi

Remove the code related to the deprecated madwifi driver.

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

freifunk-common: cleanup references to madwifi

Remove the code related to the deprecated madwifi driver.

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

treewide: cleanup references to madwifi from LuCI

Remove the code related to the deprecated madwifi driver.

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

Merge pull request #1043 from hnyman/ieee80211

luci-mod-admin-full: new hostapd functionality for 80211w/r detection

luci-mod-admin-full: new hostapd functionality for 80211w/r detection

Use the new hostapd functionality (in LEDE) to detect 802.11r and 802.11w
more properly. Leave the old logic in place for Openwrt.

Adjust 802.11w default value from "0" to "" in order to avoid unnecessary
"option ieee80211w 0" lines in /etc/config/wireless

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

Merge pull request #1042 from musashino205/wg-add-ja

luci-app-wireguard: Add Japanese translation

luci-app-wireguard: Add Japanese translation

Added po templates file and Japanese translations.

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

Merge pull request #1039 from danrl/luci-proto-wireguard

luci-proto-wireguard: add support for fwmark option

luci-proto-wireguard: add support for fwmark option

Adds support for the fwmark option.

FwMark is a 32-bit fwmark for outgoing packets.
If set to 0 or "off", this option is disabled.

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

Merge pull request #1038 from danrl/luci-app-wireguard

luci-app-wireguard: performance+ (no more sys.exec calls)

luci-app-wireguard: performance+ (less sys.exec calls)

Thanks to latest developments in wireguard-tools, we can now
fetch all data we need for display using a single sys.exec()
call instead of multiple ones. This application is now
significantly smaller and runs much faster.

Added Firewall Mark feature.

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

Merge pull request #1005 from kdarbyshirebryant/miniupnpenable

luci-minuupnpd: use enable flag

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

luci-app-adblock: Update Japanese translation

Merge pull request #1034 from feckert/bootstrap_javascript_warning

luci-theme-boostrap: add javascript warning if disabled

Merge pull request #1036 from luizluca/pt-br-update

i18n: complete pt-br translation

luci-minuupnpd: use enable flag

Add a 'master' miniupnpd service enable flag rather than just relying on
rcS.d script existence.  This allows the service to be disabled
across sysupgrade, similar to minidlna.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>

luci-app-adblock: Update Japanese translation

Improved existing translations.

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

i18n: complete pt-br translation

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

luci-theme-boostrap: add JavaScript warning if disabled

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>

luci-base/po: update JavaScript nameing

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>

luci-theme-openwrt: fix JavaScript nameing

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>

luci-theme-freifunk-generic: fix JavaScript naming

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>

Merge pull request #1032 from feckert/update_base_po

luci-base: sync translations

luci-base: sync translations

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>

Merge pull request #1027 from danrl/lxc

luci-app-lxc: initial commit

luci-app-lxc: initial commit

Moved over here from the packages repository.

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

Merge pull request #1030 from danrl/luci-app-wireguard

luci-app-wireguard: resolve meta package in depdencies

luci-app-wireguard: resolve meta package in depdencies

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

luci.mk: only use remote branch detection

LEDE's scripts/feeds script creates local branches named after the checked
out commit hash, confusing local branch detection.

Solely use remote branch detection to avoid misidentifying such cases.

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

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>

Merge pull request #1022 from danrl/luci-app-wireguard

luci-app-wireguard: initial commit

luci-app-mwan3: initial commit

Moved over here from the packages repository.

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

luci-app-cshark: initial commit

Moved over here from the packages repository.

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

Merge pull request #1024 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: add datatypes and placeholders to fields

luci-app-wireguard: initial commit

This application allows for monitoring of WireGuard interfaces via the
Status menu.

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

luci-app-vpnbypass: add datatypes and placeholders to addresses and ports

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

Merge pull request #1023 from danrl/luci-proto-wireguard

luci-proto-wireguard: mark package as arch indep.

luci-proto-wireguard: mark package as arch indep.

Marks package luci-proto-wireguard as architecture independent.

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

luci-app-bcp38: fix typo in dependency

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

Merge pull request #1017 from danrl/luci-app-bcp38

luci-app-bcp38: added bcp38 application

Merge pull request #1018 from danrl/luci-app-clamav

luci-app-clamav: added clamav application

Merge pull request #1019 from danrl/luci-app-e2guardian

luci-app-e2guardian: add e2guardian application

Merge pull request #1020 from danrl/luci-app-squid

luci-app-squid: added squid application

luci-app-clamav: added clamav application

This application was moved from the packages repository to luci.

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

luci-app-squid: added squid application

This application was moved from the packages repository to luci.

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

luci-app-e2guardian: add e2guardian application

This application was moved from the packages repository to luci.

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

luci-app-bcp38: added bcp38 application

This application was moved from the packages repository to luci.

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

Merge pull request #1015 from danrl/proto-wireguard

luci-proto-wireguard: stricter input validation

luci-proto-wireguard: stricter input validation

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

Merge pull request #1014 from danrl/datatypes

luci-base: added datatypes `hostid` and `base64`

luci-base: added dhcpv6 datatypes

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

luci-base: sync translations

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

Merge pull request #1012 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: cbi file fix for README link and an unneeded section

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

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

This fixes #1011

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

luci-app-vpnbypass: cbi file fix for README and an unneeded section

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

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>

Merge pull request #1008 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: include dnsmasq settings, link to README

luci-app-vpnbypass: include dnsmasq settings, link to README

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

luci-app-statistics: remove non-functional links from graphs

The statistics graphs on the pages with multiple data sources
have contained links to the data sources, but those links
have not worked. Remove the links as they are unnecessary.

This commit fixes #1006

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

Merge pull request #1004 from kdarbyshirebryant/miniupnpluci

luci-app-miniupnpd: restore missing luci install file

Merge pull request #1002 from EricLuehrsen/unbound_uci_defaults

unbound: add uci-default script

Merge pull request #1003 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: makefile fix & controller fix

unbound: add uci-default script

Also if unbound-control is installed, then configure so
luci-app-commands can quickly show the "local zones" and
"local data" (aka hosts). This helps diagnose DHCP-DNS
zone data and adblock zone data.

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

luci-app-vpnbypass: makefile fix & controller fix

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

luci-app-miniupnpd: restore missing luci install file

Restore luci indexcache handling incorrect removed in
https://github.com/openwrt/luci/commit/387a06bb73462312c075e53ce9e6002d4af09e92

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>

Merge pull request #1001 from kdarbyshirebryant/minidlna

luci-app-minidlna: permit minidlna after sysupgrade

luci-app-minidlna: permit minidlna after sysupgrade

Do not disable minidlna after sysupgrade, rather trust the config
enabled status in /etc/config/minidlna.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>

Merge pull request #1000 from EricLuehrsen/luci_rt_con_cc1

luci: ignore '::1' in realtime connections

luci: ignore '::1' in realtime connections

luci ignores only 127.0.0.1 in real time connections.
The dnsmasq.init script sets up resolv.conf(s) as such.
With alternate DNS servers configured 'localhost' will
resolve to '127.0.0.1' or '::1'. The connections graph
will spam itself. openwrt/luci#996

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

Merge pull request #999 from musashino205/base-upd-ja

luci-base: Update Japanese translation

luci-base: Update Japanese translation

Added some Japanese translations of recently added strings.

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

luci-base: Sync translations

Synchronized translations with Lua sources.

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

luci-mod-admin-full: tweak 80211w options

Use ListValue type and enable translation of the option values.

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

remote-update: remove ancient non-maintained package

Remove the ancient 'remote-update' package that has not been
updated for years. It e.g. references two non-existing targets.

Reference to discussion in #995

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

luci-mod-admin-full: add support for 802.11w options

Add support for IEEE802.11w Management Frame Protection options.

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

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

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

luci-mod-admin-full: add validation to more 802.11r options

Apply hexstring datatype to mobility domain and r1_key_holder.

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

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>

luci-mod-admin-full: improve 802.11r support

* Add WPA/WPA2-PSK mixed mode to the list of allowed modes
* Add datatype validation to some fields
* Add help texts
* Reformat longest lines

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