project/luci.git
5 years agoluci-app-olsr: make cosmetic changes.
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>
5 years agocommunity-profiles: change subnet of mesh_network option for Berlin
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>
5 years agoget rid of library version numbers in luci olsrd code
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>
5 years agocommunity-profiles: create profile for Fürstenwalde
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>
5 years agoluci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin
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>
5 years agoluci-app-olsr: convert mid.htm to new json plugin
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>
5 years agoluci-app-olsr: convert interfaces.htm to new json plugin
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>
5 years agoluci-app-olsr: convert olsr.lua and overview.htm to new json plugin
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>
5 years agoluci-base: network.lua add ipv6-prefix-assignment support to get_status_by_address
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>
5 years agoluci-app-olsr: cbi remove library version numbers in library search results
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>
5 years agofreifunk profiles: add nameserver 80.67.169.40 from www.fdn.fr/actions/dns
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>
5 years agoluci-app-olsr-services: Don't use the nameservice with a specific version.
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>
6 years agoluci-mod-network: adapt to current 802.11r defaults
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>
6 years agoapplications: drop luci-app-asterisk
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)

6 years agoMerge pull request #2278 from sotux/openwrt-18.06
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

6 years agoi18n: luci-app-uhttpd: add initial Simplified Chinese translation 2278/head
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>
6 years agoi18n: luci-base: update Simplified Chinese translation
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>
6 years agoi18n: luci-app-firewall: update Simplified Chinese translation
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>
6 years agoluci-app-adblock: sync translations
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>
6 years agoluci-app-travelmate: sync translations
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>
6 years agoi18n: sync translations
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>
6 years agoi18n: luci-app-firewall: cleanup multiple definitions in uk/firewall.po
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>
6 years agoi18n: luci-app-addblock: cleanup multiple definitions in zh-cn/adblock.po
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>
6 years agoi18n: fix german base.po
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>
6 years agotimezone data: update to 2018g
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)

6 years ago timezone data: update to 2018f
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)

6 years agoluci-app-openvpn: remove obsolete config options
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)

6 years agoluci-app-openvpn: fix template based config creation
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)

6 years agotimezone data: update to 2018e
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)

6 years agoluci-app-adblock: sync with adblock 3.5.5
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)

6 years agoMerge pull request #2109 from kagurazakakotori/openwrt-18.06
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

6 years agoluci-app-adblock: fix chinese translation 2109/head
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>
6 years agoluci-app-firewall: allow "open ports" when no wan zone exists 2100/head
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)

6 years agoluci-mod-admin-full: applyreboot doesn't reload page
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)

6 years agoluci-mod-admin-full: fix broken applyreboot page
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)

6 years agoluci-theme-material: fix theme for applyreboot page changes
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)

6 years agoluci-base: mark password template dummy field as hidden
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)

6 years agoCorrect grammar in apply_widget.htm
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)

6 years agoluci-base: update Chinese translation
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)

6 years agoluci-base: update Polish translation
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)

6 years agoluci-base: update Polish translation
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)

6 years agoluci-mod-admin-full: Fix DSL Stats display of dB statistics
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>
6 years agoMerge pull request #2018 from chris5560/18.06-ddns
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

6 years agoMerge pull request #2016 from chris5560/openwrt-18.06
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

6 years agoluci-theme-bootstrap: fix CSS regression in kernel/system log pages
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)

6 years agoluci-app-adblock: "final" fixes
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)

6 years agoluci-app-travelmate: "final" fixes
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)

6 years agofix compilation failure when luasrcdiet is being copied to non existing directory
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)

6 years agoMerge pull request #2014 from dibdot/travelmate-18.06
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

6 years agoMerge pull request #2013 from dibdot/adblock-18.06
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

6 years agoluci-app-ddns[18.06]: remove myself as PKG_MAINTAINER 2018/head
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>
6 years agoluci-app-radicale[18.06]: remove myself as PKG_MAINTAINER 2016/head
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>
6 years agoluci-app-travelmate: backport 1.2.1 to 18.06 branch 2014/head
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>
6 years agoluci-app-adblock: backport 3.5.4 to 18.06 branch 2013/head
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>
6 years agoluci-theme-openwrt: style tweaks for DSL status display
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)

6 years agoluci-theme-bootstrap: style tweak for DSL status display
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)

6 years agoluci-mod-admin-full: rework DSL Status display
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)

6 years agoluci-mod-admin-full: fix style glitch on packages page
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)

6 years agoluci-base: fix luasrcdiet
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)

6 years agoluci-proto-relay: propagate up state, do not forward netifd errors
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)

6 years agoluci-base: fix footer template
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)

6 years agotreewide: rework rollback/apply workflow
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)

6 years agoluci-base: xhr.js: decode JSON for POST requests as well
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)

6 years agoluci-base: utils: support multiple return values in util.ubus()
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)

6 years agoluci-mod-admin-full: abbreviate "MAC-Address" as "MAC" to align with rest
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)

6 years agoluci-mod-admin-full: fix wifi overview display when no networks are defined
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)

6 years agoff_olsrd_watchdog: delete existing tunnels
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)

6 years agoluci-base: strip superfluous space in additional field markup
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)

6 years agoluci-theme-openwrt: fix button placement quirk
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)

6 years agoluci-base: cbi.js: fade to-be-deleted section when hovering delete button
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)

6 years agoluci-base: cbi.js: use adjacent button dynlist add/remove buttons
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)

6 years agoluci-base: rework reveal/hide CBI password template button
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)

6 years agoluci-theme-bootstrap: add styling for input-adjacent buttons
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)

