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

12062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jo-Philipp Wich
13dd17fca1 treewide: merge master translations 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-02-26 16:20:19 +01:00
Jo-Philipp Wich
98ca75e918 luci-app-opkg: gracefully handle empty config files 
Fixes: #3668
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 562425605a)
 2020-02-23 21:16:59 +01:00
Jo-Philipp Wich
02c68f2838 luci-mod-status: hide DHCP status if dnsmasq/odhcpd aren't present 
Fixes: #3674
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4efc7cbbda)
 2020-02-23 21:14:10 +01:00
Jo-Philipp Wich
087e6acbf4 luci-app-firewall: snats.js: fix rewrite IP validation for SNAT target 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d527c28ffa)
 2020-02-22 22:20:40 +01:00
Jo-Philipp Wich
657407f927 treewide: resync and backport translations 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-02-21 22:22:17 +01:00
Jo-Philipp Wich
62be6eff08 luci-mod-network: wifi join: allow reclaiming empty wwan networks 
Fixes: #3660
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 48e18fb8ac)
 2020-02-21 22:20:07 +01:00
Jo-Philipp Wich
4c8f0cdcc8 luci-mod-network: wifi join: add option to lock bssid 
Fixes: #3661
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7ec007f926)
 2020-02-21 22:20:07 +01:00
Jo-Philipp Wich
29c29a6b44 luci-mod-network: wifi scan: add button to start/stop refreshes 
Fixes: #3662
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a2fe3d9fc4)
 2020-02-21 22:20:07 +01:00
Jo-Philipp Wich
da80dcc407 luci-mod-network: explicitely configure "none" encryption in wifi join 
Fixes: #3663
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9b024767d7)
 2020-02-21 22:20:07 +01:00
Jo-Philipp Wich
85a6f07455 luci-mod-network, luci-mod-status: harmonize wifi signal indicators 
Fixes: #3636
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2cad20e7ea)
 2020-02-17 09:54:45 +01:00
Jo-Philipp Wich
4dea7aedd8
Merge pull request #3622 from Andy2244/luci-app-ksmbd_new-UCI-(19.07) 
[19.07] luci-app-ksmbd: support new UCI option, update for 3.2.1 version
 2020-02-17 08:52:27 +01:00
Andy Walsh
b80daa1ab9 luci-app-ksmbd: support new UCI option "allow_legacy_protocols" 
* support new UCI option "allow_legacy_protocols"

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2020-02-15 17:19:17 +01:00
Andy Walsh
bd38c30a37 luci-app-ksmbd: update for 3.2.1 version (usmbd -> ksmbd.mountd) 
* update for 3.2.1 version (usmbd -> ksmbd.mountd)

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2020-02-15 17:16:17 +01:00
Florian Eckert
0da47ff5c8
Merge pull request #3621 from Andy2244/luci-app-samba4_new-UCI-(19.07) 
[19.07] luci-app-samba4: add support for new UCI option
 2020-02-15 17:04:46 +01:00
Andy Walsh
c09e276391 luci-app-samba4: add support for new UCI option 
* add support for new UCI option "allow_legacy_protocols"

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
 2020-02-15 16:36:25 +01:00
Jo-Philipp Wich
49999e9879 luci-base: cbi.js: avoid double-initialization of dropdowns 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9ae1f47896)
 2020-02-14 08:46:38 +01:00
Jo-Philipp Wich
69445fa25f luci-base: luci.js: L.dom.data(): gracefully handle non-node argument 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 308215ca15)
 2020-02-14 08:46:17 +01:00
Jo-Philipp Wich
2665c5fef8 treewide: merge master translation updates 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-02-14 08:27:50 +01:00
Jo-Philipp Wich
1fdef8cb68 luci-base: form.js: pass section_id to Button onclick handler 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c1aeb300f6)
 2020-02-13 19:31:34 +01:00
Jo-Philipp Wich
405f5e837f luci-base: form.js: ButtonValue: pass sid as first onclick argument 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 311bcd4b5c)
 2020-02-13 19:31:34 +01:00
Jo-Philipp Wich
920433457d rpcd-mod-luci: honour dhcp leases without ip address for host hints 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3702e13f54)
 2020-02-13 19:31:34 +01:00
Jo-Philipp Wich
2910f6e6b8 luci-base: extend rollback timeout to 90 seconds 
Ref: #3628
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 81cf99a507)
 2020-02-13 19:28:38 +01:00
Jo-Philipp Wich
8b1683524c luci-lib-ip: explicitly clear scope when allocating new userdata 
Fixes: #3609
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c2eeb09bd9)
 2020-02-08 11:04:29 +01:00
Jo-Philipp Wich
1592197874 luci-base: validation.js: fix integer and float type validation 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 187bef9f6c)
 2020-01-31 17:28:05 +01:00
Jo-Philipp Wich
4f50a4fa83 luci-mod-network: dhcp.js: fix resolvefile option depends 
Ref: https://forum.openwrt.org/t/resolvfile-option-not-showing/54229
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5d15363408)
 2020-01-31 11:20:41 +01:00
Jo-Philipp Wich
66213ef617 luci-app-advanced-reboot: fix faulty ip.new() invocation 
Ref: https://github.com/openwrt/luci/issues/3587#issuecomment-580044459
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6638de5f62)
 2020-01-30 08:33:03 +01:00
