Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12151 commits 13 branches 13 tags 306 MiB
Commit graph

12151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jo-Philipp Wich
9ca48ecc93 luci-base: ui.js: ensure that select choice labels are properly escaped 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 71d370a964)
 2019-12-04 18:07:26 +01:00
Jo-Philipp Wich
4193a20d5e luci-base: ui.js: properly escape dynlist items for rendering 
Ref: https://forum.openwrt.org/t/luci-theme-openwrt-reports-error/49736
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ee36066947)
 2019-12-04 16:09:52 +01:00
Florian Eckert
039ef1f4de luci-app-statistics: update misleading load view 
Fixes: #3301

During my tests and developing with the collectd and so
luci-app-statistics I noticed that the values displayed in the Y-axis
are misleading, because probably the individual values are added
together in each case. So the view is not corrected.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

(cherry picked from commit b50974a20c)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2019-11-30 19:30:23 +02:00
Hannu Nyman
5a425b4550 i18n: sync translations 
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2019-11-30 11:25:11 +02:00
Florian Eckert
3e90684fbf
Merge pull request #3367 from stangri/19.07-luci-app-advanced-reboot 
luci-app-advanced-reboot: better information for snapshots
 2019-11-28 07:25:10 +01:00
Stan Grishin
a07cb78a47 luci-app-advanced-reboot: better information for snapshots 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-27 08:32:30 -07:00
Jo-Philipp Wich
a68c89cfcf luci-base: luci.js: further nested Class.super() call fixes 
Use stacks keyed by class id + symbol internally to not clobber the
prototype scope pointer when repeatedly calling super() in invoked
methods.

Ref: https://github.com/openwrt/luci/issues/3316#issuecomment-558531111
Fixes: 374c23cda ("luci-base: luci.js: properly handle nested Class.super() calls")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4a08fdd2d3)
 2019-11-26 11:39:50 +01:00
Jo-Philipp Wich
3ad8ef4eda luci-base: luci.js: properly handle nested Class.super() calls 
Introduce a unique __id__ attribute per class and use that, together with
the symbol name being looked up to, to form a unique key which is used to
store the prototype scope pointer.

This fixes cases where a call to super() invokes a procedure which is
calling super() as well on a different class or symbol.

Fixes: #3316
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 374c23cdab)
 2019-11-26 09:42:28 +01:00
Jo-Philipp Wich
819e67f6bf
Merge pull request #3359 from Andy2244/luci-app-cifsd_fix-defaults_19.07 
luci-app-cifsd: fix defaults (none writeable default shares) [19.07]
 2019-11-25 16:00:13 +01:00
Jo-Philipp Wich
e4d15b76bf
Merge pull request #3361 from Andy2244/luci-app-samba4_fix-defaults_19.07 
luci-app-samba4: fix defaults (none writeable default shares) [19.07]
 2019-11-25 15:58:54 +01:00
Andy Walsh
3085435bcd luci-app-samba4: fix defaults (none writeable default shares) 
* align defaults with upstream
* mark our default UCI changes and enforce updates to config

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2019-11-25 15:10:29 +01:00
Andy Walsh
006d65595b luci-app-cifsd: fix defaults (none writeable default shares) 
* align defaults with upstream
* mark our default UCI changes and enforce updates to config

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2019-11-25 15:07:11 +01:00
Jo-Philipp Wich
179c5e8cf9
Merge pull request #3346 from Andy2244/luci-app-samba4_switch-js-api_19.07 
uci-app-samba4: switch to luci static javascript api [19.07]
 2019-11-22 18:09:11 +01:00
Jo-Philipp Wich
5677e59329
Merge pull request #3339 from Andy2244/cifsd-19.07 
luci-app-cifsd: enable cifsd app [19.07]
 2019-11-22 18:08:17 +01:00
