oweals/luci.git
6 years agoMerge pull request #2053 from YuriPet/master
Hannu Nyman [Fri, 10 Aug 2018 14:51:44 +0000 (17:51 +0300)]
Merge pull request #2053 from YuriPet/master

luci-base: corrected Ukrainian translation

6 years agoUpdate base.po: corrected translation errors 2053/head
Yurii [Fri, 10 Aug 2018 14:40:44 +0000 (17:40 +0300)]
Update base.po: corrected translation errors

Signed-off-by: Yurii yuripet@gmail.com
6 years agoMerge pull request #2042 from Ansuel/apprebooy
Jo-Philipp Wich [Wed, 8 Aug 2018 08:42:25 +0000 (10:42 +0200)]
Merge pull request #2042 from Ansuel/apprebooy

luci-mod-admin-full: improve applyreboot page

6 years agoluci-mod-admin-full: fix broken applyreboot page 2042/head
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>
6 years agoMerge pull request #2043 from Ansuel/materialfix
Jo-Philipp Wich [Tue, 7 Aug 2018 15:50:34 +0000 (17:50 +0200)]
Merge pull request #2043 from Ansuel/materialfix

luci-theme-material: fix theme for applyreboot page changes

6 years agoluci-theme-material: fix theme for applyreboot page changes 2043/head
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>
6 years agoMerge pull request #2041 from farmergreg/to-be-or-not-to-be
Jo-Philipp Wich [Tue, 7 Aug 2018 14:27:57 +0000 (16:27 +0200)]
Merge pull request #2041 from farmergreg/to-be-or-not-to-be

Correct grammar in apply_widget.htm

6 years agoCorrect grammar in apply_widget.htm 2041/head
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>
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>
6 years agoMerge pull request #2038 from musashino205/l10n/samba4-upd-ja
Jo-Philipp Wich [Mon, 6 Aug 2018 10:33:01 +0000 (12:33 +0200)]
Merge pull request #2038 from musashino205/l10n/samba4-upd-ja

luci-app-samba4: update Japanese translation

6 years agoluci-app-samba4: update Japanese translation 2038/head
INAGAKI Hiroshi [Sun, 5 Aug 2018 20:18:10 +0000 (05:18 +0900)]
luci-app-samba4: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #2037 from Rixerx/master
Hannu Nyman [Sun, 5 Aug 2018 17:11:34 +0000 (20:11 +0300)]
Merge pull request #2037 from Rixerx/master

luci-base: update Polish translation

6 years agoluci-base: update Polish translation 2037/head
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>
6 years agoMerge pull request #2026 from alanswanson/master
Jo-Philipp Wich [Sat, 4 Aug 2018 17:53:01 +0000 (19:53 +0200)]
Merge pull request #2026 from alanswanson/master

luci-mod-admin-full: Fix DSL Stats display of dB statistics

6 years agoluci-mod-admin-full: Fix DSL Stats display of dB statistics 2026/head
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 #2003 due to excess changes from %s to %d.

6 years agoMerge pull request #2029 from yangfl/master
Hannu Nyman [Thu, 2 Aug 2018 05:05:33 +0000 (08:05 +0300)]
Merge pull request #2029 from yangfl/master

luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

6 years agoluci-app-ddns: fix huge typo in luasrc/tools/ddns.lua 2029/head
yangfl [Thu, 2 Aug 2018 02:51:25 +0000 (10:51 +0800)]
luci-app-ddns: fix huge typo in luasrc/tools/ddns.lua

Signed-off-by: David Yang <mmyangfl@gmail.com>
6 years agoMerge pull request #2017 from chris5560/master-ddns
Hannu Nyman [Wed, 1 Aug 2018 16:44:24 +0000 (19:44 +0300)]
Merge pull request #2017 from chris5560/master-ddns

luci-app-ddns: remove myself as PKG_MAINTAINER

6 years agoMerge pull request #2015 from chris5560/master
Hannu Nyman [Wed, 1 Aug 2018 16:44:00 +0000 (19:44 +0300)]
Merge pull request #2015 from chris5560/master

