oweals/luci.git
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)

6 years agoluci-admin-full: add further wifi options
Ansuel Smith [Tue, 17 Jul 2018 23:23:46 +0000 (01:23 +0200)]
luci-admin-full: add further wifi options

This commit adds option to disable scan for 40mhz channel, permit to tweak
beacon interval and other advanced settings.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[fix whitespace, add range constraint to dtim_period, add dtim_period
 to local vars, reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 39cabc03611369d7cb421b5fcff90ce20d9d51c4)

6 years agoluci-admin-full: add dnsmasq allservers option
Ansuel Smith [Tue, 17 Jul 2018 23:14:33 +0000 (01:14 +0200)]
luci-admin-full: add dnsmasq allservers option

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 7ff8d15e2491fd35414aafae72f80689bbb121af)

6 years agoluci-app-simple-adblock: change style of button to important
Stan Grishin [Fri, 20 Jul 2018 02:34:49 +0000 (19:34 -0700)]
luci-app-simple-adblock: change style of button to important

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

6 years agoluci-app-advanced-reboot: change style of buttons to important
Stan Grishin [Fri, 20 Jul 2018 02:31:16 +0000 (19:31 -0700)]
luci-app-advanced-reboot: change style of buttons to important

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

6 years agoluci-app-ddns: update and improve Russian translation
Anton Kikin [Fri, 20 Jul 2018 03:11:49 +0000 (06:11 +0300)]
luci-app-ddns: update and improve Russian translation

Update existing not quite correct translations.

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

6 years agoluci-base: fix a typo in Russian translation
Anton Kikin [Fri, 20 Jul 2018 02:08:38 +0000 (05:08 +0300)]
luci-base: fix a typo in Russian translation

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

6 years agoluci-theme-bootstrap: allow pointer events on readonly textareas and dropdowns
Jo-Philipp Wich [Thu, 19 Jul 2018 14:50:50 +0000 (16:50 +0200)]
luci-theme-bootstrap: allow pointer events on readonly textareas and dropdowns

This is required to scroll and select text.

Fixes #1965
Fixes 887d0a685 ("luci-theme-bootstrap: cleanup CSS")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a68006245df16599145c00b949d2c8c97a327295)

6 years agoluci-theme-openwrt: fix another instance of misplaced page action button
Jo-Philipp Wich [Wed, 18 Jul 2018 12:49:02 +0000 (14:49 +0200)]
luci-theme-openwrt: fix another instance of misplaced page action button

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

6 years agoluci-mod-admin-full: use incremental background scanning for wireless join
Jo-Philipp Wich [Wed, 18 Jul 2018 12:43:27 +0000 (14:43 +0200)]
luci-mod-admin-full: use incremental background scanning for wireless join

The previous approach of synchroneously scanning while building the result
page was suboptimal since it frequently led to connection resets when
accessing LuCI via wireless.

It also exhibited problems when accessed via SSL on recent Firefox versions
where the page were only loaded partially.

Rework the wireless scanning to gather scan results in a background process
and put them into the ubus session data area where they can be readily
accessed without causing network interruptions.

Subsequently rebuild the wireless join page to use XHR polling to
incrementally fetch updated scan results.

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

6 years agoluci-theme-openwrt: fixes for page action button placement
Jo-Philipp Wich [Wed, 18 Jul 2018 10:04:22 +0000 (12:04 +0200)]
luci-theme-openwrt: fixes for page action button placement

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

6 years agoluci-theme-bootstrap: various fixes
Jo-Philipp Wich [Wed, 18 Jul 2018 10:02:35 +0000 (12:02 +0200)]
luci-theme-bootstrap: various fixes

- Styling fixes for table hover rows, striping and title row coloring
- Fixes for page action button placement

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

6 years agoluci-mod-admin-full: properly reset internal device form field
Jo-Philipp Wich [Wed, 18 Jul 2018 08:02:07 +0000 (10:02 +0200)]
luci-mod-admin-full: properly reset internal device form field

In some cases the hidden internal device field was not reset, e.g. after
aborting a wifi scan and using the browser back buttons to navigate to the
overview page again.

In such a case, the previous device hidden field was still present and a new
one getting created, causing further wireless scan attempts to get invoked
with multiple radio names as parameter which fails.

Fix this issue by using the new generic cbi_submit() helper any by dropping
the faulty wifi_action() function.

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

6 years agoluci-base: rework CBI footer template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:46:46 +0000 (11:46 +0200)]
luci-base: rework CBI footer template

- Make sure that hitting enter in the form hits the CBI save action and not
  apply or cancel
- Hide action panel if no actions are available
- CLeanup code

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

6 years agoluci-base: rework tblsection template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:38:45 +0000 (11:38 +0200)]
luci-base: rework tblsection template

- Hide empty title and description rows
- Correct row striping offset
- Cleanup code

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

6 years agoluci-base: rework simpleform template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:36:53 +0000 (11:36 +0200)]
luci-base: rework simpleform template

- Ensure that pressing enter in the form triggers the submit action and
  not a cbi skip or cancel
- Hide page actions when empty
- Cleanup code

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

