Commit graph

10478 commits

Author SHA1 Message Date
Hannu Nyman
9a8587347c
Merge pull request #2397 from musashino205/l10n/base-fix-ja
luci-base: fix Japanese translation
2018-12-26 19:19:26 +02:00
Hannu Nyman
30ab3afc3e
Merge pull request #2390 from cshoredaniel/pr-nut-updates
luci-app-nut: Update nut-server settings to match packages master
2018-12-26 19:19:09 +02:00
INAGAKI Hiroshi
e7e8475062 luci-base: fix Japanese translation
Fixed Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-26 19:49:18 +09:00
Yousong Zhou
d463de3686 luci-app-shadowsocks-libev: add zh-cn translation
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-12-26 06:55:06 +00:00
Gyrotron
38c03bcbc9 luci-base: fix zh-tw translation
Fixes #1092

Signed-off-by: Simmar Kalsi simmarkalsi@gmail.com
[reword commit message subject]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-12-26 01:32:03 +00:00
Daniel F. Dickinson
f1db40df10 luci-app-nut: Update settings to match packages master
A number of settings in openwrt-packages master are missing; add them.
The 'extra' adhoc options (override, default, other, and otherflag) we
leave to UCI only because they require dynamic creation of config
sections.
There were some options that didn't belong in the section they were
in; remove them.
Include the option for the USB serial port permissions for serial USB
devices over USB serial port (on the OpenWrt device).
And finally, fix the title of the UPS Server global settings.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-12-22 22:54:11 -05:00
Daniel F. Dickinson
e164e2d1eb luci-app-nut: nut_server: Alphabetize driver options
There are a *lot* of options, so list them in alphabetical order
for easier updates to the app (alphabetizing by translation doesn't
make sense since the order would need to change depending on language).

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-12-22 22:54:11 -05:00
Dirk Brenken
31d259a361
Merge pull request #2389 from dibdot/adblock
luci-app-adblock: minor fixes
2018-12-22 18:53:04 +01:00
Dirk Brenken
0299b13292 luci-app-adblock: minor fixes
* use new XHR default on report page
* fix wrong string.find syntax

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-22 18:37:45 +01:00
Jo-Philipp Wich
21db93576a luci-lib-jsonc: prevent infinite recursion in stringify
Also increase the stack size as needed to prevent crashes when serializing
deeply nested tables.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-21 15:41:19 +01:00
Jo-Philipp Wich
5ae6f06014
Merge pull request #2386 from cshoredaniel/pr-uhttpd-spelling
luci-app-uhttpd: Correct spelling in two places
2018-12-21 08:30:11 +01:00
Daniel F. Dickinson
7e7e9cd73a luci-app-uhttpd: Correct spelling in two places
Had 'at list' instead 'at least' for the help text on listing
HTTP/HTTPS listening addresses.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-12-20 22:25:32 -05:00
Jo-Philipp Wich
49c558a693
Merge pull request #2383 from TDT-AG/pr/20181220-luci-theme-material
luci-theme-material: make top level menu fontcolor configurable
2018-12-20 15:06:12 +01:00
Florian Eckert
280c55b9ad luci-theme-material: make top level menu fontcolor configurable
If you change the color of the submenues then the colors of the toplevel
should also be changed into the same color.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-12-20 14:46:31 +01:00
Jo-Philipp Wich
271f3e1d25 csstidy: update to latest Git HEAD
1d56201 prepare: do not consider "overflow" to be a shorthand for -x, -y

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-20 13:03:06 +01:00
Jo-Philipp Wich
5aa2d3a77f
Merge pull request #2351 from TDT-AG/pr/20181204-modules
modules: use configurable poll interval
2018-12-20 10:52:06 +01:00
Florian Eckert
3b9ba0210e luci-base: use default poll interval
Replace all XHR poll time number with -1 so they will use the default
poll interval time value from "/etc/config/luci". If this is not set then
5 seconds as default is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-12-20 10:20:23 +01:00
Florian Eckert
121e7fea66 luci-app-*: use default poll interval
Replace all XHR poll time number with -1 so they will use the default
poll interval time value from "/etc/config/luci". If this is not set then
5 seconds as default is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-12-20 10:20:23 +01:00
Florian Eckert
6475221d54 modules: use configurable poll interval
Make poll interval configurable. Use option from

----
config core 'main'
    option pollinterval '5'
---

