project/luci.git
5 years agoluci-app-aria2: fix: datatype 2772/head
练亮斌 [Sun, 16 Jun 2019 14:26:11 +0000 (22:26 +0800)]
luci-app-aria2: fix: datatype

just a spelling mistake.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
5 years agoluci-mod-system: prevent clearing rc.local on unrelated submit actions
Jo-Philipp Wich [Wed, 12 Jun 2019 15:47:30 +0000 (17:47 +0200)]
luci-mod-system: prevent clearing rc.local on unrelated submit actions

Fixes: #2760
Fixes: 1c09ee5e4 ("luci-mod-system: fix SimpleForm usage on file editing pages")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: update Traditional Chinese translation
Perry Thompson [Tue, 11 Jun 2019 22:43:21 +0000 (17:43 -0500)]
luci-base: update Traditional Chinese translation

Signed-off-by: Perry Thompson <contact@ryper.org>
5 years agoluci-base: update Traditional Chinese translation
a962702 [Tue, 11 Jun 2019 12:20:06 +0000 (20:20 +0800)]
luci-base: update Traditional Chinese translation

update Traditional Chinese translations.

Signed-off-by: Andy Yun <a962702@yahoo.com>
5 years agoluci-base: update Traditional Chinese translation
Andy [Mon, 10 Jun 2019 12:50:30 +0000 (20:50 +0800)]
luci-base: update Traditional Chinese translation
update Traditional Chinese translation.
Signed-off-by: Andy Yun <a962702@yahoo.com>
5 years agoMerge pull request #2762 from musashino205/l10n/mwan3-upd-ja
Florian Eckert [Mon, 10 Jun 2019 11:55:07 +0000 (13:55 +0200)]
Merge pull request #2762 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