Jo-Philipp Wich
adbbd5cf69 treewide: switch to bcp47 language codes 
Fixes: #3477
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 48749ca873)
 2020-01-29 13:42:14 +01:00
Jo-Philipp Wich
19a48f6449 luci-app-advanced-reboot: properly handle multiple or missing lan IPs 
Fixes: #3587
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0a07d53594)
 2020-01-29 09:41:40 +01:00
Jo-Philipp Wich
5879390cd1 luci-base: add another magic security attribute to the sysauth cookie 
Fixes: #3585
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 885c97da53)
 2020-01-29 09:19:28 +01:00
Jo-Philipp Wich
3f5a67b62e luci-mod-system: fix zram compression placeholder 
Fixes: #3583
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8f65c340c)
 2020-01-29 09:19:28 +01:00
Jo-Philipp Wich
8e2088f8d4 luci-base: make swconfig port state parsing more robust 
Since swconfig output varies wildly among different switch drivers, rely
on a simpler more robust parsing approach to find the required information.

Ref: https://forum.openwrt.org/t/cannot-read-property-link/50766
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6d59a6400e)
 2020-01-29 09:19:28 +01:00
Jo-Philipp Wich
84e23d96b4 luci-mod-network: handle missing switch port state information 
Ref: https://github.com/openwrt/luci/issues/3565
Ref: https://forum.openwrt.org/t/cannot-read-property-link/50766
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 616d44c155)
 2020-01-29 09:19:28 +01:00
Jo-Philipp Wich
42004be7dd treewide: sync and merge master translations 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-01-29 08:47:34 +01:00
Jo-Philipp Wich
ea3624bee9 build: add script to merge master translation into branches 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cab574958c)
 2020-01-29 08:40:39 +01:00
Jo-Philipp Wich
529d6b7268 build: i18n-scan.pl: use xgettext to extract message strings 
Using xgettext has a few benefits compared to the previous perl extraction
approach. The xgettext utility is able to properly distinguish commented
from uncommented code and it is able handle concatenated constant
expressions such as `_("Some " + "string")`.

A further benefit is the ability to extract translations with disambiguation
contexts and plural translation calls.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 901a0821f6)
 2020-01-29 08:33:37 +01:00
Jo-Philipp Wich
e578ff9b1c build: i18n-scan.pl: support extracting translations from menu json 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9f9358c3e2)
 2020-01-29 08:33:34 +01:00
Jo-Philipp Wich
3f1784fba7 luci-proto-openconnect: explicitely escape slashes in regex literals 
The unespaced slashes confuse xgettext and likely other source
scanners as well.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c43fa199bf)
 2020-01-29 08:30:51 +01:00
Jo-Philipp Wich
c1405dd9c3 luci-proto-wireguard: explicitely escape slashes in regex literals 
The unespaced slashes confuse xgettext and likely other source
scanners as well.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1c89c103b)
 2020-01-29 08:30:51 +01:00
Jo-Philipp Wich
02b0c51844 luci-app-firewall: fix variable clash leading to incorrect family display 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9fd7e9fc23)
 2020-01-28 18:34:41 +01:00
Jo-Philipp Wich
a2e9e45c6d luci-app-firewall: add SNAT config migration 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit f1771d14aa)
 2020-01-28 18:34:34 +01:00
Jo-Philipp Wich
03a8ea4edb luci-app-firewall: rework rule descriptions, deduplicate code 
Use a simple custom format string DSL to assemble the rule description
texts in the overview page.

Also move common code for shared, complex cbi options to the firewall
tool class.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 7944b0a90b)
 2020-01-28 18:34:01 +01:00
Jo-Philipp Wich
3b60ada020 luci-app-firewall: consolidate duplicate option code 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 0608ff09f8)
 2020-01-28 18:33:05 +01:00
Jo-Philipp Wich
65e71b94e3 luci-app-firewall: support 'limit' and 'limit_burst' options 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 28f4a9fced)
 2020-01-28 18:32:42 +01:00
Jo-Philipp Wich
8b46570283 luci-app-firewall: support 'DSCP' action and matches for rules 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit aa62419e5b)
 2020-01-28 18:31:22 +01:00
Jo-Philipp Wich
75dc12f56a luci-app-firewall: support 'MARK' action and matches for rules 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3c0fcf49d4)
 2020-01-28 18:31:22 +01:00
Jo-Philipp Wich
819079e268 luci-app-firewall: support 'mark' parameter for redirects 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cdf240f0a0)
 2020-01-28 18:30:40 +01:00
Jo-Philipp Wich
85dbdd03a3 luci-app-firewall: support 'helper' and 'reflection_src' parameters for redirects 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 61fe2146dd)
 2020-01-28 18:30:40 +01:00
Jo-Philipp Wich
4a2281814d luci-app-firewall: support 'helper' and 'set_helper' parameters for rules 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d601e79da5)
 2020-01-28 18:30:39 +01:00
Jo-Philipp Wich
c722cf3c46 luci-app-firewall: support 'direction' and 'device' parameters for rules 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 267085cf2d)
 2020-01-28 18:30:39 +01:00
Jo-Philipp Wich
f8265cefc7 luci-app-firewall: fix family display for port forwards 
The underlying fw3 program currently only does IPv4 port forwards while
LuCI incorrectly reports IPv4 + IPv6 for each forward. Adjust the text
accordingly to fix this.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a178cdb5cf)
 2020-01-28 18:30:39 +01:00