Commit graph

11974 commits

Author SHA1 Message Date
Jo-Philipp Wich
71c80a03ce luci-app-firewall: fix zone network default
When a `config zone` section lacks an `option network` or `list network`
setting, its contained interface list defaults to the name of the zone,
e.g. a zone named `foo` will implicitely contain the network `foo` unless
a deviating or empty `option network` is specified.

Adjust the zones.js model accordingly to reflect that implicit default.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d60a1a13b0)
2020-01-04 18:49:10 +01:00
Hannu Nyman
fe96439b4c
Merge pull request #3456 from stangri/19.07-luci-app-vpn-policy-routing
luci-app-vpn-policy-routing: add note about default routing
2020-01-03 08:51:46 +02:00
Stan Grishin
42e4a23deb luci-app-vpn-policy-routing: add note about default routing
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-01-02 21:14:34 -07:00
Hannu Nyman
a44e6b3572
Merge pull request #3447 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: initial release
2019-12-31 17:23:35 +02:00
Stan Grishin
6accb3f418 luci-app-vpn-policy-routing: initial release
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-12-30 07:51:55 -07:00
Jo-Philipp Wich
00397cd8a4 luci-app-firewall: update rule ip hints based on address family
Fixes: #3119
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d07cfba160)
2019-12-30 14:52:27 +01:00
Jo-Philipp Wich
344609e9ee luci-base: form.js: implement AbstractValue.getUIElement()
Introduce a new method `getUIElement()` which simplifies obtaining the
underlying per-section UI widget class instance for a from option object.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9e25917432)
2019-12-30 14:52:27 +01:00
Jo-Philipp Wich
b440eafb69 luci-base: ui.js: implement UIDropdown.{add,clear}Choices()
The new `addChoices()` and `clearChoices()` functions allow clearing and
adding new options to existing dropdown instances respectively.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b0836b037e)
2019-12-30 14:52:27 +01:00
Jo-Philipp Wich
bb07c50f5e luci-base: ui.js: expose UIElement class as AbstractElement
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0d0a3f4d0d)
2019-12-30 14:52:27 +01:00
Jo-Philipp Wich
204dad502b
Merge pull request #3439 from urbalazs/translation-backport-19.07-20191227
i18n: backport translations from master branch
2019-12-30 10:38:45 +01:00
Jo-Philipp Wich
6f8a3452f8 luci-app-firewall: store week- and monthday restrictions as strings
Fixes: FS#2661
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2661
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 18c60968dc)
2019-12-30 00:09:29 +01:00
Balázs Úr
ed6820abc6 i18n: backport translations from master branch
Signed-off-by: Balázs Úr <balazs@urbalazs.hu>
2019-12-27 17:49:40 +01:00
MartB
43c74d3a22 luci-theme-bootstrap: fix background of large modal overlays.
Signed-off-by: MartB <mart.b@outlook.de>
(cherry picked from commit 7f9eb4638b)
2019-12-22 23:20:04 +01:00
Hannu Nyman
9cbc4fb7fa i18n: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-12-20 08:49:14 +02:00
Hannu Nyman
637955c817
Merge pull request #3422 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: package name change, support for RFC8484 binary
2019-12-19 20:52:57 +02:00
Stan Grishin
4fd24073aa luci-app-https-dns-proxy: package name change, support for RFC8484 binary
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-12-19 11:43:11 -07:00
Nikos Mavrogiannopoulos
391258f4f6 ocserv: fix the public key ID calculation
New versions of certtool change its output format and thus break
the previous parsing. This update works with certtool 3.5.x or later.
It also restricts the output to valid values for openconnect 7.x or
later for simplification.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
(cherry picked from commit c81ca8dae3)
2019-12-16 18:15:14 +01:00
Jo-Philipp Wich
6aeda9c4c8 luci-mod-network: dhcp.js: fix default state of nonwildcard
Fixes: #3415
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ffe81aead3)
2019-12-16 18:06:03 +01:00
Jo-Philipp Wich
9c88db57fe luci-mod-network: fix rebind list validation
Fixes: 62e28f4b0 ("luci-mod-network: dhcp.js: fix address and rebind list validation")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3cdd496946)
2019-12-16 18:02:11 +01:00
Jo-Philipp Wich
17a7fb7775 luci-mod-network: dhcp.js: fix address and rebind list validation
Fixes: #3130
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 62e28f4b0a)
2019-12-16 17:52:13 +01:00
Jo-Philipp Wich
ddc89b418b luci-mod-network: re-add DHCPv6 lease status to dnsmasq page
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2674
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6410361c8)
2019-12-16 17:40:32 +01:00
Jo-Philipp Wich
af5d665a70 luci-lib-httpclient: accept scoped IPv6 addresses
Ref: https://github.com/openwrt/luci/issues/3380
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d87169c0f6)
2019-12-10 12:32:06 +01:00
Jo-Philipp Wich
1d2b4c777f luci-lib-ip: support scoped IPv6 addresses
Ref: https://github.com/openwrt/luci/issues/3380
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f7a7f89e0c)
2019-12-10 12:31:57 +01:00
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