Andy Walsh
cbd4f4f11c uci-app-samba4: switch to luci static javascript api 
* switch to luci static javascript api
* add version info
* remove 'home' option
* regenerate translations

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2019-11-22 14:20:33 +01:00
Andy Walsh
651be92ba6 luci-app-cifsd: enable cifsd app 
* enable luci cifsd app
* add version info
* enable guest ok default
* refresh translations

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2019-11-22 12:46:12 +01:00
Jo-Philipp Wich
4e6c3a0b96 luci-base: luci.js: add optional apply unchecked action 
Turn the "Save & Apply" button into a combo button which allows to
toggle between apply with rollback and unchecked apply modes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3b3a1d9cc9)
 2019-11-22 09:20:37 +01:00
Jo-Philipp Wich
402d06d40f themes: add necessary styles for ComboButton 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3a82faf21a)
 2019-11-22 09:20:33 +01:00
Jo-Philipp Wich
4b72056f9b luci-base: ui.js: add ComboButton widget 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 97a3bef84b)
 2019-11-22 09:20:29 +01:00
Jo-Philipp Wich
d7810e7650 luci-theme-bootstrap: allow textarea resizing 
Fixes: #3317
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8672ddcf0b)
 2019-11-22 09:17:22 +01:00
Jo-Philipp Wich
bc5c197411 luci-app-firewall: remove obsolete "conntrack" option 
Fixes: #3342
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6e56e67e8)
 2019-11-22 08:50:56 +01:00
Jo-Philipp Wich
0a58281a33 luci-base: validation.js: fix "unique" validator 
Previous refactoring renamed the "data-type" attribute of widget markup
containers to "data-widget", breaking the "unique" validator as it relies
on it to lookup options.

Fixes: #3341
Fixes: 13e9e3e9e ("treewide: fix "Unhandled token" errors with Lua CBI maps")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4f0d67a289)
 2019-11-22 08:44:41 +01:00
Hannu Nyman
c0b9fbbd9a
Merge pull request #3337 from stangri/19.07-luci-app-advanced-reboot 
[19.07] luci-app-advanced-reboot: add logger messages, README update
 2019-11-20 08:24:39 +02:00
Stan Grishin
5fb77b9223 luci-app-advanced-reboot: add logger messages, README update 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-19 16:55:37 -07:00
Hannu Nyman
b23c9002a5
Merge pull request #3334 from stangri/19.07-luci-app-advanced-reboot 
[19.07] luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors
 2019-11-19 19:29:47 +02:00
Stan Grishin
d1f8344687 luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-19 09:54:21 -07:00
Florian Eckert
ee617239f5
Merge pull request #3330 from stangri/19.07-luci-app-vpnbypass 
luci-app-vpnbypass: use VPN node by default
 2019-11-19 08:37:08 +01:00
Stan Grishin
af3cc252b4 luci-app-vpnbypass: use VPN node by default 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-18 16:02:14 -07:00
Hannu Nyman
3eeb6dea73
Merge pull request #3322 from rs/feature_nextdns-19.07 
luci-app-nextdns: add luci integration for nextdns package
 2019-11-17 12:42:43 +02:00
Olivier Poitrey
1ef780af19 luci-app-nextdns: add luci integration for nextdns package 
Signed-off-by: Olivier Poitrey <rs@nextdns.io>
 2019-11-16 16:40:58 -08:00
Jo-Philipp Wich
2390e72976 treewide: fix "Unhandled token" errors with Lua CBI maps 
The `data-type` attribute is used to bind datatype validators to a widget
while some templates used the same attribute to denote the name of the
underlying widget.

Change the `data-type` attributes referring to the widget name to
`data-widget` in order to stop the JS token error spam.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 13e9e3e9e8)
 2019-11-16 18:26:27 +01:00
Hannu Nyman
bc716e4973
Merge pull request #3296 from stangri/19.07-luci-app-https_dns_proxy 
[19.07] luci-app-https_dns_proxy: remove dnsmasq integration, better service controls, providers as plugins, misc fixes
 2019-11-16 11:32:32 +02:00
