Commit graph

10003 commits

Author SHA1 Message Date
Dmitry Tunin
95c38dab8f luci-proto-ncm: suggest both tty and wdm devices
Some modems are controlled only through a tty.
Autodetection of control device is broken in ncm.sh

Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
2018-07-29 02:53:01 +03:00
Dirk Brenken
11cd64e08e 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>
2018-07-28 19:02:35 +02:00
Dirk Brenken
4a85973a9a
Merge pull request #2006 from dibdot/adblock
luci-app-adblock: small fixes
2018-07-28 18:23:47 +02:00
Dirk Brenken
b7ed444cbb luci-app-adblock: small fixes
* fix possible controller error during json parsing
* remaining code cleanup

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-28 17:30:18 +02:00
Jo-Philipp Wich
a0b4d2adb6 luci-mod-admin-full: fix style glitch on packages page
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-28 14:41:34 +02:00
Jo-Philipp Wich
63fbf5a805 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>
2018-07-28 14:21:51 +02:00
Jo-Philipp Wich
aae187dedf 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>
2018-07-28 14:21:42 +02:00
Jo-Philipp Wich
350be23eb9 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>
2018-07-28 14:21:36 +02:00
Krystian Kozak
6dbdc2cae8 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
2018-07-27 23:10:49 +02:00
Jo-Philipp Wich
e5a1ac0228 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>
2018-07-27 14:07:23 +02:00
Jo-Philipp Wich
98217f8f8d luci-base: xhr.js: decode JSON for POST requests as well
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-27 14:07:23 +02:00
Jo-Philipp Wich
9ead1e29a6 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>
2018-07-27 14:07:23 +02:00
Jo-Philipp Wich
ddf4c2b617
Merge pull request #1993 from sotux/master_zh_CN
luci-base: zh_CN: Update Simplified Chinese translation
2018-07-26 20:24:13 +02:00
Jo-Philipp Wich
9a489da90f
Merge pull request #1946 from korzhyk/web_home
luci-app-transmission: Allow user to define custom web interface
2018-07-26 20:19:02 +02:00
Jo-Philipp Wich
2519d7ee8b
Merge pull request #1985 from Andy2244/master
luci-app-samba4: add new application
2018-07-26 20:17:40 +02:00
Jo-Philipp Wich
8a1bc1814f luci-mod-admin-full: abbreviate "MAC-Address" as "MAC" to align with rest
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-26 19:20:39 +02:00
Jo-Philipp Wich
80706cbafb luci-mod-admin-full: fix wifi overview display when no networks are defined
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-26 19:15:42 +02:00
Jo-Philipp Wich
5c07c6fff3
Merge pull request #1761 from pmelange/ff_olsr_watchdog_del_tnl
ff_olsr_watchdog: delete stale tunnels
2018-07-26 08:41:06 +02:00
pmelange
5d0b720f8b 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>
2018-07-25 22:50:31 +02:00
Dirk Brenken
69257be152
Merge pull request #1997 from dibdot/adblock
luci-app-adblock: small visual fixes
2018-07-25 21:46:20 +02:00
Dirk Brenken
771672ff7a 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>
2018-07-25 21:39:22 +02:00
Zheng Qian
33d3108d95 luci-base: zh_CN: Update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-07-25 11:24:41 +08:00
Andy Walsh
5c5dc02441 luci-app-samba4: add new application
* updated version for the samba4 package

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
2018-07-24 13:18:25 +02:00
Jo-Philipp Wich
c27a77756c luci-base: strip superfluous space in additional field markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-23 15:10:55 +02:00
Jo-Philipp Wich
efc1a5261a luci-theme-openwrt: fix button placement quirk
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-23 15:09:10 +02:00
Jo-Philipp Wich
590d1cc74f luci-base: cbi.js: fade to-be-deleted section when hovering delete button
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-23 15:06:26 +02:00
Jo-Philipp Wich
875b561875 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>
2018-07-23 14:31:40 +02:00
Jo-Philipp Wich
b6dd0ecd6c 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>
2018-07-23 14:30:03 +02:00
Jo-Philipp Wich
7ba4eb1a42 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>
2018-07-23 14:27:49 +02:00
Jo-Philipp Wich
2287e79a5c luci-theme-openwrt: add styling for input-adjacent buttons
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-23 14:26:56 +02:00
Jo-Philipp Wich
1961ce6df3
Merge pull request #1986 from dibdot/adblock
luci-app-adblock: fix translations
2018-07-22 22:37:01 +02:00
Dirk Brenken
8d7ebf0572 luci-app-adblock: fix translations
* fix runtime & button translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22 22:28:26 +02:00
Jo-Philipp Wich
4105c78ff9 luci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-22 18:25:04 +02:00
Jo-Philipp Wich
1602313f5c 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>
2018-07-22 18:17:58 +02:00
Jo-Philipp Wich
e987c7e069
Merge pull request #1982 from Rixerx/master
luci-base: update Polish translation
2018-07-22 17:47:01 +02:00
Jo-Philipp Wich
83c86d2934
Merge pull request #1983 from dibdot/adblock
luci-app-adblock: sync with adblock 3.5.4
2018-07-22 17:46:04 +02:00
Jo-Philipp Wich
e3f76c255a 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>
2018-07-22 17:45:03 +02:00
Jo-Philipp Wich
8e0ee137a6 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>
2018-07-22 17:45:03 +02:00
Dirk Brenken
5db2b76497 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>
2018-07-22 08:58:33 +02:00
Krystian Kozak
a900d61d91 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
2018-07-21 21:56:50 +02:00
Jo-Philipp Wich
a8a5b2feb2
Merge pull request #1981 from hanipouspilot/ncm
luci-proto-ncm: remove unrelated options
2018-07-21 21:36:07 +02:00
Dmitry Tunin
6d03051e95 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>
2018-07-21 22:14:51 +03:00
Jo-Philipp Wich
45816e8410
Merge pull request #1980 from hanipouspilot/ncm-addpdp
luci-proto-ncm: add pdptype option
2018-07-21 19:02:47 +02:00
Dmitry Tunin
58fd0749de luci-proto-ncm: add pdptype option
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
2018-07-21 19:40:21 +03:00
Jo-Philipp Wich
e4a86478e6 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>
2018-07-21 14:19:41 +02:00
Jo-Philipp Wich
84f0b62bc8
Merge pull request #1978 from tano-systems/luci-base-fix-russian-translation
luci-base: fix Russian translation
2018-07-21 10:14:24 +02:00
Jo-Philipp Wich
66bdb07431
Merge pull request #1975 from Olim98/patch-2
luci-app-upnp: update Russian translation
2018-07-21 10:13:53 +02:00
Jo-Philipp Wich
422b04c2e0
Merge pull request #1974 from Olim98/patch-1
luci-app-adblock: fix and update Russian translation
2018-07-21 10:13:17 +02:00
Jo-Philipp Wich
c67aec622b
Merge pull request #1976 from stangri/luci-app-simple-adblock
luci-app-simple-adblock: remove extra controller file
2018-07-21 10:12:59 +02:00
Anton Kikin
bf6275c85e luci-base: fix Russian translation
More correct translation of the 'instance'.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
2018-07-21 11:12:17 +03:00