5 years agoluci-app-mwan3: update Japanese translation 2762/head
INAGAKI Hiroshi [Mon, 10 Jun 2019 07:02:36 +0000 (16:02 +0900)]
luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoi18n: sync translations
Hannu Nyman [Sun, 9 Jun 2019 16:24:00 +0000 (19:24 +0300)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #2755 from dibdot/lxc
Dirk Brenken [Fri, 7 Jun 2019 04:55:36 +0000 (06:55 +0200)]
Merge pull request #2755 from dibdot/lxc

luci-app-lxc: add conffiles define

5 years agoluci-app-lxc: add conffiles define 2755/head
Dirk Brenken [Thu, 6 Jun 2019 11:03:40 +0000 (13:03 +0200)]
luci-app-lxc: add conffiles define

- fix #2754

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoMerge pull request #2753 from tano-systems/pr-luci-base-update-ru-translation
Hannu Nyman [Wed, 5 Jun 2019 18:50:34 +0000 (21:50 +0300)]
Merge pull request #2753 from tano-systems/pr-luci-base-update-ru-translation

luci-base: update Russian translation

5 years agoluci-base: update Russian translation 2753/head
Anton Kikin [Wed, 5 Jun 2019 18:39:48 +0000 (21:39 +0300)]
luci-base: update Russian translation

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
5 years agoluci-mod-system: fix SimpleForm usage on file editing pages
Jo-Philipp Wich [Wed, 5 Jun 2019 14:01:16 +0000 (16:01 +0200)]
luci-mod-system: fix SimpleForm usage on file editing pages

When a value identical to the stored one is submitted, the CBI framework
will not emit an option write event and therfore not store the value in
the form data dictionary passed to SimpleForm.handle().

This usage pattern usally works be accident for file editor views such
as admin_system/crontab because \r\n windows style line endings are
substituted with unix \n ones before writing the data, defeating the
equality check in CBI.

When a single line without trailing newline is submitted however, the
CBI will not see a difference to the data stored in the file and clear
out the value on subsequent saves.

This commit alignes the logic used by various SimpleForm views to
behave identically and predictable:

 - File data is handled in the SimpleForm.handle() callback
 - The forcewrite property is used to disable equality checks
 - Submission of an empty string empties the backing file

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agolucihttp: update to latest Git HEAD
Jo-Philipp Wich [Wed, 5 Jun 2019 11:22:15 +0000 (13:22 +0200)]
lucihttp: update to latest Git HEAD

f6e0564 lib: fix handling of empty multipart fields
91c01c3 lib: fix multipart state transition in boundary parsing

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2744 from TDT-AG/pr/20190603-luci-app-mwan3
Florian Eckert [Tue, 4 Jun 2019 20:07:24 +0000 (22:07 +0200)]
Merge pull request #2744 from TDT-AG/pr/20190603-luci-app-mwan3

luci-app-mwan3: change flush_conntrack option to list option

5 years agoMerge pull request #2748 from dibdot/duid-fix
Jo-Philipp Wich [Tue, 4 Jun 2019 15:14:37 +0000 (17:14 +0200)]
Merge pull request #2748 from dibdot/duid-fix

luci-base: fix duid_to_mac reference in status.lua

5 years agoluci-base: fix duid_to_mac reference in status.lua 2748/head
Dirk Brenken [Tue, 4 Jun 2019 14:54:24 +0000 (16:54 +0200)]
luci-base: fix duid_to_mac reference in status.lua

* fix for openwrt/packages#9148

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoMerge pull request #2746 from TDT-AG/pr/20190603-luci-theme-material
Florian Eckert [Tue, 4 Jun 2019 13:17:50 +0000 (15:17 +0200)]
Merge pull request #2746 from TDT-AG/pr/20190603-luci-theme-material

luci-theme-material: fix checkbox css StaticList view

5 years agoluci-theme-material: fix checkbox css StaticList view 2746/head
Florian Eckert [Thu, 23 May 2019 07:45:00 +0000 (09:45 +0200)]
luci-theme-material: fix checkbox css StaticList view

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agothemes: don't reset theme on package upgrades
Jo-Philipp Wich [Mon, 3 Jun 2019 14:49:10 +0000 (16:49 +0200)]
themes: don't reset theme on package upgrades

Fixes: #2743
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2742 from Ansuel/odhcp-lease
Jo-Philipp Wich [Mon, 3 Jun 2019 14:34:06 +0000 (16:34 +0200)]
Merge pull request #2742 from Ansuel/odhcp-lease

luci-base: handle dhcp lease from odhcpd

5 years agoluci-app-mwan3: change flush_conntrack option to list option 2744/head
Florian Eckert [Wed, 22 May 2019 08:56:31 +0000 (10:56 +0200)]
luci-app-mwan3: change flush_conntrack option to list option

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-base: handle dhcp lease from odhcpd 2742/head
Ansuel Smith [Sun, 2 Jun 2019 20:37:31 +0000 (22:37 +0200)]
luci-base: handle dhcp lease from odhcpd

Currently only the dnsmasq lease file is read for hostname hint. If someone use only odhcpd as dhcp daemon the hostname resolution on wifi_assoc list is broken.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
5 years agoluci-base: adds duid_to_mac to sys.lua
Ansuel Smith [Sun, 2 Jun 2019 20:33:02 +0000 (22:33 +0200)]
luci-base: adds duid_to_mac to sys.lua

Move duid_to_mac function from status.lua to sys.lua.
Implement translation from DUID-LL without header to MAC

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
5 years agobuild: i18n-scan.pl: properly handle bracket-quoted strings
Jo-Philipp Wich [Fri, 31 May 2019 18:09:41 +0000 (20:09 +0200)]
build: i18n-scan.pl: properly handle bracket-quoted strings

Fixes: #2738
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2733 from castillofrancodamian/samba4
Hannu Nyman [Wed, 29 May 2019 16:29:11 +0000 (19:29 +0300)]
Merge pull request #2733 from castillofrancodamian/samba4

luci-app-samba4: Update Spanish translation

5 years agoMerge pull request #2734 from castillofrancodamian/tinyproxy
Hannu Nyman [Wed, 29 May 2019 16:28:55 +0000 (19:28 +0300)]
Merge pull request #2734 from castillofrancodamian/tinyproxy

luci-app-tinyproxy: Update Spanish translation

5 years agoMerge pull request #2735 from castillofrancodamian/statistics
Hannu Nyman [Wed, 29 May 2019 16:28:19 +0000 (19:28 +0300)]
Merge pull request #2735 from castillofrancodamian/statistics

luci-app-statistics: Update Spanish translation

5 years agoMerge pull request #2394 from gyr0tron/privoxy_hindi
Hannu Nyman [Wed, 29 May 2019 16:27:09 +0000 (19:27 +0300)]
Merge pull request #2394 from gyr0tron/privoxy_hindi

luci-app-privoxy: Added Hindi translation

5 years agoAdded privoxy Hindi translations 2394/head
Gyrotron [Wed, 26 Dec 2018 08:49:08 +0000 (14:19 +0530)]
Added privoxy Hindi translations

Signed-off-by: Simmar Kalsi <simmarkalsi@gmail.com>
5 years agoMerge pull request #2670 from TDT-AG/pr/20190410-luci-mod-network
Florian Eckert [Wed, 29 May 2019 09:10:19 +0000 (11:10 +0200)]
Merge pull request #2670 from TDT-AG/pr/20190410-luci-mod-network

luci-mod-network: move auto option to general tab

5 years agoluci-app-statistics: Update Spanish translation 2735/head
Franco Castillo [Tue, 28 May 2019 19:08:31 +0000 (16:08 -0300)]
luci-app-statistics: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2673 from jose1711/mjpg-streamer-link
Florian Eckert [Tue, 28 May 2019 19:03:43 +0000 (21:03 +0200)]
Merge pull request #2673 from jose1711/mjpg-streamer-link

luci-app-mjpg-streamer: add link option

5 years agoMerge pull request #2391 from Matthias84/patch-4
Florian Eckert [Tue, 28 May 2019 18:57:34 +0000 (20:57 +0200)]
Merge pull request #2391 from Matthias84/patch-4

luci-app-uhttpd: German translation

5 years agoluci-app-tinyproxy: Update Spanish translation 2734/head
Franco Castillo [Tue, 28 May 2019 18:49:24 +0000 (15:49 -0300)]
luci-app-tinyproxy: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-samba4: Update Spanish translation 2733/head
Franco Castillo [Tue, 28 May 2019 18:35:56 +0000 (15:35 -0300)]
luci-app-samba4: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2725 from EricLuehrsen/unbound_view
Dirk Brenken [Tue, 28 May 2019 14:18:44 +0000 (16:18 +0200)]
Merge pull request #2725 from EricLuehrsen/unbound_view

luci-app-unbound: match dependencies with unbound package

5 years agoMerge pull request #2732 from castillofrancodamian/hd
Florian Eckert [Tue, 28 May 2019 06:35:01 +0000 (08:35 +0200)]
Merge pull request #2732 from castillofrancodamian/hd

luci-app-hd-idle: Update Spanish translation

5 years agoluci-app-hd-idle: Update Spanish translation 2732/head
Franco Castillo [Tue, 28 May 2019 03:48:50 +0000 (00:48 -0300)]
luci-app-hd-idle: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2174 from rosysong/lease-status
Florian Eckert [Sat, 25 May 2019 19:43:50 +0000 (21:43 +0200)]
Merge pull request #2174 from rosysong/lease-status

luci-base: drop ipv6 lease status when IPV6 is not support

5 years agoluci-app-unbound: match dependencies with unbound package 2725/head
Eric Luehrsen [Fri, 24 May 2019 00:43:19 +0000 (20:43 -0400)]
luci-app-unbound: match dependencies with unbound package

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
5 years agoMerge pull request #2691 from sumpfralle/patch-1
Florian Eckert [Mon, 20 May 2019 16:24:09 +0000 (18:24 +0200)]
Merge pull request #2691 from sumpfralle/patch-1

Various improvements of the German translation

5 years agoluci-base: Update German translation 2691/head
Lars Kruse [Sun, 5 May 2019 18:43:22 +0000 (20:43 +0200)]
luci-base: Update German translation

The following changes are included:
* properly handle "Präfix" as neuter
* add missing hyphens to many appearances of "Präfix"
* fix spelling
* add few missing translations

Signed-off-by: Lars Kruse <devel@sumpfralle.de>
5 years agoMerge pull request #2716 from castillofrancodamian/base
Hannu Nyman [Fri, 17 May 2019 13:56:26 +0000 (16:56 +0300)]
Merge pull request #2716 from castillofrancodamian/base

luci-base: Update Spanish translation

5 years agoMerge pull request #2719 from castillofrancodamian/aria2
Florian Eckert [Fri, 17 May 2019 07:04:05 +0000 (09:04 +0200)]
Merge pull request #2719 from castillofrancodamian/aria2

luci-app-aria2: Update Spanish translation

5 years agoMerge pull request #2718 from castillofrancodamian/firewall
Florian Eckert [Fri, 17 May 2019 07:03:20 +0000 (09:03 +0200)]
Merge pull request #2718 from castillofrancodamian/firewall

luci-app-firewall: Update Spanish translation

5 years agoMerge pull request #2717 from sotux/master-luci-base-zh_CN
Florian Eckert [Fri, 17 May 2019 07:01:56 +0000 (09:01 +0200)]
Merge pull request #2717 from sotux/master-luci-base-zh_CN

luci-base: zh_CN: update Simplified Chinese translation

5 years agoluci-app-aria2: Update Spanish translation 2719/head
Franco Castillo [Fri, 17 May 2019 01:55:12 +0000 (22:55 -0300)]
luci-app-aria2: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-firewall: Update Spanish translation 2718/head
Franco Castillo [Fri, 17 May 2019 01:32:26 +0000 (22:32 -0300)]
luci-app-firewall: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-base: zh_CN: update Simplified Chinese translation 2717/head
Zheng Qian [Fri, 17 May 2019 01:21:46 +0000 (09:21 +0800)]
luci-base: zh_CN: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
5 years agoluci-base: Update Spanish translation 2716/head
Franco Castillo [Thu, 16 May 2019 23:14:14 +0000 (20:14 -0300)]
luci-base: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2715 from castillofrancodamian/mjpg
Hannu Nyman [Thu, 16 May 2019 18:48:26 +0000 (21:48 +0300)]
Merge pull request #2715 from castillofrancodamian/mjpg

luci-app-mjpg-streamer: Add Spanish translation

5 years agoluci-app-mjpg-streamer: Add Spanish translation 2715/head
Franco Castillo [Thu, 16 May 2019 18:43:52 +0000 (15:43 -0300)]
luci-app-mjpg-streamer: Add Spanish translation

Add Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2714 from castillofrancodamian/watchcat
Hannu Nyman [Thu, 16 May 2019 18:33:32 +0000 (21:33 +0300)]
Merge pull request #2714 from castillofrancodamian/watchcat

luci-app-watchcat: Update Spanish translation

5 years agoMerge pull request #2713 from castillofrancodamian/opkg
Hannu Nyman [Thu, 16 May 2019 18:33:08 +0000 (21:33 +0300)]
Merge pull request #2713 from castillofrancodamian/opkg

luci-app-opkg: Update Spanish translation

5 years agoluci-app-watchcat: Update Spanish translation 2714/head
Franco Castillo [Thu, 16 May 2019 18:28:59 +0000 (15:28 -0300)]
luci-app-watchcat: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-opkg: Update Spanish translation 2713/head
Franco Castillo [Thu, 16 May 2019 18:24:52 +0000 (15:24 -0300)]
luci-app-opkg: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2711 from dibdot/banip
Dirk Brenken [Thu, 16 May 2019 15:08:44 +0000 (17:08 +0200)]
Merge pull request #2711 from dibdot/banip

luci-app-banip: change maxqueue default / sync with banIP 0.1.1

5 years agoMerge pull request #2703 from castillofrancodamian/polipo
Florian Eckert [Thu, 16 May 2019 09:46:58 +0000 (11:46 +0200)]
Merge pull request #2703 from castillofrancodamian/polipo

luci-app-polipo: Update Spanish translation

5 years agoMerge pull request #2707 from castillofrancodamian/shadowsocks-libev
Florian Eckert [Thu, 16 May 2019 09:46:13 +0000 (11:46 +0200)]
Merge pull request #2707 from castillofrancodamian/shadowsocks-libev

luci-app-shadowsocks-libev: Udpate Spanish translation

5 years agoMerge pull request #2709 from castillofrancodamian/nlbwmon
Florian Eckert [Thu, 16 May 2019 09:36:30 +0000 (11:36 +0200)]
Merge pull request #2709 from castillofrancodamian/nlbwmon

luci-app-nlbwmon: Add Spanish translation

5 years agoMerge pull request #2705 from castillofrancodamian/adblock
Florian Eckert [Thu, 16 May 2019 09:33:40 +0000 (11:33 +0200)]
Merge pull request #2705 from castillofrancodamian/adblock

luci-app-adblock: Update Spanish translation

5 years agoMerge pull request #2710 from castillofrancodamian/ddns
Florian Eckert [Thu, 16 May 2019 09:33:01 +0000 (11:33 +0200)]
Merge pull request #2710 from castillofrancodamian/ddns

luci-app-ddns: Update Spanish translation

5 years agoluci-app-banip: change maxqueue default / sync with banIP 0.1.1 2711/head
Dirk Brenken [Thu, 16 May 2019 08:39:48 +0000 (10:39 +0200)]
luci-app-banip: change maxqueue default / sync with banIP 0.1.1

* change maxqueue default to '4' to reduce the overall system load

Signed-off-by: Dirk Brenken <dev@brenken.org>
5 years agoluci-app-ddns: Update Spansih translation 2710/head
Franco Castillo [Wed, 15 May 2019 23:11:45 +0000 (20:11 -0300)]
luci-app-ddns: Update Spansih translation

Update Spansih translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-nlbwmon: Add Spanish translation 2709/head
Franco Castillo [Wed, 15 May 2019 22:18:23 +0000 (19:18 -0300)]
luci-app-nlbwmon: Add Spanish translation

Add Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-shadowsocks-libev: Udpate Spanish translation 2707/head
Franco Castillo [Wed, 15 May 2019 21:27:19 +0000 (18:27 -0300)]
luci-app-shadowsocks-libev: Udpate Spanish translation

Udpate Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-adblock: Update Spanish translation 2705/head
Franco Castillo [Wed, 15 May 2019 20:58:11 +0000 (17:58 -0300)]
luci-app-adblock: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-polipo: Update Spanish translation 2703/head
Franco Castillo [Wed, 15 May 2019 20:32:48 +0000 (17:32 -0300)]
luci-app-polipo: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoMerge pull request #2702 from castillofrancodamian/ddns
Florian Eckert [Wed, 15 May 2019 19:27:57 +0000 (21:27 +0200)]
Merge pull request #2702 from castillofrancodamian/ddns

luci-app-ddns: Udpate Spanish translation

5 years agoMerge pull request #2701 from castillofrancodamian/wol
Florian Eckert [Wed, 15 May 2019 19:27:00 +0000 (21:27 +0200)]
Merge pull request #2701 from castillofrancodamian/wol

luci-app-wol: Update Spanish translation

5 years agoMerge pull request #2700 from castillofrancodamian/firewall
Florian Eckert [Wed, 15 May 2019 19:26:30 +0000 (21:26 +0200)]
Merge pull request #2700 from castillofrancodamian/firewall

luci-app-firewall: Update Spanish translation

5 years agoMerge pull request #2699 from castillofrancodamian/base
Florian Eckert [Wed, 15 May 2019 19:26:00 +0000 (21:26 +0200)]
Merge pull request #2699 from castillofrancodamian/base

luci-base: Update Spanish translation

5 years agoluci-app-ddns: Udpate Spanish translation 2702/head
Franco Castillo [Wed, 15 May 2019 04:07:56 +0000 (01:07 -0300)]
luci-app-ddns: Udpate Spanish translation

Udpate Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-wol: Update Spanish translation 2701/head
Franco Castillo [Wed, 15 May 2019 03:41:57 +0000 (00:41 -0300)]
luci-app-wol: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-firewall: Update Spanish translation 2700/head
Franco Castillo [Wed, 15 May 2019 03:35:54 +0000 (00:35 -0300)]
luci-app-firewall: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-base: Update Spanish translation 2699/head
Franco Castillo [Wed, 15 May 2019 03:25:07 +0000 (00:25 -0300)]
luci-base: Update Spanish translation

Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
5 years agoluci-app-uhttpd German translation 2391/head
Matthias84 [Sun, 23 Dec 2018 12:07:36 +0000 (13:07 +0100)]
luci-app-uhttpd German translation

German translation by Matthias Meißer

Signed-off-by: Matthias Meißer <digi_c@arcor.de>
5 years agoluci-app-statistics: change nut voltage graph combines view.
Fabian Schmid-Michels [Wed, 2 Jan 2019 23:29:59 +0000 (00:29 +0100)]
luci-app-statistics: change nut voltage graph combines view.

This change splits the graph into two graphs like in apcups and makes it so
possible to see variations in AC Input/Output voltages. Battery charge and
load are indepentent variables. This change also overlays them and display
them as simply two lines. Battery temperature is also displayed as a line now,
as an area under a temperature line makes no sense. Also removed some empty
lines.

Closes: #2417
Signed-off-by: Fabian Schmid-Michels <mail@wohnheimnetz-bielefeld.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoMerge pull request #2514 from sandinak/feature_luci_stats_multiple_ups
Florian Eckert [Tue, 14 May 2019 06:17:22 +0000 (08:17 +0200)]
Merge pull request #2514 from sandinak/feature_luci_stats_multiple_ups

luci-app-statistics: adding ability for luci_stats config to have multiple UPS's

5 years agoMerge pull request #2697 from musashino205/l10n/base-upd-ja
Florian Eckert [Tue, 14 May 2019 06:10:14 +0000 (08:10 +0200)]
Merge pull request #2697 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

5 years agoluci-base: update Japanese translation 2697/head
INAGAKI Hiroshi [Mon, 13 May 2019 09:58:37 +0000 (18:58 +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 [Mon, 13 May 2019 09:18:52 +0000 (18:18 +0900)]
i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
5 years agoMerge pull request #2687 from HenryGiraldo/master
Jo-Philipp Wich [Thu, 9 May 2019 11:26:10 +0000 (13:26 +0200)]
Merge pull request #2687 from HenryGiraldo/master

luci-mod-admin-full: add dependency for channel auto

5 years agoluci-app-shadowsocks-libev: move plugin options to server sections
Yousong Zhou [Thu, 9 May 2019 06:00:52 +0000 (06:00 +0000)]
luci-app-shadowsocks-libev: move plugin options to server sections

In this change, plugin options are moved from component settings to
only server settings.  This should make the configuration easier.  And
it will be less error-prone as it's impossible now for users to
inconsisitent plugin settings for instances referring to the same remote
server

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-mod-admin-network: fix VLAN "add" button for empty switches
Jo-Philipp Wich [Tue, 7 May 2019 06:54:23 +0000 (08:54 +0200)]
luci-mod-admin-network: fix VLAN "add" button for empty switches

Fixes OpenWrt FS#2270.

Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2270
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-shadowsocks-libev: i18n-sync.sh and update translation
Yousong Zhou [Mon, 6 May 2019 15:22:06 +0000 (15:22 +0000)]
luci-app-shadowsocks-libev: i18n-sync.sh and update translation

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-app-shadowsocks-libev: allow setting plugin options
Yousong Zhou [Mon, 6 May 2019 15:16:59 +0000 (15:16 +0000)]
luci-app-shadowsocks-libev: allow setting plugin options

Reference: https://github.com/openwrt/packages/issues/8903
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-app-shadowsocks-libev: reword base64 -encoding-
Yousong Zhou [Tue, 22 Jan 2019 06:29:24 +0000 (06:29 +0000)]
luci-app-shadowsocks-libev: reword base64 -encoding-

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoluci-base: remove interface from zone upon deletion
Jo-Philipp Wich [Mon, 6 May 2019 06:22:39 +0000 (08:22 +0200)]
luci-base: remove interface from zone upon deletion

Fixes: #2690
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2688 from rosysong/rosy-bugs-fix
Hannu Nyman [Sun, 5 May 2019 13:45:00 +0000 (16:45 +0300)]
Merge pull request #2688 from rosysong/rosy-bugs-fix

luci-theme-rosy: fix table overflow on network/switch

5 years agoluci-theme-rosy: fix table overflow on network/switch 2688/head
yglb [Thu, 2 May 2019 09:05:55 +0000 (17:05 +0800)]
luci-theme-rosy: fix table overflow on network/switch

Signed-off-by: Rosy Song <rosysong@rosinson.com>
Signed-off-by: Yan Lan Shen <yanlan.shen@rosinson.com>
5 years agoluci-mod-admin-full: add dependency for channel auto 2687/head
Enrique Giraldo [Tue, 18 Sep 2018 11:43:01 +0000 (13:43 +0200)]
luci-mod-admin-full: add dependency for channel auto

Do not show 'auto' channel option if hostapd is
not compiled with CONFIG_ACS

Signed-off-by: Enrique Giraldo <hgiraldos@gmail.com>
5 years agoluci-app-statistics: escape backslashes as well
Jo-Philipp Wich [Tue, 30 Apr 2019 07:08:56 +0000 (09:08 +0200)]
luci-app-statistics: escape backslashes as well

Fixes: bab4a3ef ("luci-app-statistics - allow rrd files to contain :")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-base: luci.model.network: simplify is_auto()
Jo-Philipp Wich [Tue, 30 Apr 2019 07:05:16 +0000 (09:05 +0200)]
luci-base: luci.model.network: simplify is_auto()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2657 from msurovcak/msurovcak-statistics-collon
Florian Eckert [Tue, 30 Apr 2019 06:47:38 +0000 (08:47 +0200)]
Merge pull request #2657 from msurovcak/msurovcak-statistics-collon

luci-app-statistics - allow rrd files to contain :

5 years agoMerge pull request #2620 from TDT-AG/pr/20190311-luci-mod-system
Florian Eckert [Tue, 30 Apr 2019 06:22:50 +0000 (08:22 +0200)]
Merge pull request #2620 from TDT-AG/pr/20190311-luci-mod-system

luci-mod-system: add button to sync with ntp server

5 years agoMerge pull request #2119 from TDT-AG/pr/20180830-fix-iface-status-page
Florian Eckert [Thu, 25 Apr 2019 11:28:56 +0000 (13:28 +0200)]
Merge pull request #2119 from TDT-AG/pr/20180830-fix-iface-status-page

luci-mod-admin-full: add hint to overview page

5 years agoluci-mod-network: add auto start hint 2119/head
Florian Eckert [Mon, 11 Mar 2019 09:07:34 +0000 (10:07 +0100)]
luci-mod-network: add auto start hint

Make the information if the interface is started on boot visible on the
interface overview page.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-mod-network: add is_auto option to iface_status
Florian Eckert [Wed, 29 Aug 2018 13:15:10 +0000 (15:15 +0200)]
luci-mod-network: add is_auto option to iface_status

Make interface information is_auto available.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>