luci-app-radicale: 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>
6 years agoMerge pull request #2021 from dibdot/travelmate
Dirk Brenken [Tue, 31 Jul 2018 09:27:11 +0000 (11:27 +0200)]
Merge pull request #2021 from dibdot/travelmate

luci-app-travelmate: "final" fixes

6 years agoMerge pull request #2019 from dibdot/adblock
Dirk Brenken [Tue, 31 Jul 2018 09:26:43 +0000 (11:26 +0200)]
Merge pull request #2019 from dibdot/adblock

luci-app-adblock: "final" fixes

6 years agoluci-app-travelmate: "final" fixes 2021/head
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>
6 years agoluci-app-adblock: "final" fixes 2019/head
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>
6 years agoMerge pull request #2001 from Rixerx/master
Hannu Nyman [Mon, 30 Jul 2018 20:09:01 +0000 (23:09 +0300)]
Merge pull request #2001 from Rixerx/master

luci-base: update Polish translation

6 years agoluci-app-ddns: remove myself as PKG_MAINTAINER 2017/head
Christian Schoenebeck [Mon, 30 Jul 2018 19:55:08 +0000 (21:55 +0200)]
luci-app-ddns: remove myself as PKG_MAINTAINER

remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
6 years agoluci-app-radicale: remove myself as PKG_MAINTAINER 2015/head
Christian Schoenebeck [Mon, 30 Jul 2018 19:47:04 +0000 (21:47 +0200)]
luci-app-radicale: remove myself as PKG_MAINTAINER

remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
6 years agoMerge pull request #2012 from jempatel/master
Jo-Philipp Wich [Mon, 30 Jul 2018 14:07:00 +0000 (16:07 +0200)]
Merge pull request #2012 from jempatel/master

fix compilation failure when luasrcdiet is being copied to non existing directory

6 years agofix compilation failure when luasrcdiet is being copied to non existing directory 2012/head
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>
6 years agoMerge pull request #2010 from EricLuehrsen/unbound_20180721
Jo-Philipp Wich [Mon, 30 Jul 2018 05:01:46 +0000 (07:01 +0200)]
Merge pull request #2010 from EricLuehrsen/unbound_20180721

luci-app-unbound: add LuCI for forward stub and auth zone clauses

6 years agoluci-app-unbound: add LuCI for forward stub and auth zone clauses 2010/head
Eric Luehrsen [Thu, 26 Jul 2018 06:05:33 +0000 (02:05 -0400)]
luci-app-unbound: add LuCI for forward stub and auth zone clauses

With growing interest, DNS over TLS can be setup in Unbounds foward-zone:
clause. New section 'zone' is available for forward-, stub-, and auth-
zone cluses. This LuCI application will show the 'zone' section and
permit changing 'enabled' and 'fallback' options. Detailed changes to
'zone' secitons will need to use the Edit:UCI tab (text editor).

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
6 years agoMerge pull request #2009 from dibdot/travelmate
Dirk Brenken [Sun, 29 Jul 2018 19:55:24 +0000 (21:55 +0200)]
Merge pull request #2009 from dibdot/travelmate

luci-app-travelmate: remove needless backup file

6 years agoluci-app-travelmate: remove needless backup file 2009/head
Dirk Brenken [Sun, 29 Jul 2018 19:50:28 +0000 (21:50 +0200)]
luci-app-travelmate: remove needless backup file

* remove needless development file from last commit

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #2007 from dibdot/travelmate
Dirk Brenken [Sun, 29 Jul 2018 19:30:26 +0000 (21:30 +0200)]
Merge pull request #2007 from dibdot/travelmate

luci-app-travelmate: sync with travelmate 1.2.1

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>
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>
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>
6 years agoluci-app-travelmate: sync with travelmate 1.2.1 2007/head
Dirk Brenken [Sat, 28 Jul 2018 17:02:35 +0000 (19:02 +0200)]
luci-app-travelmate: sync with travelmate 1.2.1

