Commit graph

9329 commits

Author SHA1 Message Date
Hannu Nyman
94d9bfb1da
Merge pull request #1689 from aparcar/asu-fixup
luci-app-attendedsysupgrade: fixup missing package
2018-03-19 17:27:50 +02:00
Dirk Brenken
c575c78d2f
Merge pull request #1691 from dibdot/travelmate
luci-app-travelmate: final frontend changes for 18.x
2018-03-18 20:24:36 +01:00
Dirk Brenken
ca6f0a6c89 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>
2018-03-17 19:04:51 +01:00
Paul Spooren
6551f5c139 luci-app-attendedsysupgrade: fixup missing package
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
2018-03-16 18:52:48 +01:00
Dirk Brenken
b2fbfedc7e
Merge pull request #1688 from dibdot/adblock
luci-app-adblock: remaining fixes
2018-03-16 13:01:36 +01:00
Dirk Brenken
ab30c8365f luci-app-adblock: remaining fixes
* missed in the last (untested) commit - sorry.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-16 12:59:53 +01:00
Dirk Brenken
7656f51c82
Merge pull request #1686 from dibdot/wifischedule
luci-app-wifischedule: fix function calls
2018-03-16 06:37:08 +01:00
Dirk Brenken
44132150fc
Merge pull request #1685 from dibdot/travelmate
luci-app-travelmate: fix function calls
2018-03-16 06:36:51 +01:00
Dirk Brenken
d01ddb2928
Merge pull request #1684 from dibdot/adblock
luci-app-adblock: fix function calls
2018-03-16 06:36:31 +01:00
Dirk Brenken
14bdc24d4a 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>
2018-03-15 20:53:47 +01:00
Dirk Brenken
b2cc7bf276 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>
2018-03-15 20:25:30 +01:00
Dirk Brenken
06ba63ad59 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>
2018-03-15 15:38:17 +01:00
Jo-Philipp Wich
005f4fb7d4
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
2018-03-15 09:52:22 +01:00
Hannu Nyman
de88c2ee69
Merge pull request #1680 from rtau/bugfix-ocserv_compr
luci-app-ocserv: match default value of compression
2018-03-12 21:19:08 +02:00
Raymond Tau
ee87dd1daa 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>
2018-03-13 02:15:22 +08:00
Jo-Philipp Wich
28e3b32854 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>
2018-03-12 16:12:18 +01:00
Jo-Philipp Wich
dfba318140 luci-base: fix documentation spelling mistakes in luci.http.protocol
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-12 16:04:52 +01:00
Jo-Philipp Wich
6d253abd99 luci-base: fix documentation spelling mistakes in luci.util
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-12 16:03:58 +01:00
Jo-Philipp Wich
4f412a76c2 luci-lib-ip: add MAC address calculation support
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-12 16:02:55 +01:00
Jo-Philipp Wich
190b32452a luci-lib-nixio: fix spelling mistakes in documentation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-12 16:02:27 +01:00
Jo-Philipp Wich
62630fbf88 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>
2018-03-11 18:26:31 +01:00
Hannu Nyman
bf04031171
Merge pull request #1675 from dibdot/material-fix
luci-base/firewall_zonelist: fix visual interface/background alignment
2018-03-09 18:54:32 +02:00
Dirk Brenken
21fbe39858 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>
2018-03-09 08:13:03 +01:00
Dirk Brenken
4f04e6126e
Merge pull request #1671 from dibdot/travelmate
luci-app-travelmate: remove qrencode short options
2018-03-08 10:21:01 +01:00
Dirk Brenken
ff7bdab68a 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>
2018-03-08 10:13:15 +01:00
Paul Spooren
5949c2cea8 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>
2018-03-07 13:11:32 +01:00
Paul Spooren
a6d55b19f3 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>
2018-03-06 19:25:08 +01:00
Hannu Nyman
c555814edb
Merge pull request #1653 from guidosarducci/master-fix-apcups-statistics
[RFC] luci-app-statistics: only graph data supported by APC UPS
2018-03-06 16:31:57 +02:00
Dirk Brenken
41b7a90e07
Merge pull request #1662 from dibdot/travelmate
luci-app-travelmate: fixes for new QR code template
2018-03-05 12:26:19 +01:00
Dirk Brenken
898b8a9904 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>
2018-03-04 19:59:53 +01:00
Hannu Nyman
d9039fc2c3
Merge pull request #1660 from musashino205/l10n/tmate-upd-ja
luci-app-travelmate: update Japanese translation
2018-03-04 09:53:25 +02:00
INAGAKI Hiroshi
d6fd2c33bf luci-app-travelmate: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-04 16:42:48 +09:00
INAGAKI Hiroshi
0e5d670d7a luci-app-travelmate: sync translations
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-04 14:23:52 +09:00
guidosarducci
fa1f4c42a6 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>
2018-03-03 13:54:55 -08:00
Dirk Brenken
1e46a671ea
Merge pull request #1658 from dibdot/travelmate
luci-app-travelmate: sync with release 1.1.3
2018-03-03 08:44:07 +01:00
Hannu Nyman
2913111ffe
Merge pull request #1652 from TDT-AG/pr/20180301-luci-app-mwan3-fix-status-page
luci-app-mwan3: fix status pages
2018-03-02 23:31:56 +02:00
Dirk Brenken
8a199c3e1e 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>
2018-03-02 18:06:38 +01:00
Jo-Philipp Wich
bf49505ea0 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>
2018-03-02 14:42:52 +01:00
Jo-Philipp Wich
852ec6e28b 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>
2018-03-02 12:44:35 +01:00
Dirk Brenken
3e17668adb
Merge pull request #1656 from musashino205/l10n/adblk-upd-ja
luci-app-adblock: fix the msgid to keep the translations
2018-03-01 20:04:22 +01:00
INAGAKI Hiroshi
68bdfc029c 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>
2018-03-02 02:12:14 +09:00
Florian Eckert
10fbf9b2e4 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>
2018-03-01 12:33:43 +01:00
Florian Eckert
7bb2cd6213 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>
2018-03-01 12:33:43 +01:00
Florian Eckert
a5b970d5f2 luci-app-firewall: on forward rule change preselection
Change the preselection for the src zone to wan and the dest zon to lan
because this is the normal situation.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 12:33:43 +01:00
Florian Eckert
846fb1f8bc luci-app-firewall: only show portforward template if there are more then one zone
Only show portforward template if there are more then one zone.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 12:33:43 +01:00
Florian Eckert
fa756d1fbb luci-base: fix browser.htm template
If cbi_init() is not called first browser gif will not be found.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 12:31:50 +01:00
Florian Eckert
dcb041e396 luci-app-mwan3: remove css from javascript in overview_status_interface
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 10:47:52 +01:00
Florian Eckert
5362f69706 luci-app-mwan3: Update header name in status pages
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 10:47:50 +01:00
Florian Eckert
a73687022d luci-app-mwan3: remove duplicated code section
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 10:47:47 +01:00
Florian Eckert
deba02e096 luci-app-mwan3: fix source styling
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 10:47:45 +01:00