6 years agoluci-theme-openwrt: add styling for input-adjacent buttons
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)

6 years agoluci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
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)

6 years agoluci: do not depend on uhttpd-mod-ubus
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)

6 years agoluci-theme-openwrt: support rendering tblsection cell descriptions
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)

6 years agoluci-base: add description annotations to tblsection cells
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)

6 years agoluci-base: update Polish translation
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)

6 years agoluci-proto-ncm: remove unrelated options
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)

6 years agoluci-proto-ncm: add pdptype option
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)

6 years agoMerge pull request #1992 from sotux/openwrt-18.06_zh_CN
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

6 years agoMerge pull request #1996 from EricLuehrsen/unbound_1806_doc
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

6 years agoluci-base: zh_CN: Update Simplified Chinese translation 1992/head
Zheng Qian [Tue, 24 Jul 2018 08:37:19 +0000 (16:37 +0800)]
luci-base: zh_CN: Update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoluci-app-unbound: point documentation to 18.06 branch 1996/head
Eric Luehrsen [Wed, 25 Jul 2018 03:21:00 +0000 (23:21 -0400)]
luci-app-unbound: point documentation to 18.06 branch

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
6 years agocollections: drop nginx support for 18.06
Jo-Philipp Wich [Sat, 21 Jul 2018 12:25:00 +0000 (14:25 +0200)]
collections: drop nginx support for 18.06

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix check for traceroute6
Jo-Philipp Wich [Sat, 21 Jul 2018 12:18:06 +0000 (14:18 +0200)]
luci-mod-admin-full: fix check for traceroute6

Since busybox has moved traceroute6 from /usr/bin/ to /bin/, we need to
check both locations.

Fixes #1973.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e4a86478e60d7a181dbf05ec9ba4d424ad91777b)

6 years agoluci-base: fix Russian translation
Anton Kikin [Sat, 21 Jul 2018 08:12:17 +0000 (11:12 +0300)]
luci-base: fix Russian translation

More correct translation of the 'instance'.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit bf6275c85ea530389815ab8d33389f5046b716e2)

6 years agoluci-app-upnp: update Russian translation
Olimjon [Fri, 20 Jul 2018 21:34:25 +0000 (02:34 +0500)]
luci-app-upnp: update Russian translation

Signed-off-by: Kudratov O <olimko98@gmail.com>
(cherry picked from commit c03bc0f5338bf6d29cfbdde76cdc4e63af2ddacf)

6 years agoUpdate Russian translation
Olimjon [Fri, 20 Jul 2018 21:10:51 +0000 (02:10 +0500)]
Update Russian translation

[backported from 6a151eb70e2de1eebffc585d3160e18b962a8ddb]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-simple-adblock: remove extra controller file
Stan Grishin [Fri, 20 Jul 2018 23:50:08 +0000 (16:50 -0700)]
luci-app-simple-adblock: remove extra controller file

Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit aaddcac5b098f5f82e59385295f2c6712aae574b)

6 years agoluci-base: update Ukrainian translation
Yurii [Fri, 20 Jul 2018 18:31:54 +0000 (21:31 +0300)]
luci-base: update Ukrainian translation

Updated with the latest resync translation, corrections and additions.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 4fa9115de694f3d6baf6b17a93b1a4d03243e33b)

6 years agoluci-app-upnp: update Ukrainian translation
Yurii [Fri, 20 Jul 2018 18:28:19 +0000 (21:28 +0300)]
luci-app-upnp: update Ukrainian translation

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 9a6026b3d5f60cddee9e22fe20a6371275ffef17)

6 years agoluci-app-wol: update Ukrainian translation
Yurii [Fri, 20 Jul 2018 18:24:30 +0000 (21:24 +0300)]
luci-app-wol: update Ukrainian translation

Corrections and additions.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 2d946363b343e68a604d871ee5413f33bf41d7c7)

6 years agoluci-base: fix bad CSS class names in table section template
Jo-Philipp Wich [Fri, 20 Jul 2018 09:35:09 +0000 (11:35 +0200)]
luci-base: fix bad CSS class names in table section template

The previous refactoring of the template caused the row stripying CSS
classes to be interpolated in such a way, that a separating space to
previous CSS classes was missing, leading to not rendered row names
and other side effects.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-ocserv: remove unneeded br element from template
Jo-Philipp Wich [Fri, 20 Jul 2018 07:10:45 +0000 (09:10 +0200)]
luci-app-ocserv: remove unneeded br element from template

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 985a7db408d2b4b7cf9c4de9db7d98d5e12a50e0)

6 years agoluci-app-ocserv: update user status template
Jo-Philipp Wich [Fri, 20 Jul 2018 07:07:23 +0000 (09:07 +0200)]
luci-app-ocserv: update user status template

- Use cbi_update_table() helper to refresh user list
- Cleanup markup and remove uneeded CSS classes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f4ba55532f01bc484543074c174f198a0ddd3087)

6 years agoluci-base: update Japanese translation
INAGAKI Hiroshi [Fri, 20 Jul 2018 06:30:01 +0000 (15:30 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 72517887cbc9f4cfe204ed7661ce3f58075c196e)

6 years agoi18n: sync translations
INAGAKI Hiroshi [Fri, 20 Jul 2018 03:50:39 +0000 (12:50 +0900)]
i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(backported from commit 86660f92d12b963a05118a8f9471513a18773be4)

6 years agoluci-proto-ncm: add modem default mode
Dmitry Tunin [Thu, 19 Jul 2018 19:54:58 +0000 (22:54 +0300)]
luci-proto-ncm: add modem default mode

Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit 57439d8daa0e24f38960699b04c638cd82d064e0)