This will only be used if the interval option is less or equal zero.
If the poll interval is not configured then a default value of 5 seconds
is used.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-12-20 10:19:07 +01:00
Dirk Brenken
aee720f11f
Merge pull request #2380 from dibdot/adblock
luci-app-adblock: sync with release 3.6.0
2018-12-20 08:51:35 +01:00
Dirk Brenken
87ec92d1ed 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>
2018-12-20 08:45:35 +01:00
Hannu Nyman
3c96053cb4
Merge pull request #2381 from musashino205/l10n/base-upd-ja
luci-base: update Japanese translation
2018-12-19 20:36:15 +02:00
INAGAKI Hiroshi
7c9f7bc3eb luci-base: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-20 03:01:24 +09:00
INAGAKI Hiroshi
37b0211e62 i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-20 02:21:14 +09:00
Jo-Philipp Wich
e3b91d1a62
Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system
luci-mod-system: add translation for led trigger names
2018-12-19 07:49:56 +01:00
Jo-Philipp Wich
91a73bebfb luci-theme-bootstrap: fix textarea height after CSS minification
Fixes #2378
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-16 15:08:05 +01:00
Hannu Nyman
1cc6c58d1f
Merge pull request #2377 from sotux/master-luci-app-aria2
luci-app-aria2: fix the log option
2018-12-15 15:46:05 +02:00
Zheng Qian
e56af3c3e5 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>
2018-12-15 21:44:49 +08:00
Jo-Philipp Wich
b5fb2a841f
Merge pull request #2375 from sotux/master-luci-app-aria2
luci-app-aria2: fix showRPCURL when using https
2018-12-14 07:14:18 +01:00
Zheng Qian
83703aaec0 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>
2018-12-14 13:32:49 +08:00
Zheng Qian
76f81c262c luci-base: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-12-14 10:14:01 +08:00
Jo-Philipp Wich
efb4d7c40a 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>
2018-12-13 12:14:37 +01:00
Jo-Philipp Wich
11b271d4a9 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>
2018-12-13 11:57:16 +01:00
Jo-Philipp Wich
67c34c5f5f luci-base: fix typo in german translation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13 11:44:17 +01:00
Jo-Philipp Wich
c50849ddd2 luci-base: update german translation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13 11:41:24 +01:00
Jo-Philipp Wich
6c76300505 luci-base: resync translation templates
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13 11:36:35 +01:00
Jo-Philipp Wich
b33192a033 luci-base: support cidr list notation for option ipaddr and ip6addr
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13 11:35:38 +01:00
Jo-Philipp Wich
979a478001 luci-base: cbi.js: update deps on dynlist changes, honor placeholder
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13 11:35:38 +01:00
Jo-Philipp Wich
3094c5dbb8
Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo
luci-app-openvpn: re-add options comp_lzo and comp_noadapt
2018-12-13 08:26:44 +01:00
Martin Schiller
ab234df3df 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>
2018-12-13 08:08:24 +01:00
Jo-Philipp Wich
aa954d1c69 csstidy: update to latest Git head
33594b4 ("csstidy: do not dequote selector strings")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-12 16:25:59 +01:00
Jo-Philipp Wich
c0c05ace9f
Merge pull request #2369 from tano-systems/fix-changelog-mistake
luci-base: fix UCI changelog markup mistake
2018-12-12 10:47:06 +01:00
Jo-Philipp Wich
0de1dcbf4a build: add build option to minify *.css files
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-12 09:47:37 +01:00
Jo-Philipp Wich
e90431b870 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>
2018-12-12 09:47:37 +01:00
Anton Kikin
43c7cb344c luci-base: fix UCI changelog markup mistake
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
2018-12-12 02:05:59 +03:00
Hannu Nyman
6f0bed8c54
Merge pull request #2361 from stokito/master
CONTRIBUTING.md
2018-12-11 18:39:40 +02:00
Jo-Philipp Wich
1fb069f235 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>
2018-12-11 11:54:42 +01:00
Jo-Philipp Wich
a692ca789a 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>
2018-12-11 09:17:50 +01:00
Jo-Philipp Wich
a54baf7be0 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>
2018-12-11 09:12:32 +01:00
Jo-Philipp Wich
b94be57aff
Merge pull request #2285 from dengqf6/luci-ssl-nginx
luci-ssl-nginx: fix dependencies
2018-12-11 06:56:35 +01:00