* Runtime Information, Logview and Station Overview are now dynamically
updated via XHR poll
* New runtime information for "Faulty Stations" (Travelmate backend will
no longer rename faulty uplinks)
* Add a new "Restart" button to reset "Faulty Stations" information and
trigger a Travelmate restart
* In Stations overview the currently used uplink is emphasized in blue,
faulty uplinks in red
* Numerous cleanups (e.g. space=>tab indentation) and other small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #2006 from dibdot/adblock
Dirk Brenken [Sat, 28 Jul 2018 16:23:47 +0000 (18:23 +0200)]
Merge pull request #2006 from dibdot/adblock

luci-app-adblock: small fixes

6 years agoluci-app-adblock: small fixes 2006/head
Dirk Brenken [Sat, 28 Jul 2018 14:47:19 +0000 (16:47 +0200)]
luci-app-adblock: small fixes

* fix possible controller error during json parsing
* remaining code cleanup

Signed-off-by: Dirk Brenken <dev@brenken.org>
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>
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>
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>
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>
6 years agoluci-base: update Polish translation 2001/head
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>
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>
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>
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>
6 years agoMerge pull request #1993 from sotux/master_zh_CN
Jo-Philipp Wich [Thu, 26 Jul 2018 18:24:13 +0000 (20:24 +0200)]
Merge pull request #1993 from sotux/master_zh_CN

luci-base: zh_CN: Update Simplified Chinese translation

6 years agoMerge pull request #1946 from korzhyk/web_home
Jo-Philipp Wich [Thu, 26 Jul 2018 18:19:02 +0000 (20:19 +0200)]
Merge pull request #1946 from korzhyk/web_home

luci-app-transmission: Allow user to define custom web interface

6 years agoMerge pull request #1985 from Andy2244/master
Jo-Philipp Wich [Thu, 26 Jul 2018 18:17:40 +0000 (20:17 +0200)]
Merge pull request #1985 from Andy2244/master

luci-app-samba4: add new application

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>
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>
6 years agoMerge pull request #1761 from pmelange/ff_olsr_watchdog_del_tnl
Jo-Philipp Wich [Thu, 26 Jul 2018 06:41:06 +0000 (08:41 +0200)]
Merge pull request #1761 from pmelange/ff_olsr_watchdog_del_tnl

ff_olsr_watchdog: delete stale tunnels

6 years agoff_olsrd_watchdog: delete existing tunnels 1761/head
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>
6 years agoMerge pull request #1997 from dibdot/adblock
Dirk Brenken [Wed, 25 Jul 2018 19:46:20 +0000 (21:46 +0200)]
Merge pull request #1997 from dibdot/adblock

luci-app-adblock: small visual fixes

6 years agoluci-app-adblock: small visual fixes 1997/head
Dirk Brenken [Wed, 25 Jul 2018 19:39:22 +0000 (21:39 +0200)]
luci-app-adblock: small visual fixes

* made readonly textarea (logview) scrollable again (bootstrap theme)
* align "Query" input button

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: zh_CN: Update Simplified Chinese translation 1993/head
Zheng Qian [Tue, 24 Jul 2018 08:48:40 +0000 (16:48 +0800)]
luci-base: zh_CN: Update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoluci-app-samba4: add new application 1985/head
Andy Walsh [Sun, 22 Jul 2018 15:04:40 +0000 (17:04 +0200)]
luci-app-samba4: add new application

* updated version for the samba4 package

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
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>
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>
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>
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>
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>
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>
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>
6 years agoMerge pull request #1986 from dibdot/adblock
Jo-Philipp Wich [Sun, 22 Jul 2018 20:37:01 +0000 (22:37 +0200)]
Merge pull request #1986 from dibdot/adblock

luci-app-adblock: fix translations

6 years agoluci-app-adblock: fix translations 1986/head
Dirk Brenken [Sun, 22 Jul 2018 20:28:26 +0000 (22:28 +0200)]
luci-app-adblock: fix translations

* fix runtime & button translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
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>
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>
6 years agoMerge pull request #1982 from Rixerx/master
Jo-Philipp Wich [Sun, 22 Jul 2018 15:47:01 +0000 (17:47 +0200)]
Merge pull request #1982 from Rixerx/master

luci-base: update Polish translation