6 years agoluci-base: cbi.js: add cbi_submit() helper
Jo-Philipp Wich [Wed, 18 Jul 2018 09:23:50 +0000 (11:23 +0200)]
luci-base: cbi.js: add cbi_submit() helper

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

6 years agoluci-mod-admin-full: offer "Cancel" button in iface add dialog
Jo-Philipp Wich [Wed, 18 Jul 2018 08:11:45 +0000 (10:11 +0200)]
luci-mod-admin-full: offer "Cancel" button in iface add dialog

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

6 years agoluci-base: remove unused icons
Jo-Philipp Wich [Tue, 17 Jul 2018 11:17:38 +0000 (13:17 +0200)]
luci-base: remove unused icons

 - The wifi_big.png / wifi_big_disabled.png icons were used on the wireless
   overview page which now uses badges with normal sized icons
 - The encryption.png / encryption_disabled.png icons were never used at all

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

6 years agoluci-base: update and improve Russian translation
Anton Kikin [Tue, 17 Jul 2018 11:38:42 +0000 (14:38 +0300)]
luci-base: update and improve Russian translation

Add missing translations and update existing not quite correct translations.
Replaced hyphens on em dashes where it is required by the Russian rules.

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

6 years agoluci-base: fix Russian translation
Anton Kikin [Mon, 16 Jul 2018 22:50:51 +0000 (01:50 +0300)]
luci-base: fix Russian translation

Removed redundant <br> tags from translations.

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

6 years agoluci-app-simple-adblock: new start/stop button, better integration with simple-adblock
Stan Grishin [Tue, 17 Jul 2018 00:43:16 +0000 (17:43 -0700)]
luci-app-simple-adblock: new start/stop button, better integration with simple-adblock

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

6 years agoluci-app-upnp: update Ukrainian translation
Yurii [Mon, 16 Jul 2018 13:19:27 +0000 (16:19 +0300)]
luci-app-upnp: update Ukrainian translation

Corrections translation.

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

6 years agoluci-base: update Ukrainian translation
Yurii [Mon, 16 Jul 2018 13:16:56 +0000 (16:16 +0300)]
luci-base: update Ukrainian translation

Updated with the latest resync translation, corrections and additions translation.

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

6 years agobase.po: Update chinese translations.
amitabha [Mon, 16 Jul 2018 07:24:17 +0000 (15:24 +0800)]
base.po: Update chinese translations.

Fix some Chinese translations.
Signed-off-by: Angus Ding <angus.ding@gmail.com>
(cherry picked from commit 92404498a17eb4a7d4cf6f67deba66a6f350a055)

6 years agoluci-base: fix Russian translation
Anton Kikin [Sun, 15 Jul 2018 16:35:35 +0000 (19:35 +0300)]
luci-base: fix Russian translation

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

6 years agoluci-base: Avoid block umount on fstab apply
Daniel Dickinson [Mon, 16 Jan 2017 02:20:44 +0000 (21:20 -0500)]
luci-base: Avoid block umount on fstab apply

Default behaviour of changes to fstab (Mount Points) was
to use /etc/init.d/fstab restart, however this unmounts
filesystems via block umount which can cause the device
to fail, so replace the initscript call with an exec
of 'block mount'.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
(cherry picked from commit 33b279c4752ac6df3d911edb6e1fb60b656bc122)

6 years agoluci-base: resync translations
Jo-Philipp Wich [Tue, 17 Jul 2018 18:46:54 +0000 (20:46 +0200)]
luci-base: resync translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6
Jo-Philipp Wich [Tue, 17 Jul 2018 14:18:25 +0000 (16:18 +0200)]
luco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6

Fixes FS#1361.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 60e7ea2fc8363960861a82f1e65ca4a7a1d60bfe)

6 years agoluci-base: fix field section add button/input field names
Jo-Philipp Wich [Mon, 16 Jul 2018 15:28:50 +0000 (17:28 +0200)]
luci-base: fix field section add button/input field names

Some CBI map models, mainly the Network -> VLAN page, expect a valid
previous section ID in their Section:create() callback.

Previous refactoring of the tblsection markup broke this behaviour as
the "section" loop variable was accidentally localized, causing it to
be undefined outside of the loop body which caused the section add
button and name input fields to get rendered with a wrong "name"
attribute.

Fix this by moving the "section" variable declaration out of the loop
and by readding references to it in the non-anonymous section add case.

Fixes FS#1657
Fixes 002c4d1d5 ("luci-base: add "Name" label to autogenerated title column")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fcc9cd6a9ab0bd7eaff6b3f3b4dd96fa31f79ebb)

6 years agoluci-mod-admin-full: fix changing alias interface ifnames
Jo-Philipp Wich [Sun, 15 Jul 2018 15:21:02 +0000 (17:21 +0200)]
luci-mod-admin-full: fix changing alias interface ifnames

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: fix handling alias interfaces in ifacelist widget
Jo-Philipp Wich [Sun, 15 Jul 2018 15:20:27 +0000 (17:20 +0200)]
luci-base: fix handling alias interfaces in ifacelist widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: luci.model.network: recognize alias interfaces
Jo-Philipp Wich [Sun, 15 Jul 2018 15:07:28 +0000 (17:07 +0200)]
luci-base: luci.model.network: recognize alias interfaces

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