Commit graph

9921 commits

Author SHA1 Message Date
Kagurazaka Kotori
4f4b28b789
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>
2018-08-24 01:16:43 +08:00
Jo-Philipp Wich
f64b152344 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 bf123fb7c4)
2018-08-16 10:52:26 +02:00
Ansuel Smith
f4da0b8cfb 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 442ece768d)
2018-08-16 10:52:22 +02:00
Ansuel Smith
e0599d5064 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 327e284b74)
2018-08-16 10:52:14 +02:00
Ansuel Smith
f9121fd86c 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 35da63fa9a)
2018-08-16 10:52:09 +02:00
Jo-Philipp Wich
199eac4166 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 98d4eb1695)
2018-08-16 10:51:33 +02:00
Gregory L. Dietsche
a49e4e4d56 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 abfe45ff61)
2018-08-07 16:38:26 +02:00
yangfl
8bb4873326 luci-base: update Chinese translation
Signed-off-by: David Yang <mmyangfl@gmail.com>
(cherry picked from commit c51f0d9714)
2018-08-07 16:38:20 +02:00
Krystian Kozak
8407d90aa1 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit 10f12d7f6a)
2018-08-07 16:38:14 +02:00
Krystian Kozak
5d1d6915ca luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit 6dbdc2cae8)
2018-08-07 16:37:46 +02:00
Alan Swanson
3d5d9dc574 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 4b3d20cda4)
[rewrapped commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-08-04 20:06:14 +02:00
Hannu Nyman
7d69fa6a50
Merge pull request #2018 from chris5560/18.06-ddns
luci-app-ddns[18.06]: remove myself as PKG_MAINTAINER
2018-08-01 19:44:34 +03:00
Hannu Nyman
2da3f93feb
Merge pull request #2016 from chris5560/openwrt-18.06
luci-app-radicale[18.06]: remove myself as PKG_MAINTAINER
2018-08-01 19:44:11 +03:00
Jo-Philipp Wich
5ec72617ee 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 176e246998)
2018-07-31 17:26:48 +02:00
Dirk Brenken
9beff0720e
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 b8f8394681)
2018-07-31 15:45:47 +02:00
Dirk Brenken
cc4310817e
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 af25cf4879)
2018-07-31 15:32:07 +02:00
Jaymin Patel
e290fe917d 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 bb336671ff)
2018-07-31 06:58:01 +02:00
Hannu Nyman
1983dc615e
Merge pull request #2014 from dibdot/travelmate-18.06
luci-app-travelmate: backport 1.2.1 to 18.06 branch
2018-07-30 23:07:41 +03:00
Hannu Nyman
d844d51323
Merge pull request #2013 from dibdot/adblock-18.06
luci-app-adblock: backport 3.5.4 to 18.06 branch
2018-07-30 23:07:27 +03:00
Christian Schoenebeck
7f5b296e30 luci-app-ddns[18.06]: remove myself as PKG_MAINTAINER
remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2018-07-30 21:58:32 +02:00
Christian Schoenebeck
b0dce7a681 luci-app-radicale[18.06]: remove myself as PKG_MAINTAINER
remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2018-07-30 21:51:08 +02:00
Dirk Brenken
56266d0707 luci-app-travelmate: backport 1.2.1 to 18.06 branch
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-30 13:40:13 +02:00
Dirk Brenken
bf5dd58377 luci-app-adblock: backport 3.5.4 to 18.06 branch
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-30 13:27:38 +02:00
Jo-Philipp Wich
6df9a57ef0 luci-theme-openwrt: style tweaks for DSL status display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6d74a82bf6)
2018-07-29 21:12:59 +02:00
Jo-Philipp Wich
c26709a850 luci-theme-bootstrap: style tweak for DSL status display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 765816d07d)
2018-07-29 21:12:59 +02:00
Jo-Philipp Wich
db5bde618b luci-mod-admin-full: rework DSL Status display
Fixes #2003.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 88713f6456)
2018-07-29 21:12:59 +02:00
Jo-Philipp Wich
d05f442ad5 luci-mod-admin-full: fix style glitch on packages page
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a0b4d2adb6)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
ea09513095 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 63fbf5a805)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
680a6d2ad3 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 aae187dedf)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
520afa4c39 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 350be23eb9)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
7e5331f154 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 e5a1ac0228)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
64e3fe9f6b luci-base: xhr.js: decode JSON for POST requests as well
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 98217f8f8d)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
186228e365 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 9ead1e29a6)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
58bd130a80 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 8a1bc1814f)
2018-07-26 20:31:35 +02:00
Jo-Philipp Wich
198474f690 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 80706cbafb)
2018-07-26 20:31:33 +02:00
pmelange
667f73a428 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 5d0b720f8b)
2018-07-26 20:31:27 +02:00
Jo-Philipp Wich
df614ffd43 luci-base: strip superfluous space in additional field markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c27a77756c)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
867fcff8bb luci-theme-openwrt: fix button placement quirk
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit efc1a5261a)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
97b3e5773d 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 590d1cc74f)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
6cf7d11e15 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 875b561875)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
d7d15f6c5c 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 b6dd0ecd6c)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
97e647bb25 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 7ba4eb1a42)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
b8a0b617ad luci-theme-openwrt: add styling for input-adjacent buttons
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2287e79a5c)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
516ce4af78 luci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 4105c78ff9)
2018-07-26 20:29:51 +02:00
Jo-Philipp Wich
bcb8d8969c 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 1602313f5c)
2018-07-26 20:28:43 +02:00
Jo-Philipp Wich
024fa3cf30 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 e3f76c255a)
2018-07-26 20:28:36 +02:00
Jo-Philipp Wich
81682971dc 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 8e0ee137a6)
2018-07-26 20:28:30 +02:00
Krystian Kozak
03b6d77ee3 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit a900d61d91)
2018-07-26 20:26:58 +02:00
Dmitry Tunin
ffed0206b9 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 6d03051e95)
2018-07-26 20:26:54 +02:00
Dmitry Tunin
a6b2b29dc6 luci-proto-ncm: add pdptype option
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit 58fd0749de)
2018-07-26 20:26:50 +02:00