6 years agoMerge pull request #1983 from dibdot/adblock
Jo-Philipp Wich [Sun, 22 Jul 2018 15:46:04 +0000 (17:46 +0200)]
Merge pull request #1983 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.4

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>
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>
6 years agoluci-app-adblock: sync with adblock 3.5.4 1983/head
Dirk Brenken [Sat, 21 Jul 2018 20:32:16 +0000 (22:32 +0200)]
luci-app-adblock: sync with adblock 3.5.4

backend:
* add low priority mode (nice level 10), disabled by default
* enhance 'Force DNS' to redirect ports 53, 853 and 5353

frontend:
* switch to dynamic XHR polling for runtime information and logfile
viewing
* add new 'Refresh' button to reload blocklists
* various cleanups & small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: update Polish translation 1982/head
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>
6 years agoMerge pull request #1981 from hanipouspilot/ncm
Jo-Philipp Wich [Sat, 21 Jul 2018 19:36:07 +0000 (21:36 +0200)]
Merge pull request #1981 from hanipouspilot/ncm

luci-proto-ncm: remove unrelated options

6 years agoluci-proto-ncm: remove unrelated options 1981/head
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>
6 years agoMerge pull request #1980 from hanipouspilot/ncm-addpdp
Jo-Philipp Wich [Sat, 21 Jul 2018 17:02:47 +0000 (19:02 +0200)]
Merge pull request #1980 from hanipouspilot/ncm-addpdp

luci-proto-ncm: add pdptype option

6 years agoluci-proto-ncm: add pdptype option 1980/head
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>
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>
6 years agoMerge pull request #1978 from tano-systems/luci-base-fix-russian-translation
Jo-Philipp Wich [Sat, 21 Jul 2018 08:14:24 +0000 (10:14 +0200)]
Merge pull request #1978 from tano-systems/luci-base-fix-russian-translation

luci-base: fix Russian translation

6 years agoMerge pull request #1975 from Olim98/patch-2
Jo-Philipp Wich [Sat, 21 Jul 2018 08:13:53 +0000 (10:13 +0200)]
Merge pull request #1975 from Olim98/patch-2

luci-app-upnp: update Russian translation

6 years agoMerge pull request #1974 from Olim98/patch-1
Jo-Philipp Wich [Sat, 21 Jul 2018 08:13:17 +0000 (10:13 +0200)]
Merge pull request #1974 from Olim98/patch-1

luci-app-adblock: fix and update Russian translation

6 years agoMerge pull request #1976 from stangri/luci-app-simple-adblock
Jo-Philipp Wich [Sat, 21 Jul 2018 08:12:59 +0000 (10:12 +0200)]
Merge pull request #1976 from stangri/luci-app-simple-adblock

luci-app-simple-adblock: remove extra controller file

6 years agoluci-base: fix Russian translation 1978/head
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>
6 years agoluci-app-simple-adblock: remove extra controller file 1976/head
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>
6 years agoluci-app-upnp: update Russian translation 1975/head
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>
6 years agoUpdate Russian translation 1974/head
Olimjon [Fri, 20 Jul 2018 21:10:51 +0000 (02:10 +0500)]
Update Russian translation

6 years agoMerge pull request #1972 from YuriPet/master
Jo-Philipp Wich [Fri, 20 Jul 2018 19:46:35 +0000 (21:46 +0200)]
Merge pull request #1972 from YuriPet/master

luci-base, luci-app-upnp, luci-app-wol: update Ukrainian translation

6 years agoluci-base: update Ukrainian translation 1972/head
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
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
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
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>
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>
6 years agoMerge pull request #1971 from musashino205/l10n/base-upd-ja
Jo-Philipp Wich [Fri, 20 Jul 2018 06:47:23 +0000 (08:47 +0200)]
Merge pull request #1971 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoluci-base: update Japanese translation 1971/head
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>
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>
6 years agoMerge pull request #1964 from hanipouspilot/ncm-fix
Jo-Philipp Wich [Fri, 20 Jul 2018 05:53:05 +0000 (07:53 +0200)]
Merge pull request #1964 from hanipouspilot/ncm-fix

luci-proto-ncm: remove mode 'auto' as default