project/luci.git
5 years agoMerge pull request #2380 from dibdot/adblock
Dirk Brenken [Thu, 20 Dec 2018 07:51:35 +0000 (08:51 +0100)]
Merge pull request #2380 from dibdot/adblock

luci-app-adblock: sync with release 3.6.0

5 years agoluci-app-adblock: sync with release 3.6.0 2380/head
Dirk Brenken [Wed, 19 Dec 2018 16:33:29 +0000 (17:33 +0100)]
luci-app-adblock: sync with release 3.6.0

* add adblock dns query reporting via tcpdump (see readme for details)
* fix tld compression on low memory systems (< 64 MB)
* fix various small issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoMerge pull request #2381 from musashino205/l10n/base-upd-ja
Hannu Nyman [Wed, 19 Dec 2018 18:36:15 +0000 (20:36 +0200)]
Merge pull request #2381 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

5 years agoluci-base: update Japanese translation 2381/head
INAGAKI Hiroshi [Wed, 19 Dec 2018 18:01:24 +0000 (03:01 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoi18n: sync translations
INAGAKI Hiroshi [Wed, 19 Dec 2018 17:21:14 +0000 (02:21 +0900)]
i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoMerge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system
Jo-Philipp Wich [Wed, 19 Dec 2018 06:49:56 +0000 (07:49 +0100)]
Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system

luci-mod-system: add translation for led trigger names

5 years agoluci-theme-bootstrap: fix textarea height after CSS minification
Jo-Philipp Wich [Sun, 16 Dec 2018 14:08:05 +0000 (15:08 +0100)]
luci-theme-bootstrap: fix textarea height after CSS minification

Fixes #2378
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2377 from sotux/master-luci-app-aria2
Hannu Nyman [Sat, 15 Dec 2018 13:46:05 +0000 (15:46 +0200)]
Merge pull request #2377 from sotux/master-luci-app-aria2

luci-app-aria2: fix the log option

5 years agoluci-app-aria2: fix the log option 2377/head
Zheng Qian [Sat, 15 Dec 2018 13:38:40 +0000 (21:38 +0800)]
luci-app-aria2: fix the log option

According to the package aria2, the log option
is enable_logging, so fix this option name.

As luci-app-aria2 can't set custom log file dir,
the default log file is /var/log/aria2.log but not
in the config file dir.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoMerge pull request #2375 from sotux/master-luci-app-aria2
Jo-Philipp Wich [Fri, 14 Dec 2018 06:14:18 +0000 (07:14 +0100)]
Merge pull request #2375 from sotux/master-luci-app-aria2

luci-app-aria2: fix showRPCURL when using https

5 years agoluci-app-aria2: fix showRPCURL when using https 2375/head
Zheng Qian [Fri, 14 Dec 2018 05:32:18 +0000 (13:32 +0800)]
luci-app-aria2: fix showRPCURL when using https

if login luci-admin with https, RPC protocol should be https or wss.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-base: update Simplified Chinese translation
Zheng Qian [Fri, 14 Dec 2018 01:14:35 +0000 (09:14 +0800)]
luci-base: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-base: fix table compare upon writing ipaddr changes
Jo-Philipp Wich [Thu, 13 Dec 2018 11:14:37 +0000 (12:14 +0100)]
luci-base: fix table compare upon writing ipaddr changes

Fixes: b33192a03 ("luci-base: support cidr list notation for option ipaddr and ip6addr")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: properly option ipaddr in single cidr string notation as well
Jo-Philipp Wich [Thu, 13 Dec 2018 10:57:16 +0000 (11:57 +0100)]
luci-base: properly option ipaddr in single cidr string notation as well

When an interface configuration specifies both "option ipaddr 1.2.3.4/24"
and "option netmask", then netifd will ignore the netmask in favor to the
prefix encoded in the cidr string.

Support this variant as well by treating a sole cidr string value as
singöe-item cidr list.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: fix typo in german translation
Jo-Philipp Wich [Thu, 13 Dec 2018 10:44:17 +0000 (11:44 +0100)]
luci-base: fix typo in german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: update german translation
Jo-Philipp Wich [Thu, 13 Dec 2018 10:41:24 +0000 (11:41 +0100)]
luci-base: update german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: resync translation templates
Jo-Philipp Wich [Thu, 13 Dec 2018 10:36:35 +0000 (11:36 +0100)]
luci-base: resync translation templates

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: support cidr list notation for option ipaddr and ip6addr
Jo-Philipp Wich [Thu, 13 Dec 2018 10:31:50 +0000 (11:31 +0100)]
luci-base: support cidr list notation for option ipaddr and ip6addr

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: cbi.js: update deps on dynlist changes, honor placeholder
Jo-Philipp Wich [Thu, 13 Dec 2018 10:27:52 +0000 (11:27 +0100)]
luci-base: cbi.js: update deps on dynlist changes, honor placeholder

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo
Jo-Philipp Wich [Thu, 13 Dec 2018 07:26:44 +0000 (08:26 +0100)]
Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo

luci-app-openvpn: re-add options comp_lzo and comp_noadapt

5 years agoluci-app-openvpn: re-add options comp_lzo and comp_noadapt 2372/head
Martin Schiller [Thu, 13 Dec 2018 07:08:24 +0000 (08:08 +0100)]
luci-app-openvpn: re-add options comp_lzo and comp_noadapt

* re-add config option comp_lzo according to
  openwrt/openwrt@3850b41
* re-add config option comp_noadapt. This has never been removed
  from openwrt

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
5 years agocsstidy: update to latest Git head
Jo-Philipp Wich [Wed, 12 Dec 2018 15:24:59 +0000 (16:24 +0100)]
csstidy: update to latest Git head

33594b4 ("csstidy: do not dequote selector strings")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2369 from tano-systems/fix-changelog-mistake
Jo-Philipp Wich [Wed, 12 Dec 2018 09:47:06 +0000 (10:47 +0100)]
Merge pull request #2369 from tano-systems/fix-changelog-mistake

luci-base: fix UCI changelog markup mistake

5 years agobuild: add build option to minify *.css files
Jo-Philipp Wich [Wed, 12 Dec 2018 08:34:44 +0000 (09:34 +0100)]
build: add build option to minify *.css files

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agocontrib: add csstidy package
Jo-Philipp Wich [Wed, 12 Dec 2018 08:27:44 +0000 (09:27 +0100)]
contrib: add csstidy package

Package a fork of the CSSTidy C++ implementation for CSS minification
use in a later commit.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: fix UCI changelog markup mistake 2369/head
Anton Kikin [Tue, 11 Dec 2018 23:05:59 +0000 (02:05 +0300)]
luci-base: fix UCI changelog markup mistake

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
5 years agoMerge pull request #2361 from stokito/master
Hannu Nyman [Tue, 11 Dec 2018 16:39:40 +0000 (18:39 +0200)]
Merge pull request #2361 from stokito/master

CONTRIBUTING.md

5 years agoluci-app-nlbwmon: rewrite display section
Jo-Philipp Wich [Tue, 11 Dec 2018 10:49:41 +0000 (11:49 +0100)]
luci-app-nlbwmon: rewrite display section

 - Move CSS and JS code to external files
 - Use responsive table markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-lib-httpclient: prevent nil access with invalid IP address literals
Jo-Philipp Wich [Tue, 11 Dec 2018 08:17:42 +0000 (09:17 +0100)]
luci-lib-httpclient: prevent nil access with invalid IP address literals

Fixes: a54baf7be ("luci-lib-httpclient: revamp URL handling")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-lib-httpclient: revamp URL handling
Jo-Philipp Wich [Tue, 11 Dec 2018 07:57:36 +0000 (08:57 +0100)]
luci-lib-httpclient: revamp URL handling

 - Introduce a parse_url() helper which properly deals with literal IPv4
   and IPv6 host parts and returns the decomposed uri string as table
 - Properly format IPv6 literals in autogenerated Host headers
 - Omit default port numbers in Host headers and calculated redirect URLs.

Supersedes PR #2337.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2285 from dengqf6/luci-ssl-nginx
Jo-Philipp Wich [Tue, 11 Dec 2018 05:56:35 +0000 (06:56 +0100)]
Merge pull request #2285 from dengqf6/luci-ssl-nginx

luci-ssl-nginx: fix dependencies

5 years agoMerge pull request #2367 from yglb/master
Jo-Philipp Wich [Tue, 11 Dec 2018 05:55:22 +0000 (06:55 +0100)]
Merge pull request #2367 from yglb/master

luci-theme-rosy: Fixed insufficient container container width

5 years agoluci-base: fix syntax error in map.htm
Jo-Philipp Wich [Tue, 11 Dec 2018 05:54:09 +0000 (06:54 +0100)]
luci-base: fix syntax error in map.htm

Fixes #2366.
Fixes: 76e9c0305 ("luci-base: rework ui tabbing code")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-opkg: update Simplified Chinese translation
Zheng Qian [Mon, 10 Dec 2018 01:14:39 +0000 (09:14 +0800)]
luci-app-opkg: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-theme-rosy: Fixed insufficient container container width 2367/head
Yanlan Shen [Tue, 11 Dec 2018 02:43:45 +0000 (10:43 +0800)]
luci-theme-rosy: Fixed insufficient container container width

Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
5 years agoMerge pull request #2364 from tano-systems/split-status-page
Jo-Philipp Wich [Mon, 10 Dec 2018 17:41:40 +0000 (18:41 +0100)]
Merge pull request #2364 from tano-systems/split-status-page

luci-mod-status: split status page into a series of partials

5 years agoluci-mod-status: split status page into a series of partials 2364/head
Anton Kikin [Mon, 10 Dec 2018 16:56:42 +0000 (19:56 +0300)]
luci-mod-status: split status page into a series of partials

Split status page into a series of partials as discussed in PR #2359.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
5 years agoUpdate CONTRIBUTING.md 2361/head
Sergey Ponomarev [Mon, 10 Dec 2018 15:54:55 +0000 (17:54 +0200)]
Update CONTRIBUTING.md

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
5 years agoMerge pull request #2363 from sotux/master-luci-app-aria2
Jo-Philipp Wich [Mon, 10 Dec 2018 12:49:27 +0000 (13:49 +0100)]
Merge pull request #2363 from sotux/master-luci-app-aria2

luci-app-aria2: fix http/https protocol when opening aria2 webUI

5 years agoluci-theme-{freifunk-generic,material,rosy}: fixup tab CSS
Jo-Philipp Wich [Mon, 10 Dec 2018 12:40:49 +0000 (13:40 +0100)]
luci-theme-{freifunk-generic,material,rosy}: fixup tab CSS

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-radicale: refactor custom nsection template
Jo-Philipp Wich [Sun, 9 Dec 2018 19:10:15 +0000 (20:10 +0100)]
luci-app-radicale: refactor custom nsection template

Refactor the named section template shipped with luci-app-radicale to work
with the latest LuCI tabbing changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-theme-openwrt: add required CSS rules for new tabbing code
Jo-Philipp Wich [Fri, 7 Dec 2018 16:54:21 +0000 (17:54 +0100)]
luci-theme-openwrt: add required CSS rules for new tabbing code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-theme-bootstrap: add required CSS rules for new tabbing code
Jo-Philipp Wich [Fri, 7 Dec 2018 16:55:43 +0000 (17:55 +0100)]
luci-theme-bootstrap: add required CSS rules for new tabbing code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: rework ui tabbing code
Jo-Philipp Wich [Wed, 5 Dec 2018 07:48:35 +0000 (08:48 +0100)]
luci-base: rework ui tabbing code

 - Instantiate tab menus on the client side
 - Simplify server side markup generation
 - Show error indicators in cbi tabs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-theme-openwrt: style tweaks
Jo-Philipp Wich [Mon, 10 Dec 2018 10:49:05 +0000 (11:49 +0100)]
luci-theme-openwrt: style tweaks

 - Collapse table borders by default
 - Vertically align table cell content
 - Inherit font family and size for form widgets
 - Fix redundant horizontal padding for cell labels

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-theme-bootstrap: dynlist style tweak
Jo-Philipp Wich [Sun, 9 Dec 2018 19:13:22 +0000 (20:13 +0100)]
luci-theme-bootstrap: dynlist style tweak

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: luci.js: emit custom events for tooltip open/close actions
Jo-Philipp Wich [Fri, 7 Dec 2018 16:57:45 +0000 (17:57 +0100)]
luci-base: luci.js: emit custom events for tooltip open/close actions

The new `tooltip-open` and `tooltip-close` events allow other code to hook
into the tooltip div rendering, e.g. to populate it with custom markup.

Also ignore tooltip events originating from descendant elements while
we're at it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-mod-status: switch iptables_dump action to luci.sys.process.exec
Jo-Philipp Wich [Sun, 2 Dec 2018 19:15:34 +0000 (20:15 +0100)]
luci-mod-status: switch iptables_dump action to luci.sys.process.exec

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-aria2: fix http/https protocol when opening aria2 webUI 2363/head
Zheng Qian [Mon, 10 Dec 2018 09:45:55 +0000 (17:45 +0800)]
luci-app-aria2: fix http/https protocol when opening aria2 webUI

In the openWebUI function, the url is assumed as http protocol,
this will cause problem when we login luci-admin with https.

The variable localhostPath has already contained http/https
protocol, so we can use it directly and add the path of aria2
webUI.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoMerge pull request #2334 from yglb/master
Jo-Philipp Wich [Thu, 6 Dec 2018 23:12:18 +0000 (00:12 +0100)]
Merge pull request #2334 from yglb/master

luci-theme-rosy: Fix related bugs displayed on the page

5 years agoMerge pull request #2347 from shunjou/theme-material
Jo-Philipp Wich [Thu, 6 Dec 2018 23:10:59 +0000 (00:10 +0100)]
Merge pull request #2347 from shunjou/theme-material

luci-theme-material: partial style overhaul

5 years agoMerge pull request #2294 from pmelange/luci-app-olsr-cosmetic
Jo-Philipp Wich [Thu, 6 Dec 2018 20:22:54 +0000 (21:22 +0100)]
Merge pull request #2294 from pmelange/luci-app-olsr-cosmetic

luci-app-olsr: make cosmetic changes.

5 years agoluci-app-olsr: reenable the "auto refresh" feature 2294/head
pmelange [Sun, 18 Nov 2018 13:26:23 +0000 (14:26 +0100)]
luci-app-olsr: reenable the "auto refresh" feature

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-app-olsr change ccs style to use class "left" instead of "style=text-align:...
pmelange [Sat, 17 Nov 2018 22:40:37 +0000 (23:40 +0100)]
luci-app-olsr change ccs style to use class "left" instead of "style=text-align: left"

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-app-olsr: make cosmetic changes.
pmelange [Thu, 15 Nov 2018 13:55:42 +0000 (14:55 +0100)]
luci-app-olsr: make cosmetic changes.

modify the status tables so that then headers and columns align, values
left justified.

Additionally, add the openwrt style interface name to the interfaces table,
change huge  ETX numbers to 'infinate', and add the german translation for
'Selected'.

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-theme-material: make header logo link to main overview 2347/head
shunjou [Tue, 4 Dec 2018 19:21:32 +0000 (14:21 -0500)]
luci-theme-material: make header logo link to main overview

Signed-off-by: Shun Jou <shunjou@gmail.com>
5 years agoluci-theme-material: partial style overhaul
shunjou [Sat, 1 Dec 2018 18:00:16 +0000 (13:00 -0500)]
luci-theme-material: partial style overhaul

* Restore theme to near original style
* Properly declare variable fallbacks
* More consistent table and border styling
* Improve responsive design scaling
* Add static ripple effect to sidebar menu
* Style command output as terminal
* Comb coding style and widespread cleanup
* Various other improvements and fixes

Signed-off-by: Shun Jou <shunjou@gmail.com>
5 years agoluci-mod-system: add translation for trigger names 2350/head
Florian Eckert [Mon, 3 Dec 2018 15:34:30 +0000 (16:34 +0100)]
luci-mod-system: add translation for trigger names

Not every user knows which trigger does what. To make this clear, the
triggers are now translated with a short help text.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-theme-rosy: Modify the code for the progress bar of the overview interface 2334/head
Yanlan Shen [Mon, 3 Dec 2018 07:14:14 +0000 (15:14 +0800)]
luci-theme-rosy: Modify the code for the progress bar of the overview interface

Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
5 years agoluci-theme-rosy: Fixed bug with rounded corners and drop down boxes
Yanlan Shen [Thu, 29 Nov 2018 10:30:12 +0000 (18:30 +0800)]
luci-theme-rosy: Fixed bug with rounded corners and drop down boxes

Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
5 years agoluci-theme-rosy: Modify the color of the button's primary and secondary colors and...
Yanlan Shen [Tue, 27 Nov 2018 02:15:31 +0000 (10:15 +0800)]
luci-theme-rosy: Modify the color of the button's primary and secondary colors and the bug of the status-overview page.

Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
5 years agoluci-mod-system: fix IE10/Edge rendering quirk on SSH keys page
Jo-Philipp Wich [Sun, 2 Dec 2018 16:10:39 +0000 (17:10 +0100)]
luci-mod-system: fix IE10/Edge rendering quirk on SSH keys page

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap, luci-theme-openwrt: allow dynlist item content to wrap
Jo-Philipp Wich [Sun, 2 Dec 2018 15:57:24 +0000 (16:57 +0100)]
luci-theme-bootstrap, luci-theme-openwrt: allow dynlist item content to wrap

Very long values without whitespace can easily overflow the dynlist item
container, so allow the browser to forcibly break such lines.

Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: fix ReferenceError
Jo-Philipp Wich [Sun, 2 Dec 2018 13:40:05 +0000 (21:40 +0800)]
luci-base: fix ReferenceError

The showTooltip() and hideTooltip() functions have been moved to luci.js

Reported-by: brv phoenix <feixuekaka1@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-status: use -w flag when dumping iptables
Jo-Philipp Wich [Sun, 2 Dec 2018 13:29:53 +0000 (14:29 +0100)]
luci-mod-status: use -w flag when dumping iptables

Multiple iptables listing commands might be triggered in parallel due
to the XHR polling, so use the -w flag to wait for the lock to become
free.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #2344 from shunjou/theme-material
Jo-Philipp Wich [Thu, 29 Nov 2018 09:37:45 +0000 (10:37 +0100)]
Merge pull request #2344 from shunjou/theme-material

luci-theme-material: minor changes

6 years agoluci-theme-material: optimize brand logo 2344/head
shunjou [Thu, 29 Nov 2018 09:10:38 +0000 (04:10 -0500)]
luci-theme-material: optimize brand logo

Signed-off-by: Shun Jou <shunjou@gmail.com>
6 years agoluci-theme-material: remove obsolete header info
shunjou [Thu, 29 Nov 2018 09:03:20 +0000 (04:03 -0500)]
luci-theme-material: remove obsolete header info

Signed-off-by: Shun Jou <shunjou@gmail.com>
6 years agoMerge pull request #2342 from dibdot/fw
Dirk Brenken [Wed, 28 Nov 2018 12:59:30 +0000 (13:59 +0100)]
Merge pull request #2342 from dibdot/fw

luci-app-firewall: remove hinting

6 years agoluci-app-firewall: remove hinting 2342/head
Dirk Brenken [Wed, 28 Nov 2018 12:55:42 +0000 (13:55 +0100)]
luci-app-firewall: remove hinting

Remove firewall hinting as discussed in #2340

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #2341 from brvphoenix/luci-theme-material
Jo-Philipp Wich [Wed, 28 Nov 2018 12:39:49 +0000 (13:39 +0100)]
Merge pull request #2341 from brvphoenix/luci-theme-material

luci-theme-material: add the missing modal/progressbar rules.

6 years agoluci-theme-material: add the missing modal/progressbar rules. 2341/head
brv phoenix [Wed, 28 Nov 2018 11:27:46 +0000 (19:27 +0800)]
luci-theme-material: add the missing modal/progressbar rules.

Signed-off-by: brv phoenix <feixuekaka1@gmail.com>
6 years agoMerge pull request #2329 from TDT-AG/pr/20181123-luci-theme-material
Jo-Philipp Wich [Tue, 27 Nov 2018 22:46:08 +0000 (23:46 +0100)]
Merge pull request #2329 from TDT-AG/pr/20181123-luci-theme-material

luci-theme-material: add missing css cbi-section-error definitions

6 years agoMerge pull request #2335 from shunjou/material-favicon
Jo-Philipp Wich [Tue, 27 Nov 2018 22:44:24 +0000 (23:44 +0100)]
Merge pull request #2335 from shunjou/material-favicon

luci-theme-material: add new favicon

6 years agoMerge pull request #2309 from rbalik/patch-1
Jo-Philipp Wich [Tue, 27 Nov 2018 22:43:23 +0000 (23:43 +0100)]
Merge pull request #2309 from rbalik/patch-1

luci-mod-network: Add DAE settings to security tab

6 years agoMerge pull request #2336 from TDT-AG/pr/20181127-luci-app-openvpn
Jo-Philipp Wich [Tue, 27 Nov 2018 14:28:05 +0000 (15:28 +0100)]
Merge pull request #2336 from TDT-AG/pr/20181127-luci-app-openvpn

luci-app-openvpn: Add missing config options

6 years agoluci-base: dispatcher: use consistent ordering
Jo-Philipp Wich [Tue, 27 Nov 2018 14:23:41 +0000 (15:23 +0100)]
luci-base: dispatcher: use consistent ordering

Use the same ordering logic for building the dispatch tree and for
querying the children of a given node.

Fixes #2338.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: dispatcher: remove tree modifier support
Jo-Philipp Wich [Tue, 27 Nov 2018 13:46:55 +0000 (14:46 +0100)]
luci-base: dispatcher: remove tree modifier support

This feature was never used, is hardly documented and appears to be
designed to fiddle with the internal dispatch tree state.

Given that, simply drop the related code to simplify the dispatcher
class somewhat.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: allow tabmenus to wrap (#2333)
Jo-Philipp Wich [Tue, 27 Nov 2018 12:57:32 +0000 (13:57 +0100)]
luci-theme-bootstrap: allow tabmenus to wrap (#2333)

Allow the tab menu line to wrap around on narrow screens to fix the issue
reported in PR #2333.

Also add the .nowrap utility class to the Bootstrap theme while we're
touching it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-openvpn: add missing ncp_ciphers option 2336/head
Florian Eckert [Mon, 26 Nov 2018 14:43:08 +0000 (15:43 +0100)]
luci-app-openvpn: add missing ncp_ciphers option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-openvpn: add missing verify_client_cert option
Florian Eckert [Mon, 26 Nov 2018 14:13:24 +0000 (15:13 +0100)]
luci-app-openvpn: add missing verify_client_cert option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-openvpn: add missing compress option
Florian Eckert [Mon, 26 Nov 2018 12:08:02 +0000 (13:08 +0100)]
luci-app-openvpn: add missing compress option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-openvpn: predefining the dropdown for the cipher option
Florian Eckert [Mon, 26 Nov 2018 13:31:52 +0000 (14:31 +0100)]
luci-app-openvpn: predefining the dropdown for the cipher option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-openvpn: add missing ncp_disable option
Florian Eckert [Mon, 26 Nov 2018 13:04:42 +0000 (14:04 +0100)]
luci-app-openvpn: add missing ncp_disable option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-openvpn: add missing allow_recursive_routing option
Florian Eckert [Mon, 26 Nov 2018 12:41:40 +0000 (13:41 +0100)]
luci-app-openvpn: add missing allow_recursive_routing option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-theme-material: add new favicon 2335/head
shunjou [Tue, 27 Nov 2018 02:31:30 +0000 (21:31 -0500)]
luci-theme-material: add new favicon

Also remove logo.png as it is unused.

Signed-off-by: Shun Jou <shunjou@gmail.com>
6 years agoMerge pull request #2331 from dibdot/ovpn
Dirk Brenken [Mon, 26 Nov 2018 14:21:42 +0000 (15:21 +0100)]
Merge pull request #2331 from dibdot/ovpn

luci-app-openvpn: "final" changeset

6 years agoluci-app-openvpn: "final" changeset 2331/head
Dirk Brenken [Sat, 24 Nov 2018 15:33:54 +0000 (16:33 +0100)]
luci-app-openvpn: "final" changeset

* add 'auth-user-pass' edit section in file mode (see screenshot)
* add port & protocol detection in file mode (see screenshot)
* don't mix file & normal edit modes any longer
* add CC compatibility fix (for turris devices)
* fix/refine JS instance name filter
* remove needless CSS rules
* unlink ovpn/auth files on section removal
* commit changes instantly (Add/Upload/Delete)

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-mod-network: adapt to current 802.11r defaults
Hannu Nyman [Sun, 25 Nov 2018 06:48:16 +0000 (08:48 +0200)]
luci-mod-network: adapt to current 802.11r defaults

The default for 802.11r option ft_psk_generate_local
was changed a few months ago by openwrt/openwrt@3cc56a5

That change was a bit awkward, as it made hostapd to
overlook the possibly existing r0kh values by default
unless the user explicitly disables the new default.

Adapt LuCI by changing the default for ft_psk_generate_local
into 'enabled'.

But ensure that LuCI does not delete the existing key values
by not making the r0kh and r1kh fields to depend on this.

Note that this is just a quick fix for the wrong default value
causing problems, but not yet a complete fix for all the options.
In the long run it might be better to make the detail options
to depend on local generation.

Reference also to LuCI PR #2102

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoluci-mod-network: remove debug code from iface_status.js
Jo-Philipp Wich [Sat, 24 Nov 2018 20:32:33 +0000 (21:32 +0100)]
luci-mod-network: remove debug code from iface_status.js

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: CSS accessibility improvements for modal dialog
Jo-Philipp Wich [Fri, 23 Nov 2018 06:44:30 +0000 (07:44 +0100)]
luci-base: CSS accessibility improvements for modal dialog

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-network: move wifi and iface status JS into external files
Jo-Philipp Wich [Fri, 23 Nov 2018 14:47:44 +0000 (15:47 +0100)]
luci-mod-network: move wifi and iface status JS into external files

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-network: move wifi scan JS into external file
Jo-Philipp Wich [Fri, 23 Nov 2018 14:41:56 +0000 (15:41 +0100)]
luci-mod-network: move wifi scan JS into external file

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: modal accessibility fix, wrap XHR.stop()
Jo-Philipp Wich [Fri, 23 Nov 2018 14:43:33 +0000 (15:43 +0100)]
luci-base: modal accessibility fix, wrap XHR.stop()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-network: wifi scan CSS tweaks
Jo-Philipp Wich [Fri, 23 Nov 2018 14:10:54 +0000 (15:10 +0100)]
luci-mod-network: wifi scan CSS tweaks

Hide less important fields for mobile views.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-system: sshkeys CSS tweak
Jo-Philipp Wich [Fri, 23 Nov 2018 14:10:16 +0000 (15:10 +0100)]
luci-mod-system: sshkeys CSS tweak

Overflow pubkey preview to the left, not to the right.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: add responsive CSS
Jo-Philipp Wich [Fri, 23 Nov 2018 14:08:50 +0000 (15:08 +0100)]
luci-theme-bootstrap: add responsive CSS

Add responsive CSS to improve the rendering on small screen devices.

Tested on Mobile Safari using an iPhone 5 and iPhone 6, ymmv for other
platforms.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-material: add missing css cbi-section-error definitions 2329/head
Florian Eckert [Fri, 23 Nov 2018 09:26:58 +0000 (10:26 +0100)]
luci-theme-material: add missing css cbi-section-error definitions

Add the missing error css class definitions.
Highlights the wrong inputs detected by the cbi validation function.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #2328 from tano-systems/fix-translate-arg
Jo-Philipp Wich [Fri, 23 Nov 2018 09:14:49 +0000 (10:14 +0100)]
Merge pull request #2328 from tano-systems/fix-translate-arg

luci-mod-network: fix invalid translate() argument pass

6 years agoluci-mod-network: fix invalid translate() argument pass 2328/head
Anton Kikin [Thu, 22 Nov 2018 21:46:51 +0000 (00:46 +0300)]
luci-mod-network: fix invalid translate() argument pass

We must pass to the translate() a string without substituted zone name.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>