Jo-Philipp Wich [Fri, 6 Apr 2018 09:45:26 +0000 (11:45 +0200)]
luci-app-unbound: dispatch SimpleForm models using the form() action
This fixes issues dicovered by check-controllers.sh
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 10:07:01 +0000 (12:07 +0200)]
luci-base: emit a warning if cbi() delegates a SimpleForm instance
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 09:40:19 +0000 (11:40 +0200)]
build: add check-controller.sh, a utility to test controller files
The main purpose of the script is to check if the module declaration
matches and if associated cbi resources are properly referenced.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 07:35:39 +0000 (09:35 +0200)]
luci-app-mwan3: fix legacy uci api usage
Explicitely require libuci-lua in model classes that use legacy /var/state
cursor handling.
Also add a specific dependency on libuci-lua to the luci-app-mwan3
Makefile in preparation of the upcoming default removal of libuci-lua.
Finally fix the post data dispatching on the notification tab, see #1722
for reference.
Fixes #1726.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 07:24:36 +0000 (09:24 +0200)]
luci-base: implement luci.model.uci.get_state()
Introduce a get_state() function which can be used to access legacy
uci state variables. This is usually not needed anymore but some
packages (mainly mwan3) still rely on this.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 06:48:26 +0000 (08:48 +0200)]
luci-proto-ipv6: clarify 6in4 local address hint
Make the hint message more explicit to tell users that the prefix size needs
to be specified as well.
Fixes #1559.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 05:56:56 +0000 (07:56 +0200)]
luci-mod-rpc: rework authentication and session handling
- Use the ubus session.login procedure to authenticate credentials
- Fix testing of allowed usernames
- Support authentication via sysauth cookie
Fixes #1300, #1700, #1711
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 6 Apr 2018 04:58:32 +0000 (06:58 +0200)]
luci-mod-admin-full: fix request path access in uci controller
Fixes #1725
Fixes
731ed77c0 ("treewide: improve handling of page redirections in uci change views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 5 Apr 2018 21:00:46 +0000 (23:00 +0200)]
luci-mod-admin-full: escape display parameter
Prevent reflected XSS through the reset button by url encoding the
display parameter.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 5 Apr 2018 20:37:37 +0000 (22:37 +0200)]
treewide: improve handling of page redirections in uci change views
Instead of passing the full LuCI request url, pass the relative resolved
request path instead and filter the received value through the lookup()
dispatcher function to only allow paths to actual internal pages.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 5 Apr 2018 19:58:41 +0000 (21:58 +0200)]
luci-base: introduce luci.dispatcher.lookup()
The lookup function takes multiple, possibly malformed path fragments,
splits them on slashes, constructs a temporary path and looks up the
result in the dispatch tree.
If a matching node has been found, the function will return both the
node reference and the canonical url to it.
If no corresponding node is found, the function returns nil.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Dirk Brenken [Thu, 5 Apr 2018 20:42:14 +0000 (22:42 +0200)]
Merge pull request #1723 from dibdot/travelmate
luci-app-travelmate: bugfixes
Dirk Brenken [Thu, 5 Apr 2018 20:39:46 +0000 (22:39 +0200)]
luci-app-travelmate: bugfixes
* use the form() action to invoke the SimpleForm models
* fix 'wifi_add' input form
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Thu, 5 Apr 2018 17:21:50 +0000 (19:21 +0200)]
luci-app-adblock: fix SimpleForm page delegation
Invoke the SimpleForm models using the form() action, not the cbi() ones.
This avoids the extraneous rendering of the cbi header template, avoiding
rejected save operations due to duplicated token value.
Fixes #1722.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Dirk Brenken [Thu, 5 Apr 2018 12:43:53 +0000 (14:43 +0200)]
Merge pull request #1718 from dibdot/travelmate
luci-app-travelmate: sync with travelmate 1.2.0
Jo-Philipp Wich [Thu, 5 Apr 2018 07:49:49 +0000 (09:49 +0200)]
Merge pull request #1709 from dibdot/get_interface-fix
luci-base/network.lua: fix get_interface function
Jo-Philipp Wich [Thu, 5 Apr 2018 07:32:22 +0000 (09:32 +0200)]
treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 5 Apr 2018 07:29:38 +0000 (09:29 +0200)]
luci-base: introduce luci.util.shellquote()
Introduce a new function luci.util.shellquote() which encloses the given
string argument in single quotes and escapes any embedded single quote
characters.
This function is intended to be used when interpolating untrusted input
into shell commands.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 22:33:09 +0000 (00:33 +0200)]
luci-mod-admin-full: fix possible shell injection in bandwith status
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 22:32:28 +0000 (00:32 +0200)]
luci-base: fix possible shell injection in luci.tools.status.switch_status()
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 22:15:22 +0000 (00:15 +0200)]
luci-base: dispatcher: reject non-POST requests with any cbi.submit value
Due to the fact that luci.model.cbi reacts on any "cbi.submit" value while
the dispatcher only required POST for cbi.submit == 1, the CSRF token
protection could be bypassed.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 21:32:44 +0000 (23:32 +0200)]
luci-app-freifunk-diagnostics: use FULL_REQUEST_URI
Switch from using the REQUEST_URI CGI variable directly to the canonicalized
FULL_REQUEST_URI property.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 21:32:23 +0000 (23:32 +0200)]
luci-app-commands: use FULL_REQUEST_URI
Switch from using the REQUEST_URI CGI variable directly to the canonicalized
FULL_REQUEST_URI property.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 21:30:49 +0000 (23:30 +0200)]
luci-base: use FULL_REQUEST_URI on login form templates
Switch from using the REQUEST_URI CGI variable directly to the canonicalized
FULL_REQUEST_URI property.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 4 Apr 2018 21:24:31 +0000 (23:24 +0200)]
luci-base: add FULL_REQUEST_URI template property
Introduce a new template property FULL_REQUEST_URI which returns the full
canonicalized request URL built from SCRIPT_NAME, PATH_INFO and QUERY_STRING.
This new property is safer to use compared to using the raw REQUEST_URI CGI
environment variable directly as this value is essentially untrusted user
input which may contain embedded escaped slashes, double forward slashes and
other oddities allowing XSS exploitation or request redirection.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 22 Mar 2018 08:52:55 +0000 (09:52 +0100)]
luci-mod-admin-full: use strict hostname validation for dhcp hosts
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 22 Mar 2018 08:49:52 +0000 (09:49 +0100)]
luci-base: add a strict flag to the hostname validator
Some applications, e.g. dnsmasq, do not allow hostnames starting with an
underscore, therefor extend the existing hostname datatype validator with
a `strict` which disallows a leading underscore.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 14 Mar 2018 00:23:50 +0000 (01:23 +0100)]
luci-base: switch to ubus uci operations
Switch luci.model.uci to use ubus uci calls instead of driving libuci-lua
directly.
This prepares support for more advanced features such as per-session change
isolation and configuration rollback on errors.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Dirk Brenken [Wed, 4 Apr 2018 12:19:23 +0000 (14:19 +0200)]
luci-app-travelmate: sync with travelmate 1.2.0
* remove needless 'automatic' and 'trigger' options plus small fixes
Signed-off-by: Dirk Brenken <dev@brenken.org>
Hannu Nyman [Tue, 3 Apr 2018 14:43:57 +0000 (17:43 +0300)]
Merge pull request #1715 from TDT-AG/pr/
20180403-luci-app-mwan3-update
luci-app-mwan3: fixes and improvments
Florian Eckert [Tue, 3 Apr 2018 11:21:49 +0000 (13:21 +0200)]
luci-app-mwan3: remove unnecessary 'tracking active' hint
Remove the unnecessary 'tracking active' hint from the status interface
page.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Tue, 3 Apr 2018 11:16:44 +0000 (13:16 +0200)]
luci-app-mwan3: remove diag-rc-legend field id
On the material theme the "Collecting data" hint in the status pages
was still present on the page even though the command was sucessfull executed.
Remove the legend tag and move the info "Collecting data" to the
"diag-rc-output" tag will solve this issue.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Tue, 3 Apr 2018 09:43:52 +0000 (11:43 +0200)]
luci-app-mwan3: calculate max interface usage from mmx_mask value
Show max interface value on interface page dependent on the mmx_mask
value
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Qian Zheng [Mon, 2 Apr 2018 00:46:50 +0000 (08:46 +0800)]
luci-base: zh_CN: update Simplified Chinese translation
Signed-off-by: Qian Zheng <sotux82@gmail.com>
Dirk Brenken [Sat, 31 Mar 2018 05:06:52 +0000 (07:06 +0200)]
luci-base/network.lua: fix get_interface function
* fix wrong private function call to handle
section id as parameter (fix for #1687)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Hannu Nyman [Thu, 29 Mar 2018 13:41:47 +0000 (16:41 +0300)]
Merge pull request #1706 from musashino205/l10n/tmate-upd-ja
luci-app-travelmate: update Japanese translation
INAGAKI Hiroshi [Thu, 29 Mar 2018 04:13:38 +0000 (13:13 +0900)]
luci-app-travelmate: update Japanese translation
Updated Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Thu, 29 Mar 2018 03:51:13 +0000 (12:51 +0900)]
i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Dirk Brenken [Wed, 28 Mar 2018 09:22:15 +0000 (11:22 +0200)]
Merge pull request #1703 from dibdot/travelmate
luci-app-travelmate: made "ignore bssid" flag conditional
Dirk Brenken [Wed, 28 Mar 2018 09:21:56 +0000 (11:21 +0200)]
Merge pull request #1704 from TDT-AG/pr/
20180328-luci-app-mwan3-fixes
luci-app-mwan3: fix syntax error and update notify page
Florian Eckert [Wed, 28 Mar 2018 07:17:34 +0000 (09:17 +0200)]
luci-app-mwan3: update notify info
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Wed, 28 Mar 2018 07:17:13 +0000 (09:17 +0200)]
luci-app-mwan3: fix strict XHTML syntax error
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Dirk Brenken [Wed, 28 Mar 2018 07:22:19 +0000 (09:22 +0200)]
luci-app-travelmate: made "ignore bssid" flag conditional
* made the "ignore bssid" flag conditional to ease connection
to hidden networks:
* default for hidden networks "disabled"
* default for all others "enabled"
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Tue, 27 Mar 2018 20:45:57 +0000 (22:45 +0200)]
Merge pull request #1697 from TDT-AG/pr/
20180323-luci-base-fix-tblsection
luci-base: add missing colspan in tblsection if table is empty
Florian Eckert [Wed, 14 Mar 2018 15:03:55 +0000 (16:03 +0100)]
luci-base: fix colspans calculation in tblsection
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Hannu Nyman [Mon, 26 Mar 2018 18:03:50 +0000 (21:03 +0300)]
Merge pull request #1701 from SvenRoederer/patch-2
wireguard: add dependency to luci-proto-wireguard
Sven Roederer [Mon, 26 Mar 2018 17:15:25 +0000 (19:15 +0200)]
wireguard: add dependency to luci-proto-wireguard
Installing luci-app-wireguard should also install luci-proto-wireguard, to have it as an protocol for interface setup.
Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
Hannu Nyman [Fri, 23 Mar 2018 14:59:42 +0000 (16:59 +0200)]
Merge pull request #1696 from TDT-AG/pr/
20180323-luci-app-mwan3-add-boxes-again
luci-app-mwan3: add boxes again and update css in luci-theme-material
Florian Eckert [Fri, 23 Mar 2018 08:35:26 +0000 (09:35 +0100)]
luci-theme-material: add missing css classes
* Add missing css class danger
* Add missing css class success
* Update background color for css class warning
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Thu, 8 Mar 2018 10:03:19 +0000 (11:03 +0100)]
luci-app-mwan3: add missing graphics boxes again
Add css boxes for mwan3 status again
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Thu, 8 Mar 2018 08:43:18 +0000 (09:43 +0100)]
luci-app-mwan3: remove notMonitored status information
This case is not supported by mwan3 anymore
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Jo-Philipp Wich [Thu, 22 Mar 2018 09:45:42 +0000 (10:45 +0100)]
Merge pull request #1695 from dibdot/regex-dhcphost
luci-base/util.lua: enhance checklib function
Dirk Brenken [Thu, 22 Mar 2018 08:19:51 +0000 (09:19 +0100)]
luci-base/util.lua: enhance checklib function
* enhance the checklib function in util.lua to check the 'fullpathexe'
as well, e.g. this fixes runtime errors on the dhcp/dns template in
environments without dnsmasq
Signed-off-by: Dirk Brenken <dev@brenken.org>
Hannu Nyman [Tue, 20 Mar 2018 08:05:44 +0000 (10:05 +0200)]
Merge pull request #1693 from sotux/master_zh-cn-translation
luci-app-upnp: zh_CN: Update Simplified Chinese translation
Qian Zheng [Fri, 9 Feb 2018 06:43:59 +0000 (14:43 +0800)]
luci-app-upnp: zh_CN: Update Simplified Chinese translation
Signed-off-by: Qian Zheng <sotux82@gmail.com>
Hannu Nyman [Mon, 19 Mar 2018 15:31:07 +0000 (17:31 +0200)]
Merge pull request #1692 from EricLuehrsen/unbound_pnet
unbound: add domain resolution control options
Hannu Nyman [Mon, 19 Mar 2018 15:27:50 +0000 (17:27 +0200)]
Merge pull request #1689 from aparcar/asu-fixup
luci-app-attendedsysupgrade: fixup missing package
Eric Luehrsen [Sat, 17 Mar 2018 17:50:58 +0000 (13:50 -0400)]
unbound: add domain resolution control options
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
Dirk Brenken [Sun, 18 Mar 2018 19:24:36 +0000 (20:24 +0100)]
Merge pull request #1691 from dibdot/travelmate
luci-app-travelmate: final frontend changes for 18.x
Dirk Brenken [Sat, 17 Mar 2018 18:04:51 +0000 (19:04 +0100)]
luci-app-travelmate: final frontend changes for 18.x
* made qrencode support optional (remove hardcoded dependency)
* add a conditional QR Code button on overview page,
remove separate "QR Codes" tab
* move trigger timeout setting to extra section
Signed-off-by: Dirk Brenken <dev@brenken.org>
Paul Spooren [Fri, 16 Mar 2018 17:52:48 +0000 (18:52 +0100)]
luci-app-attendedsysupgrade: fixup missing package
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Dirk Brenken [Fri, 16 Mar 2018 12:01:36 +0000 (13:01 +0100)]
Merge pull request #1688 from dibdot/adblock
luci-app-adblock: remaining fixes
Dirk Brenken [Fri, 16 Mar 2018 11:59:53 +0000 (12:59 +0100)]
luci-app-adblock: remaining fixes
* missed in the last (untested) commit - sorry.
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 16 Mar 2018 05:37:08 +0000 (06:37 +0100)]
Merge pull request #1686 from dibdot/wifischedule
luci-app-wifischedule: fix function calls
Dirk Brenken [Fri, 16 Mar 2018 05:36:51 +0000 (06:36 +0100)]
Merge pull request #1685 from dibdot/travelmate
luci-app-travelmate: fix function calls
Dirk Brenken [Fri, 16 Mar 2018 05:36:31 +0000 (06:36 +0100)]
Merge pull request #1684 from dibdot/adblock
luci-app-adblock: fix function calls
Dirk Brenken [Thu, 15 Mar 2018 19:44:13 +0000 (20:44 +0100)]
luci-app-wifischedule: fix function calls
* fix function calls that have an implicit extra parameter self,
pre-requisite for PR #1681
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Thu, 15 Mar 2018 14:39:30 +0000 (15:39 +0100)]
luci-app-adblock: fix function calls
* fix function calls that have an implicit extra parameter self,
pre-requisite for PR #1681
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Thu, 15 Mar 2018 14:38:17 +0000 (15:38 +0100)]
luci-app-travelmate: fix function calls
* fix function calls that have an implicit extra parameter self,
pre-requisite for PR #1681
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Thu, 15 Mar 2018 08:52:22 +0000 (09:52 +0100)]
Merge pull request #1654 from TDT-AG/pr/
20180301-luci-several-fixes
luci-app-firewall/luci-base/luci-mod-admin-full: some fixes and improvements
Hannu Nyman [Mon, 12 Mar 2018 19:19:08 +0000 (21:19 +0200)]
Merge pull request #1680 from rtau/bugfix-ocserv_compr
luci-app-ocserv: match default value of compression
Raymond Tau [Mon, 12 Mar 2018 18:15:22 +0000 (02:15 +0800)]
luci-app-ocserv: match default value of compression
Modify the default setting of compression to match the default
value of the package ocserv.
Signed-off-by: Raymond Tau <raymondtau@gmail.com>
Jo-Philipp Wich [Mon, 12 Mar 2018 15:12:18 +0000 (16:12 +0100)]
treewide: unify mac address handling
Use the new luci.ip MAC address facilities to parse and verify MAC addresses
in a common way, instead of relying on various ad-hoc solutions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 12 Mar 2018 15:04:52 +0000 (16:04 +0100)]
luci-base: fix documentation spelling mistakes in luci.http.protocol
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 12 Mar 2018 15:03:58 +0000 (16:03 +0100)]
luci-base: fix documentation spelling mistakes in luci.util
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 12 Mar 2018 07:18:11 +0000 (08:18 +0100)]
luci-lib-ip: add MAC address calculation support
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 12 Mar 2018 14:59:52 +0000 (15:59 +0100)]
luci-lib-nixio: fix spelling mistakes in documentation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Sun, 11 Mar 2018 17:16:24 +0000 (18:16 +0100)]
luci-base: fix parsing of ethers(5)
The /etc/ethers file may contain any number of white space characters
between the mac address and the IP/hostname field, so extend the pattern
to allow for that.
Man ethers(5) also states that the IP field may be a symbolic hostname,
so test whether the name is an IP address or hostname before adding it
to the hints structure.
Fixes #1674.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Fri, 9 Mar 2018 16:54:32 +0000 (18:54 +0200)]
Merge pull request #1675 from dibdot/material-fix
luci-base/firewall_zonelist: fix visual interface/background alignment
Dirk Brenken [Fri, 9 Mar 2018 07:11:06 +0000 (08:11 +0100)]
luci-base/firewall_zonelist: fix visual interface/background alignment
* fix for #1667, tested with all standard themes
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Thu, 8 Mar 2018 09:21:01 +0000 (10:21 +0100)]
Merge pull request #1671 from dibdot/travelmate
luci-app-travelmate: remove qrencode short options
Dirk Brenken [Thu, 8 Mar 2018 09:13:15 +0000 (10:13 +0100)]
luci-app-travelmate: remove qrencode short options
* forthcoming qrencode version will remove the short option "-I"
for inline, to get prepared switch to normal qrencode
command line parameters.
Signed-off-by: Dirk Brenken <dev@brenken.org>
Paul Spooren [Wed, 7 Mar 2018 11:16:17 +0000 (12:16 +0100)]
luci-app-attendedsysupgrade: reload rpcd fix #1668
when installing the luci app and opening it for the first time the
webinterface shows an error as some freshly installed rpcd calls are not
yet available. The reload fixes the problem.
luci-app-attendedsysupgrade: downloadable image
the creted sysupgrade image can now easily be downloaded via web
interface.
also fixed some </br> to <br />
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Paul Spooren [Tue, 6 Mar 2018 18:23:28 +0000 (19:23 +0100)]
luci-app-attendedsysupgrade: show unknown package
Reads the header X-Unknown-Package offered by the sysupgrade server and
shows it in the error message.
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Hannu Nyman [Tue, 6 Mar 2018 14:31:57 +0000 (16:31 +0200)]
Merge pull request #1653 from guidosarducci/master-fix-apcups-statistics
[RFC] luci-app-statistics: only graph data supported by APC UPS
Dirk Brenken [Mon, 5 Mar 2018 11:26:19 +0000 (12:26 +0100)]
Merge pull request #1662 from dibdot/travelmate
luci-app-travelmate: fixes for new QR code template
Dirk Brenken [Sun, 4 Mar 2018 14:01:50 +0000 (15:01 +0100)]
luci-app-travelmate: fixes for new QR code template
* remove unofficial 'WPA2' enc. token for better compatibility with
certain QR code reader, still 'WPA', 'WEP' and 'nopass' are supported
* add WEP key slot support (not really needed, but it's still
supported by LuCI wireless)
* correct escape single quotes and other special chars
in SSID & passwords
* code cleanup
Signed-off-by: Dirk Brenken <dev@brenken.org>
Hannu Nyman [Sun, 4 Mar 2018 07:53:25 +0000 (09:53 +0200)]
Merge pull request #1660 from musashino205/l10n/tmate-upd-ja
luci-app-travelmate: update Japanese translation
INAGAKI Hiroshi [Sun, 4 Mar 2018 07:42:48 +0000 (16:42 +0900)]
luci-app-travelmate: update Japanese translation
Updated Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Sun, 4 Mar 2018 05:23:52 +0000 (14:23 +0900)]
luci-app-travelmate: sync translations
Synchronized translations with sources.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
guidosarducci [Sat, 3 Mar 2018 21:45:23 +0000 (13:45 -0800)]
luci-app-statistics: only graph data supported by APC UPS
Some graph definitions rely on data not supported across all APC UPSes.
Due to recent upstream changes in collectd, the daemon no longer creates
a NaN-filled .rrd file corresponding to any missing UPS data. Depending
on the connected UPS, this may result in some "broken" graphs on the Luci
Statistics page since rrdtool cannot find the expected .rrd file.
Include the add_supported() function to determine the UPS data available
at runtime and update any definitions of graphs to include only supported
data. For example, the whole chart stack of AC input and output voltages
will normally be "broken" if the UPS only measures AC input voltage. With
these changes, the output voltage graph definition is stripped out,
allowing the chart to render.
Make consistent use of data types and instances in graph definitions. All
definitions now use the same format with the 'instances' key. Unnecessary
'types' and 'sources' keys are removed.
Fix the definition of 'line frequency' graph, based on upstream collectd
apcups plugin code: type is 'frequency' but instance should be 'input'.
This also includes some code and whitespace cleanup.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Dirk Brenken [Sat, 3 Mar 2018 07:44:07 +0000 (08:44 +0100)]
Merge pull request #1658 from dibdot/travelmate
luci-app-travelmate: sync with release 1.1.3
Hannu Nyman [Fri, 2 Mar 2018 21:31:56 +0000 (23:31 +0200)]
Merge pull request #1652 from TDT-AG/pr/
20180301-luci-app-mwan3-fix-status-page
luci-app-mwan3: fix status pages
Dirk Brenken [Fri, 2 Mar 2018 17:06:38 +0000 (18:06 +0100)]
luci-app-travelmate: sync with release 1.1.3
* show WiFi QR codes from all configured Access Points
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Fri, 2 Mar 2018 13:42:52 +0000 (14:42 +0100)]
luci-base: properly handle undefined IPv6 local-address information
If IPv6 prefix assignment is disabled, the "local-address" structure
might exist, but be empty which causes the adress formatting in the
network model class to bail out.
Verify the completeness of the "local-address" structure before using
it in order to avoid runtime errors.
Fixes #1657.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Fri, 2 Mar 2018 11:23:55 +0000 (12:23 +0100)]
luci-base, luci-mod-admin-full: store backup vars in luci configuration
Keep the ifname and bridge state backup variables in /etc/config/luci to not
pollute /etc/config/network.
Fixes #1655.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Dirk Brenken [Thu, 1 Mar 2018 19:04:22 +0000 (20:04 +0100)]
Merge pull request #1656 from musashino205/l10n/adblk-upd-ja
luci-app-adblock: fix the msgid to keep the translations
INAGAKI Hiroshi [Thu, 1 Mar 2018 17:12:14 +0000 (02:12 +0900)]
luci-app-adblock: fix the msgid to keep the translations
XHTML markup of "&" in the description about "download queue" was fixed
in
71230d2. Since UI text of it no longer matches msgid, I fixed it.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Florian Eckert [Wed, 24 Jan 2018 13:57:08 +0000 (14:57 +0100)]
luci-mod-admin-full: add hint on backup restore
Add a hint to backup restore that files could remain on the system.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Tue, 30 Jan 2018 10:52:32 +0000 (11:52 +0100)]
luci-app-firewall: only show SNAT template if there are more then one zone
Only show SNAT template if there are more then one zone.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
projects / oweals / luci.git / log