Paul Spooren [Sun, 3 Feb 2019 00:20:13 +0000 (01:20 +0100)]
luci-app-attendedsysupgrade: fixup error_box
Signed-off-by: Paul Spooren <mail@aparcar.org>
Hannu Nyman [Sat, 2 Feb 2019 14:09:05 +0000 (16:09 +0200)]
Merge pull request #2494 from aparcar/18.06-unify
18.06: luci-app-attendedsysupgrade: new api, unify status
Paul Spooren [Fri, 25 Jan 2019 15:14:46 +0000 (16:14 +0100)]
luci-app-attendedsysupgrade: new api, unify status
to distinguish between installed packages and requested packages, the
API call is now "installed" instead of "packages".
The clients now decide on their own if they want http or https,
therefore the server doesn't reply with full links, only the path.
Add missing variable declarations in JavaScript code
Fix typos in UI strings
Also unify "info_box" and "error_box" to "status_box"
Signed-off-by: Paul Spooren <mail@aparcar.org>
Jo-Philipp Wich [Wed, 30 Jan 2019 15:48:51 +0000 (16:48 +0100)]
luci-mod-rpc: drop "secret" value from rpc session objects
Drop the "secret" value from RPC session objects in order to make them
compatible with ordinary web sessions used by the LuCI web interface.
That secret value was never used for anything and is the only difference
compared to normal LuCI login sessions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
766643fcf18b5710462b88adeabe5e4706ed09cf)
Josef Schlehofer [Tue, 29 Jan 2019 22:04:04 +0000 (23:04 +0100)]
luci-app-lxc: add aarch64 to target map
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit
f335624407e4c5c04be0d676010369aa55652798)
James Buren [Sun, 18 Nov 2018 20:57:37 +0000 (14:57 -0600)]
luci-app-lxc: add i686 to target map
Add i686 to target map so i386 container templates are usable.
Signed-off-by: James Buren <ryuo@ryuo.xyz>
(cherry picked from commit
9630e7e9948b9cce3cba213932aba1895ac15031)
Anton Kikin [Tue, 11 Dec 2018 23:05:59 +0000 (02:05 +0300)]
luci-base: fix UCI changelog markup mistake
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit
43c7cb344c6a331d5e52d6869c036ac1afe81480)
Jo-Philipp Wich [Sat, 4 Aug 2018 20:09:49 +0000 (22:09 +0200)]
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
Fixes: #2170
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
849d153851db2fc193c1c82648dbe719463d3a38)
Jo-Philipp Wich [Wed, 17 Oct 2018 05:43:54 +0000 (07:43 +0200)]
luci-base: fix cbi dropdown quirks with MS Edge
On MS Edge, the behaviour of "value" attributes on "li" elements is
unreliable, so use the "data-" prefix to circumvent the problem.
Ref: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/
19320991/
Fixes: #2224
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9e6949849d7a34d17a7e43c79038f26a9b98d879)
Jo-Philipp Wich [Fri, 11 Jan 2019 15:14:56 +0000 (16:14 +0100)]
Merge pull request #2451 from pmelange/backport/PR2450-luci_mod-freifunk_basics
Backport 18.06: luci-mod-freifunk: fix the list of community profiles
Jo-Philipp Wich [Fri, 11 Jan 2019 15:14:37 +0000 (16:14 +0100)]
Merge pull request #2449 from pmelange/backport/PR2448-luci_mod-freifunk_get_all
Backport 18.06: luci-mod-freifunk: replace calls to get_all() with separate get() calls
pmelange [Fri, 11 Jan 2019 12:29:48 +0000 (13:29 +0100)]
luci-mod-freifunk: fix the list of community profiles
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Fri, 11 Jan 2019 11:54:55 +0000 (12:54 +0100)]
luci-mod-freifunk: replace calls to get_all() with separate get() calls
The get_all() function has changed and how it was used before no
longer works properly. These changes not only change to individual
get() calls, but actually adds to the readability of the code and reduces
file size.
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
Hannu Nyman [Wed, 2 Jan 2019 19:27:12 +0000 (21:27 +0200)]
timezone data: update to 2018i
Update timezone data to 2018i
http://mm.icann.org/pipermail/tz-announce/2018-December/000053.html
http://mm.icann.org/pipermail/tz-announce/2018-December/000054.html
2018h:
* Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21.
* New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move.
* Metlakatla, Alaska observes PST this winter only.
* Guess Morocco will continue to adjust clocks around Ramadan.
* Add predictions for Iran from 2038 through 2090.
2018i:
* São Tomé and Príncipe switches from +01 to +00 on 2019-01-01.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
c7776c8959b1297b03de9eb836edf3a447b0b6fa)
Jo-Philipp Wich [Thu, 6 Dec 2018 23:09:43 +0000 (00:09 +0100)]
Merge pull request #2355 from pmelange/freifunk_backport_18.06
Freifunk-berlin backport 18.06 - OLSR changes and community profiles
pmelange [Sun, 18 Nov 2018 13:26:23 +0000 (14:26 +0100)]
luci-app-olsr: reenable the "auto refresh" feature
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Sat, 17 Nov 2018 22:40:37 +0000 (23:40 +0100)]
luci-app-olsr change ccs style to use class "left" instead of "style=text-align: left"
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Thu, 15 Nov 2018 13:55:42 +0000 (14:55 +0100)]
luci-app-olsr: make cosmetic changes.
modify the status tables so that then headers and columns align, values
left justified.
Additionally, add the openwrt style interface name to the interfaces table,
change huge ETX numbers to 'infinate', and add the german translation for
'Selected'.
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
Philipp Borgers [Mon, 24 Sep 2018 11:43:51 +0000 (13:43 +0200)]
community-profiles: change subnet of mesh_network option for Berlin
The mesh_network option is used to check the user input. The wizard
checks if the input ip address is part of the mesh_network. We use
multiple /16 networks. There is no support for multiple ranges so we the
10.0.0.0/8.
For reference the ip list:
https://wiki.freifunk.net/IP-Netze
Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
Philipp Borgers [Thu, 25 Oct 2018 19:54:42 +0000 (21:54 +0200)]
get rid of library version numbers in luci olsrd code
Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
Martin Hübner [Tue, 23 Oct 2018 16:43:58 +0000 (18:43 +0200)]
community-profiles: create profile for Fürstenwalde
New profile for Fürstenwalde. At the moment we use parts of the Berlin-
infrastructure. Thus I have not changed the ip-address-related things.
Signed-off-by: Martin Hübner <martin.hubner@web.de>
[reword and rewrap commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
pmelange [Mon, 5 Nov 2018 15:27:40 +0000 (16:27 +0100)]
luci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Mon, 5 Nov 2018 15:37:19 +0000 (16:37 +0100)]
luci-app-olsr: convert mid.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Mon, 5 Nov 2018 10:44:53 +0000 (11:44 +0100)]
luci-app-olsr: convert interfaces.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Mon, 5 Nov 2018 16:20:16 +0000 (17:20 +0100)]
luci-app-olsr: convert olsr.lua and overview.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Mon, 5 Nov 2018 13:03:35 +0000 (14:03 +0100)]
luci-base: network.lua add ipv6-prefix-assignment support to get_status_by_address
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Mon, 5 Nov 2018 09:24:15 +0000 (10:24 +0100)]
luci-app-olsr: cbi remove library version numbers in library search results
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
pmelange [Thu, 4 Oct 2018 10:10:58 +0000 (12:10 +0200)]
freifunk profiles: add nameserver 80.67.169.40 from fdn.fr/actions/dns
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
mmouselli [Sun, 21 Oct 2018 16:47:57 +0000 (18:47 +0200)]
luci-app-olsr-services: Don't use the nameservice with a specific version.
The "Services" menu option of olsr on the top of the web interface
is not there.
A specific version of the App name was in the controller service
Removing the limitation will fix the problem
https://github.com/freifunk-berlin/firmware/issues/594
Signed-off-by: mmouselli <m.mouselli@syseleven.de>
Hannu Nyman [Sun, 25 Nov 2018 06:48:16 +0000 (08:48 +0200)]
luci-mod-network: adapt to current 802.11r defaults
The default for 802.11r option ft_psk_generate_local
was changed a few months ago by openwrt/openwrt@
3cc56a5
That change was a bit awkward, as it made hostapd to
overlook the possibly existing r0kh values by default
unless the user explicitly disables the new default.
Adapt LuCI by changing the default for ft_psk_generate_local
into 'enabled'.
But ensure that LuCI does not delete the existing key values
by not making the r0kh and r1kh fields to depend on this.
Note that this is just a quick fix for the wrong default value
causing problems, but not yet a complete fix for all the options.
In the long run it might be better to make the detail options
to depend on local generation.
Reference also to LuCI PR #2102
Adapted from commit
26e903c74 in master
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Fri, 16 Nov 2018 17:39:40 +0000 (19:39 +0200)]
applications: drop luci-app-asterisk
This application was never useful to begin with, drop it to avoid
further confusion.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
cf3621522815544d42d1cc5cdf65b4fd1a6b4412)
Hannu Nyman [Wed, 14 Nov 2018 14:33:03 +0000 (16:33 +0200)]
Merge pull request #2278 from sotux/openwrt-18.06
i18n: update Simplified Chinese translation for openwrt-18.06
Zheng Qian [Wed, 14 Nov 2018 01:25:55 +0000 (09:25 +0800)]
i18n: luci-app-uhttpd: add initial Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
Zheng Qian [Wed, 14 Nov 2018 00:51:57 +0000 (08:51 +0800)]
i18n: luci-base: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
Zheng Qian [Wed, 14 Nov 2018 00:42:04 +0000 (08:42 +0800)]
i18n: luci-app-firewall: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
Hannu Nyman [Fri, 9 Nov 2018 22:23:24 +0000 (00:23 +0200)]
luci-app-adblock: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Fri, 9 Nov 2018 21:51:03 +0000 (23:51 +0200)]
luci-app-travelmate: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Fri, 9 Nov 2018 21:35:09 +0000 (23:35 +0200)]
i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Martin Schiller [Thu, 13 Sep 2018 06:29:32 +0000 (08:29 +0200)]
i18n: luci-app-firewall: cleanup multiple definitions in uk/firewall.po
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Martin Schiller [Thu, 13 Sep 2018 06:26:53 +0000 (08:26 +0200)]
i18n: luci-app-addblock: cleanup multiple definitions in zh-cn/adblock.po
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Martin Schiller [Thu, 13 Sep 2018 06:21:22 +0000 (08:21 +0200)]
i18n: fix german base.po
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Hannu Nyman [Tue, 30 Oct 2018 17:45:50 +0000 (19:45 +0200)]
timezone data: update to 2018g
Update timezone data to 2018g
http://mm.icann.org/pipermail/tz-announce/2018-October/000052.html
* Morocco switches to permanent +01 on 2018-10-27.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
111ebe2f62f28f3aa1fa038983e7d0b65e9df46c)
Hannu Nyman [Thu, 25 Oct 2018 15:44:48 +0000 (18:44 +0300)]
timezone data: update to 2018f
Update timezone data to 2018f
http://mm.icann.org/pipermail/tz-announce/2018-October/000051.html
Volgograd moves from +03 to +04 on 2018-10-28.
Fiji ends DST 2019-01-13, not 2019-01-20.
Most of Chile changes DST dates, effective 2019-04-06.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
651937c166b4f2b8e3b1e1228f3a7f38411e4f5a)
Dirk Brenken [Sun, 16 Sep 2018 16:58:26 +0000 (18:58 +0200)]
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>
(cherry picked from commit
c2656a722097a7b4004d2da9c223b347cfa1a4af)
Dirk Brenken [Fri, 14 Sep 2018 06:57:06 +0000 (08:57 +0200)]
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>
(cherry picked from commit
1eb3f734c7f4830022f99e304d38156c2520c676)
Hannu Nyman [Tue, 9 Oct 2018 15:19:52 +0000 (18:19 +0300)]
timezone data: update to 2018e
Update timezone data to 2018e
http://mm.icann.org/pipermail/tz-announce/2018-May/000050.html
North Korea switches back to +09 on 2018-05-05.
The main format uses negative DST again, for Ireland
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
701f6b0819a902e8c45e19c95aad7121f9c50145)
Dirk Brenken [Sat, 1 Sep 2018 06:42:00 +0000 (08:42 +0200)]
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>
(cherry picked from commit
4e56083833a69860b9a016e0db7b4ae4e0e224ad)
Jo-Philipp Wich [Thu, 23 Aug 2018 17:20:37 +0000 (19:20 +0200)]
Merge pull request #2109 from kagurazakakotori/openwrt-18.06
luci-app-adblock: fix chinese translation
Kagurazaka Kotori [Thu, 23 Aug 2018 17:16:43 +0000 (01:16 +0800)]
luci-app-adblock: fix chinese translation
simply add a </a> tag to stop the link filling the whole page
Signed-off-by: Kagurazaka Kotori <kagurazakakotori@gmail.com>
Jo-Philipp Wich [Mon, 13 Aug 2018 07:20:43 +0000 (09:20 +0200)]
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>
(cherry picked from commit
bf123fb7c4918120f5f9f638866bfae1e5b23a54)
Ansuel Smith [Mon, 13 Aug 2018 08:57:21 +0000 (10:57 +0200)]
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>
(cherry picked from commit
442ece768d36e8233c9dd3343844abf3caafddcf)
Ansuel Smith [Tue, 7 Aug 2018 15:37:48 +0000 (17:37 +0200)]
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>
(cherry picked from commit
327e284b74bd272aa1afaa8b9728c36276440057)
Ansuel Smith [Tue, 7 Aug 2018 15:46:00 +0000 (17:46 +0200)]
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>
(cherry picked from commit
35da63fa9a977ac579ee18ce2636d0db9d76353e)
Jo-Philipp Wich [Thu, 16 Aug 2018 07:36:37 +0000 (09:36 +0200)]
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>
(cherry picked from commit
98d4eb1695ae5723cd7bd785d18284e633e26cc8)
Gregory L. Dietsche [Tue, 7 Aug 2018 14:20:28 +0000 (09:20 -0500)]
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>
(cherry picked from commit
abfe45ff61e7796c67d0078fd5e4acd186d33033)
yangfl [Thu, 2 Aug 2018 05:57:46 +0000 (13:57 +0800)]
luci-base: update Chinese translation
Signed-off-by: David Yang <mmyangfl@gmail.com>
(cherry picked from commit
c51f0d97141afbd1258c1163596af09e59136788)
Krystian Kozak [Sun, 5 Aug 2018 12:17:52 +0000 (14:17 +0200)]
luci-base: update Polish translation
Updated Polish translations.
Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit
10f12d7f6a73d04a9b3303f735ddfd134c3ac156)
Krystian Kozak [Fri, 27 Jul 2018 20:51:07 +0000 (22:51 +0200)]
luci-base: update Polish translation
Updated Polish translations.
Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit
6dbdc2cae8cc5c2a62b094d6bbf77102fa6359c3)
Alan Swanson [Tue, 31 Jul 2018 21:37:47 +0000 (22:37 +0100)]
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
(cherry picked from commit
4b3d20cda45331027034b9681e0939399ef968e8)
[rewrapped commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Wed, 1 Aug 2018 16:44:34 +0000 (19:44 +0300)]
Merge pull request #2018 from chris5560/18.06-ddns
luci-app-ddns[18.06]: remove myself as PKG_MAINTAINER
Hannu Nyman [Wed, 1 Aug 2018 16:44:11 +0000 (19:44 +0300)]
Merge pull request #2016 from chris5560/openwrt-18.06
luci-app-radicale[18.06]: remove myself as PKG_MAINTAINER
Jo-Philipp Wich [Tue, 31 Jul 2018 15:24:55 +0000 (17:24 +0200)]
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>
(cherry picked from commit
176e24699822bb50899f5828d0ace1c37d095ff8)
Dirk Brenken [Tue, 31 Jul 2018 07:21:44 +0000 (09:21 +0200)]
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>
(cherry picked from commit
b8f83946816702ba3b73c9573c266a2fdae6e615)
Dirk Brenken [Tue, 31 Jul 2018 07:36:27 +0000 (09:36 +0200)]
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>
(cherry picked from commit
af25cf4879163b38e9fd71bd3a55e77c31d3d903)
Jaymin Patel [Mon, 30 Jul 2018 09:36:14 +0000 (15:06 +0530)]
fix compilation failure when luasrcdiet is being copied to non existing directory
Signed-off-by: Jaymin Patel <jem.patel@gmail.com>
(cherry picked from commit
bb336671fff613b812b308c7eeeeda38608bda9d)
Hannu Nyman [Mon, 30 Jul 2018 20:07:41 +0000 (23:07 +0300)]
Merge pull request #2014 from dibdot/travelmate-18.06
luci-app-travelmate: backport 1.2.1 to 18.06 branch
Hannu Nyman [Mon, 30 Jul 2018 20:07:27 +0000 (23:07 +0300)]
Merge pull request #2013 from dibdot/adblock-18.06
luci-app-adblock: backport 3.5.4 to 18.06 branch
Christian Schoenebeck [Mon, 30 Jul 2018 19:58:32 +0000 (21:58 +0200)]
luci-app-ddns[18.06]: remove myself as PKG_MAINTAINER
remove myself as PKG_MAINTAINER
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Christian Schoenebeck [Mon, 30 Jul 2018 19:51:08 +0000 (21:51 +0200)]
luci-app-radicale[18.06]: remove myself as PKG_MAINTAINER
remove myself as PKG_MAINTAINER
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Dirk Brenken [Mon, 30 Jul 2018 11:40:13 +0000 (13:40 +0200)]
luci-app-travelmate: backport 1.2.1 to 18.06 branch
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Mon, 30 Jul 2018 11:27:38 +0000 (13:27 +0200)]
luci-app-adblock: backport 3.5.4 to 18.06 branch
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Sun, 29 Jul 2018 19:11:51 +0000 (21:11 +0200)]
luci-theme-openwrt: style tweaks for DSL status display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
6d74a82bf60d9f92e36ad760480897a885027cad)
Jo-Philipp Wich [Sun, 29 Jul 2018 19:05:34 +0000 (21:05 +0200)]
luci-theme-bootstrap: style tweak for DSL status display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
765816d07d9a6246075e061b4f6108861b3f60af)
Jo-Philipp Wich [Sun, 29 Jul 2018 18:59:43 +0000 (20:59 +0200)]
luci-mod-admin-full: rework DSL Status display
Fixes #2003.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
88713f64568fdc96920fd6eabaa5dde3ecfbfed3)
Jo-Philipp Wich [Sat, 28 Jul 2018 12:41:34 +0000 (14:41 +0200)]
luci-mod-admin-full: fix style glitch on packages page
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a0b4d2adb6914f6b1523e8caee64c8a5b3af66b7)
Jo-Philipp Wich [Sat, 28 Jul 2018 09:41:07 +0000 (11:41 +0200)]
luci-base: fix luasrcdiet
- Stage required libraries as well
- Remove not existing make target
- Override library search path
Fixes:
b5d5e5bf1 ("luci-base: update luasrcdiet")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
63fbf5a805085f7ad99aebaaa116e3096fcf792d)
Jo-Philipp Wich [Sat, 28 Jul 2018 12:09:34 +0000 (14:09 +0200)]
luci-proto-relay: propagate up state, do not forward netifd errors
Due to historical reasons, the relayd daemon configuration resides in the
form of a fake "config interface" section in /etc/config/network without
actually registering a protocol handler.
This causes netifd to emit an "INVALID_PROTO" error for the interface
which is technically correct, but confusing for LuCI users.
This situation needs to be resolved upstream by either moving relayd
configuration out of the network config, or by converting the relayd
service into a proper protocol handler.
Until this happens, do not report any netifd errors since we're not
operating on an actual interface.
While we're at it, also propagate the protocol up state from the fake
virtual device to ensure that LuCI displays the relay bridge as "up"
when all relayed interfaces are up as well.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
aae187dedf726fe609ede8260f8f8343d843d046)
Jo-Philipp Wich [Sat, 28 Jul 2018 09:43:02 +0000 (11:43 +0200)]
luci-base: fix footer template
Move the apply widget markup before the final </html> tag to avoid XHTML
errors with the OpenWrt theme.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
350be23eb912bd1f3d1d2c09131d1ed03a27dcd0)
Jo-Philipp Wich [Thu, 26 Jul 2018 20:12:45 +0000 (22:12 +0200)]
treewide: rework rollback/apply workflow
Rework the apply confirmation mechanism to be session agnostic in order to
circumvent cross domain restrictions which prevent the JS code from issuing
apply confirm requests in some cases, e.g. when changing the LAN IP.
Confirmation calls may now be done from unauthenticated pages, as long as a
matching confirmation token is sent along with the request.
The reasoning behind this is that there is little security impact in
confirming pending apply sessions, especially since those sessions can only
be initiated while being authenticated.
After this change, LuCI will now launch a confirmation process on every
rendered page when a rollback is pending. The confirmation will happen
regardless of whether the user is logged in or not, or if the current page
is a CBI form or static template.
A confirmation request now also requires a random one-time token which is
rendered along with the confirmation JavaScript code in order to succeed.
This token is not meant to provide security but to ensure that the confirm
was triggered from an interactive browser session and not some background
HTTP requests that happened to end up in the admin ui.
As a consequence, the different apply/confirm/rollback code paths in CBI
maps and the UCI change/revert pages have been consolidated into one common
implementation residing in the common global theme agnostic footer template.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e5a1ac02289e8fde8ddbd05bbb21ac448c661ae3)
Jo-Philipp Wich [Fri, 27 Jul 2018 11:23:58 +0000 (13:23 +0200)]
luci-base: xhr.js: decode JSON for POST requests as well
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
98217f8f8dd1835824405d5bf3ceb95dd8f40032)
Jo-Philipp Wich [Thu, 26 Jul 2018 20:13:38 +0000 (22:13 +0200)]
luci-base: utils: support multiple return values in util.ubus()
This is needed to deal with ubus methods that return multiple results,
e.g. session/list
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9ead1e29a6404c5ba3a438a3f8a68b6a3dcaee3f)
Jo-Philipp Wich [Thu, 26 Jul 2018 17:20:39 +0000 (19:20 +0200)]
luci-mod-admin-full: abbreviate "MAC-Address" as "MAC" to align with rest
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8a1bc1814f1cb654e49c1b6352378b1a7e58100b)
Jo-Philipp Wich [Thu, 26 Jul 2018 17:15:22 +0000 (19:15 +0200)]
luci-mod-admin-full: fix wifi overview display when no networks are defined
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
80706cbafb55d559810ae6796abd083198def371)
pmelange [Mon, 23 Apr 2018 20:24:39 +0000 (22:24 +0200)]
ff_olsrd_watchdog: delete existing tunnels
When OLSRd crashes, the old tunnels still exist. This can lead to unexpected behaviour.
The tunnels to be removed start with "tnl_"
See freifunk-berlin/firmware#522
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
(cherry picked from commit
5d0b720f8b002ac0dd0097beb63d3a88ce1c7faf)
Jo-Philipp Wich [Mon, 23 Jul 2018 13:10:55 +0000 (15:10 +0200)]
luci-base: strip superfluous space in additional field markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c27a77756c718a0b3babd510f83850bd9e2ac431)
Jo-Philipp Wich [Mon, 23 Jul 2018 13:09:10 +0000 (15:09 +0200)]
luci-theme-openwrt: fix button placement quirk
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
efc1a5261ac2bdd0834bd3402416a78348838001)
Jo-Philipp Wich [Mon, 23 Jul 2018 13:06:26 +0000 (15:06 +0200)]
luci-base: cbi.js: fade to-be-deleted section when hovering delete button
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
590d1cc74fe98c2659f250ecdff8801bd9d8fc0d)
Jo-Philipp Wich [Mon, 23 Jul 2018 12:31:40 +0000 (14:31 +0200)]
luci-base: cbi.js: use adjacent button dynlist add/remove buttons
Change the cbi.js code to create a div based button element instead of an
image button.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
875b561875cb4eca4c913c69ce2dfd21265b6ac6)
Jo-Philipp Wich [Mon, 23 Jul 2018 12:30:03 +0000 (14:30 +0200)]
luci-base: rework reveal/hide CBI password template button
Also add a hidden type password field to prevent browser autocompleters
from entering the login passwords into fields liek the wireless WPA key
field.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b6dd0ecd6cc7eb1f4c758a0815f725ff0be4f157)
Jo-Philipp Wich [Mon, 23 Jul 2018 12:27:49 +0000 (14:27 +0200)]
luci-theme-bootstrap: add styling for input-adjacent buttons
Also add styling for CBI column title references.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
7ba4eb1a42cb0baf3d0c66d16cfc5ce4d5f9709c)
Jo-Philipp Wich [Mon, 23 Jul 2018 12:26:56 +0000 (14:26 +0200)]
luci-theme-openwrt: add styling for input-adjacent buttons
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2287e79a5c8cac26f0e8af6a9c90faf57217897a)
Jo-Philipp Wich [Sun, 22 Jul 2018 16:20:03 +0000 (18:20 +0200)]
luci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
4105c78ff9d36b287c3cfd43180eff5ec3849b8f)
Jo-Philipp Wich [Sun, 22 Jul 2018 16:17:58 +0000 (18:17 +0200)]
luci: do not depend on uhttpd-mod-ubus
We do not need this module at all, yet.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
1602313f5c6c48bca972ba34424bc489ada1929f)
Jo-Philipp Wich [Sun, 22 Jul 2018 15:42:20 +0000 (17:42 +0200)]
luci-theme-openwrt: support rendering tblsection cell descriptions
Add support for rendering the "data-description" attribute when rendering
decomposed tables for small screen resolutions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e3f76c255a1a4f989f18264747131e8f5ea37180)
Jo-Philipp Wich [Sun, 22 Jul 2018 15:40:07 +0000 (17:40 +0200)]
luci-base: add description annotations to tblsection cells
Add a "data-description" attribute to CBI fields which have a description
set, this allows responsive design themes to render a field description
when decomposing the table grid.
Also reuse the precalculated "typename" property if it exists, instead of
deriving it from the template name yet again.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8e0ee137a67c3e924c2a3827968b6f3f1d7ce9f4)
Krystian Kozak [Sat, 21 Jul 2018 17:22:22 +0000 (19:22 +0200)]
luci-base: update Polish translation
Updated Polish translations.
Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit
a900d61d91fce2cd0cd8698e01fe549bb7c2c130)
Dmitry Tunin [Sat, 21 Jul 2018 19:14:51 +0000 (22:14 +0300)]
luci-proto-ncm: remove unrelated options
This removes all options 100% unrelated to NCM protocol.
Some options like 'dns' are not currently used by connection scripts,
but may be used in the future.
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit
6d03051e957fa6cd88d02c4fb15701f7c29568ad)
Dmitry Tunin [Sat, 21 Jul 2018 16:40:21 +0000 (19:40 +0300)]
luci-proto-ncm: add pdptype option
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit
58fd0749de3a19d266fb9d07d4eb188a96b8245e)
Jo-Philipp Wich [Thu, 26 Jul 2018 18:23:30 +0000 (20:23 +0200)]
Merge pull request #1992 from sotux/openwrt-18.06_zh_CN
luci-base: zh_CN: Update Simplified Chinese translation
Dirk Brenken [Wed, 25 Jul 2018 04:30:00 +0000 (06:30 +0200)]
Merge pull request #1996 from EricLuehrsen/unbound_1806_doc
[openwrt-18.06] luci-app-unbound: point documentation to 18.06 branch