Hannu Nyman
a0aceb1e3e
Merge pull request #3312 from stangri/19.07-luci-app-advanced-reboot 
luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers
 2019-11-16 11:22:36 +02:00
Stan Grishin
5589dba07a luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-15 16:41:58 -07:00
Jo-Philipp Wich
7fd017d83d luci-mod-status: ensure comment escaping in iptables status output 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b3ef7a17ea)
 2019-11-15 18:52:47 +01:00
Jo-Philipp Wich
00ba89bb9f luci-mod-status: display secondary lease IPv6 addresses if available 
Ref: https://forum.openwrt.org/t/luci-not-showing-2nd-ipv6-address/48271
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b03ee4a097)
 2019-11-14 13:50:16 +01:00
Jo-Philipp Wich
3acf072a57 rpcd-mod-luci: bump version 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 956fd4a579)
 2019-11-14 13:50:16 +01:00
Jo-Philipp Wich
8a6cf56277 rpcd-mod-luci: handle multiple IPv6 addresses per lease 
Ref: https://forum.openwrt.org/t/luci-not-showing-2nd-ipv6-address/48271
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 824cb65840)
 2019-11-14 13:50:16 +01:00
Jo-Philipp Wich
78a1ff681e luci-app-statistics: iwinfo: fix interface list preselection 
Fixes: #3306
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 52a68a43b8)
 2019-11-14 11:16:00 +01:00
Jo-Philipp Wich
5cb5ed3834 luci-compat: network.lua: recognize wifi interfaces with nonstandard names 
Ref: https://github.com/openwrt/luci/issues/3306
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 857cd8c7fa)
 2019-11-14 11:16:00 +01:00
Jo-Philipp Wich
e82e3d8f2c luci-mod-status: fix free swap calculation 
Fixes: #3295
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 80c9b6fee0)
 2019-11-14 09:31:10 +01:00
Jo-Philipp Wich
ebd354d420 luci-base: network.js: fix getDevices() 
- Don't filter virtual interfaces
 - Skip duplicate wireless devices

Fixes: #3304
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 304dd37e3f)
 2019-11-13 18:37:11 +01:00
Jo-Philipp Wich
9d6b01974e luci-app-nlbwon: fix parsing relative interval values from config 
Fixes: #3302
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2e8aa301aa)
 2019-11-13 17:09:59 +01:00
Jo-Philipp Wich
640f26238c luci-mod-system: sshkeys.js: do not incorrectly filter ecdsa keys on load 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a3ea891b7e)
 2019-11-13 16:56:48 +01:00
Jo-Philipp Wich
ccd7dd5236 luci-proto-modemmanager: mark as broken 
Fixes: #3299
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2019-11-13 14:45:27 +01:00
Stan Grishin
2f3d33f3fb luci-app-https_dns_proxy: remove dnsmasq integration, better service controls, providers as plugins, misc fixes 
Signed-off-by: Stan Grishin <stangri@melmac.net>
 2019-11-13 04:26:06 -07:00
Jo-Philipp Wich
bd1e6d65a2 luci-lib-jsonc: store large JSON integer values as Lua doubles 
Fixes: #3293
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8da8f38bf9)
 2019-11-13 09:12:08 +01:00
Jo-Philipp Wich
01fd1245f9 luci-app-cifsd: mark as broken 
Fixes: #3294
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2019-11-13 08:49:07 +01:00
Jo-Philipp Wich
eb918b3313 luci-mod-status: fix graph rendering with XHTML themes 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 95bfb3f363)
 2019-11-12 11:53:08 +01:00
Jo-Philipp Wich
ae61ecb6be luci-mod-system: leds.js: display default state as On/Off 
Fixes: #3289
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0731f7e5e4)
 2019-11-11 10:15:49 +01:00