summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2018-12-26Merge pull request #2390 from cshoredaniel/pr-nut-updatesHannu Nyman
luci-app-nut: Update nut-server settings to match packages master
2018-12-26luci-app-shadowsocks-libev: add zh-cn translationYousong Zhou
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-12-26luci-base: fix zh-tw translationGyrotron
Fixes #1092 Signed-off-by: Simmar Kalsi simmarkalsi@gmail.com [reword commit message subject] Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-12-22luci-app-nut: Update settings to match packages masterDaniel F. Dickinson
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-22luci-app-nut: nut_server: Alphabetize driver optionsDaniel F. Dickinson
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-22Merge pull request #2389 from dibdot/adblockDirk Brenken
luci-app-adblock: minor fixes
2018-12-22luci-app-adblock: minor fixesDirk Brenken
* use new XHR default on report page * fix wrong string.find syntax Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-21luci-lib-jsonc: prevent infinite recursion in stringifyJo-Philipp Wich
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-21Merge pull request #2386 from cshoredaniel/pr-uhttpd-spellingJo-Philipp Wich
luci-app-uhttpd: Correct spelling in two places
2018-12-20luci-app-uhttpd: Correct spelling in two placesDaniel F. Dickinson
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-20Merge pull request #2383 from TDT-AG/pr/20181220-luci-theme-materialJo-Philipp Wich
luci-theme-material: make top level menu fontcolor configurable
2018-12-20luci-theme-material: make top level menu fontcolor configurableFlorian Eckert
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-20csstidy: update to latest Git HEADJo-Philipp Wich
1d56201 prepare: do not consider "overflow" to be a shorthand for -x, -y Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-20Merge pull request #2351 from TDT-AG/pr/20181204-modulesJo-Philipp Wich
modules: use configurable poll interval
2018-12-20luci-base: use default poll intervalFlorian Eckert
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-20luci-app-*: use default poll intervalFlorian Eckert
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-20modules: use configurable poll intervalFlorian Eckert
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-20Merge pull request #2380 from dibdot/adblockDirk Brenken
luci-app-adblock: sync with release 3.6.0
2018-12-20luci-app-adblock: sync with release 3.6.0Dirk Brenken
* 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-19Merge pull request #2381 from musashino205/l10n/base-upd-jaHannu Nyman
luci-base: update Japanese translation
2018-12-20luci-base: update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-20i18n: sync translationsINAGAKI Hiroshi
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-19Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-systemJo-Philipp Wich
luci-mod-system: add translation for led trigger names
2018-12-16luci-theme-bootstrap: fix textarea height after CSS minificationJo-Philipp Wich
Fixes #2378 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-15Merge pull request #2377 from sotux/master-luci-app-aria2Hannu Nyman
luci-app-aria2: fix the log option
2018-12-15luci-app-aria2: fix the log optionZheng Qian
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-14Merge pull request #2375 from sotux/master-luci-app-aria2Jo-Philipp Wich
luci-app-aria2: fix showRPCURL when using https
2018-12-14luci-app-aria2: fix showRPCURL when using httpsZheng Qian
if login luci-admin with https, RPC protocol should be https or wss. Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-12-14luci-base: update Simplified Chinese translationZheng Qian
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-12-13luci-base: fix table compare upon writing ipaddr changesJo-Philipp Wich
Fixes: b33192a03 ("luci-base: support cidr list notation for option ipaddr and ip6addr") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13luci-base: properly option ipaddr in single cidr string notation as wellJo-Philipp Wich
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-13luci-base: fix typo in german translationJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13luci-base: update german translationJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13luci-base: resync translation templatesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13luci-base: support cidr list notation for option ipaddr and ip6addrJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13luci-base: cbi.js: update deps on dynlist changes, honor placeholderJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-13Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzoJo-Philipp Wich
luci-app-openvpn: re-add options comp_lzo and comp_noadapt
2018-12-13luci-app-openvpn: re-add options comp_lzo and comp_noadaptMartin Schiller
* 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-12csstidy: update to latest Git headJo-Philipp Wich
33594b4 ("csstidy: do not dequote selector strings") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-12Merge pull request #2369 from tano-systems/fix-changelog-mistakeJo-Philipp Wich
luci-base: fix UCI changelog markup mistake
2018-12-12build: add build option to minify *.css filesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-12contrib: add csstidy packageJo-Philipp Wich
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-12luci-base: fix UCI changelog markup mistakeAnton Kikin
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
2018-12-11Merge pull request #2361 from stokito/masterHannu Nyman
CONTRIBUTING.md
2018-12-11luci-app-nlbwmon: rewrite display sectionJo-Philipp Wich
- Move CSS and JS code to external files - Use responsive table markup Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-11luci-lib-httpclient: prevent nil access with invalid IP address literalsJo-Philipp Wich
Fixes: a54baf7be ("luci-lib-httpclient: revamp URL handling") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-11luci-lib-httpclient: revamp URL handlingJo-Philipp Wich
- 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-11Merge pull request #2285 from dengqf6/luci-ssl-nginxJo-Philipp Wich
luci-ssl-nginx: fix dependencies
2018-12-11Merge pull request #2367 from yglb/masterJo-Philipp Wich
luci-theme-rosy: Fixed insufficient container container width
2018-12-11luci-base: fix syntax error in map.htmJo-Philipp Wich
Fixes #2366. Fixes: 76e9c0305 ("luci-base: rework ui tabbing code") Signed-off-by: Jo-Philipp Wich <jo@mein.io>