project/luci.git
4 years agoGraph the max value rather than avg if rrdsingle disabled 721/head
Kevin Darbyshire-Bryant [Thu, 31 Dec 2015 18:00:55 +0000 (18:00 +0000)]
Graph the max value rather than avg if rrdsingle disabled

With rrdsingle the average values are used for graphing. As the
timescale increases (say over a day or month) the average values
progressively reduce.  Using the maximum value over the longer periods
is arguably no less deceptive but it does produce more informative
graphs.

V2 - Invert the default path logic related to rra.single

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
4 years agoMerge pull request #717 from Umeaboy/patch-25
Hannu Nyman [Tue, 10 May 2016 19:25:35 +0000 (22:25 +0300)]
Merge pull request #717 from Umeaboy/patch-25

Update wshaper.po

4 years agoUpdate wshaper.po 717/head
Kristoffer Grundström [Tue, 10 May 2016 16:29:55 +0000 (18:29 +0200)]
Update wshaper.po

4 years agoMerge pull request #707 from SvenRoederer/fix/freifunk-communitysetting-selection...
Hannu Nyman [Tue, 10 May 2016 09:31:38 +0000 (12:31 +0300)]
Merge pull request #707 from SvenRoederer/fix/freifunk-communitysetting-selection/master

luci-mod-freifunk: fix lookup of community-name

4 years agoMerge pull request #715 from chris5560/master
Christian Schoenebeck [Sun, 8 May 2016 17:29:02 +0000 (19:29 +0200)]
Merge pull request #715 from chris5560/master

luci-app-ddns: adapt to support khost (Knot DNS) and drill (ddns-scri…

4 years agoluci-app-ddns: adapt to support khost (Knot DNS) and drill (ddns-scripts 2.7.1) 715/head
Christian Schoenebeck [Sun, 8 May 2016 17:26:53 +0000 (19:26 +0200)]
luci-app-ddns: adapt to support khost (Knot DNS) and drill (ddns-scripts 2.7.1)

adapt to support khost (Knot DNS) and drill (ddns-scripts 2.7.1)

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
4 years agoMerge pull request #703 from t0t3m1n/fix_snr
Hannu Nyman [Mon, 2 May 2016 08:01:27 +0000 (11:01 +0300)]
Merge pull request #703 from t0t3m1n/fix_snr

luci-mod-admin-full: fix wrong dsl stats visualization

4 years agoMerge pull request #709 from SvenRoederer/update_community-profiles/master
Hannu Nyman [Mon, 2 May 2016 08:00:27 +0000 (11:00 +0300)]
Merge pull request #709 from SvenRoederer/update_community-profiles/master

freifunk-profiles: remove depreciated profiles

4 years agofreifunk-profiles: remove depreciated profiles 709/head
Sven Roederer [Sun, 1 May 2016 18:57:48 +0000 (20:57 +0200)]
freifunk-profiles: remove depreciated profiles

- 31C3: this was used back in 2014, looking forward for new the congress
- seefeld: died in march 2013 ... (as per note on their Wiki-page)

Signed-off-by: Sven Roederer devel-sven@geroedel.de
4 years agoluci-mod-admin-full: dnsmasq options quietdhcp and sequential_ip
Hannu Nyman [Sun, 1 May 2016 20:26:42 +0000 (23:26 +0300)]
luci-mod-admin-full: dnsmasq options quietdhcp and sequential_ip

Add support for dnsmasq uci options 'quietdhcp' and 'sequential_ip'
(disable logging, allocate ip addresses sequentially)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoi18n: sync translations
Hannu Nyman [Sun, 1 May 2016 13:03:50 +0000 (16:03 +0300)]
i18n: sync translations

Sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-adblock: adjust to change in option name
Hannu Nyman [Sun, 1 May 2016 07:51:04 +0000 (10:51 +0300)]
luci-app-adblock: adjust to change in option name

Change also the adb_nullport option name to match 1.1.0

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-adblock: match adblock 1.1.0
Hannu Nyman [Sat, 30 Apr 2016 23:55:45 +0000 (02:55 +0300)]
luci-app-adblock: match adblock 1.1.0

Update the luci app to match adblock 1.1.0
Add support for showing blocklist status info.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-mod-freifunk: fix lookup of community-name 707/head
Sven Roederer [Sun, 24 Apr 2016 20:38:26 +0000 (22:38 +0200)]
luci-mod-freifunk: fix lookup of community-name

restore the lookup of the freifunk community-name stored in
uci "freifunk.community.name".
In https://github.com/openwrt/luci/commit/9780ee382e72f8a5fb69e337a3fcc51fc0914883
the value changed to the complete path of the community-profile, e.g.
"/etc/config/profile_berlin". This causes lookup problems on other
pages, like "mod-freifunk -> overview -> index" (view/freifunk/index.htm line37, line 54).
And as the option suggests it's the community-name not the community-profile path.

Signed-off-by: Sven Roederer devel-sven@geroedel.de
4 years agoluci-base: fix syntax error in luci.model.network
Jo-Philipp Wich [Tue, 26 Apr 2016 19:02:51 +0000 (21:02 +0200)]
luci-base: fix syntax error in luci.model.network

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-base: add more ignore patterns to luci.model.network
Jo-Philipp Wich [Tue, 26 Apr 2016 19:01:08 +0000 (21:01 +0200)]
luci-base: add more ignore patterns to luci.model.network

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoluci-base: fix luci.model.network.ignore_interface()
Jo-Philipp Wich [Tue, 26 Apr 2016 18:54:52 +0000 (20:54 +0200)]
luci-base: fix luci.model.network.ignore_interface()

Fix the underlying _iface_ignore() function to not ignore virtual interfaces,
in order to let ignore_interface() return true for PPP and similar devices.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoMerge pull request #706 from KevinOConnor/anonidentity-20160407
Manuel Munz [Mon, 25 Apr 2016 14:06:10 +0000 (16:06 +0200)]
Merge pull request #706 from KevinOConnor/anonidentity-20160407

luci-mod-admin-full: Add option to set anonymous_identity field

4 years agoluci-mod-admin-full: fix wrong dsl stats visualization 703/head
Luca Debernardi [Mon, 18 Apr 2016 19:18:52 +0000 (21:18 +0200)]
luci-mod-admin-full: fix wrong dsl stats visualization

This patch fixes the wrong visualization of Noise Margin (SNR) and Signal Attenuation (SATN) stats

Signed-off-by: Luca Debernardi <luca.debernardi@gmail.com>
4 years agoluci-base: read odhcpd leasefile location via uci
Hannu Nyman [Sun, 17 Apr 2016 09:10:24 +0000 (12:10 +0300)]
luci-base: read odhcpd leasefile location via uci

Check the location of the odhcpd leasefile from /etc/config/dhcp
via uci. Fallback to the default location.

This fixes #702

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-transmission: remove dependency on transmission-daemon
Hannu Nyman [Sat, 16 Apr 2016 09:14:53 +0000 (12:14 +0300)]
luci-app-transmission: remove dependency on transmission-daemon

transmission-daemon was split to -openssl and -polarssl variants,
so the old dependency needs to be removed.

luci-app-transmission will not install the transmission package
from now on. Instead the required transmission-daemon variant
needs to be installed separately.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #700 from chris5560/master
Christian Schoenebeck [Sat, 9 Apr 2016 17:46:11 +0000 (19:46 +0200)]
Merge pull request #700 from chris5560/master

fix problem not correctly handling "Bind Network" field

4 years agofix problem not correctly handling "Bind Network" field 700/head
Christian Schoenebeck [Sat, 9 Apr 2016 17:44:08 +0000 (19:44 +0200)]
fix problem not correctly handling "Bind Network" field

- fix problem not correctly handling "Bind Network" field #699
- some german translation extensions

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
4 years agoMerge pull request #698 from cshore/pull-request-fix-lib-depends
Hannu Nyman [Fri, 8 Apr 2016 06:24:38 +0000 (09:24 +0300)]
Merge pull request #698 from cshore/pull-request-fix-lib-depends

luci-base: utils: Make checklib return a boolean

4 years agoluci-base: utils: Make checklib return a boolean 698/head
Daniel Dickinson [Tue, 29 Mar 2016 14:18:22 +0000 (10:18 -0400)]
luci-base: utils: Make checklib return a boolean

Using tristate is counter-intuitive and probably doesn't provide a lot
of benefit so we use a boolean and treat "don't know" as false (because
it is safer than showing options that are not actually available).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-mod-admin-full: Add option to set anonymous_identity field 706/head
Kevin O'Connor [Thu, 7 Apr 2016 16:09:00 +0000 (12:09 -0400)]
luci-mod-admin-full: Add option to set anonymous_identity field

Add support for setting the "anonymous_identity" field on EAP type
networks.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
4 years agoMerge pull request #692 from oskarirauta/master
Jo-Philipp Wich [Fri, 1 Apr 2016 12:31:10 +0000 (14:31 +0200)]
Merge pull request #692 from oskarirauta/master

Update network.lua

4 years agoUpdate network.lua 692/head
Oskari Rauta [Fri, 1 Apr 2016 04:15:11 +0000 (04:15 +0000)]
Update network.lua

Fix display of WAN status when WAN is provided by using WWAN device or similar with other similar similar methods.
Explanation:
Before this, protocol was fetched from /etc/config/network for interface which often is wan_4 - but protocol is configured in file as wan, and therefore protocol is always none, since configuration is made for wan and then setup as wan_4 and possibly wan_6 if ipv6 is being used. This commit uses ubus to get used active protocol. For example, in case of qmi, it displays protocol as dhcp since even if I configured wan to use qmi, dhcp was used as a protocol for getting IP address.

4 years agoluci-app-firewall: capitalize weekday names (#691)
Jo-Philipp Wich [Thu, 31 Mar 2016 12:27:29 +0000 (14:27 +0200)]
luci-app-firewall: capitalize weekday names (#691)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoMerge pull request #688 from Wedmer/master
Hannu Nyman [Wed, 30 Mar 2016 12:29:01 +0000 (15:29 +0300)]
Merge pull request #688 from Wedmer/master

[luci-app-openvpn] Optimized code and added suggested fix from #650

4 years agotimezone data: update to 2016c
Hannu Nyman [Wed, 30 Mar 2016 08:30:36 +0000 (11:30 +0300)]
timezone data: update to 2016c

Update timezone data to 2016c.

2016b: http://mm.icann.org/pipermail/tz-announce/2016-March/000036.html

   Changes affecting future time stamps

     New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
     Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04
     on 2016-03-27 at 02:00 local time.  They need distinct zones since
     their post-1970 histories disagree.  New zone Asia/Barnaul for Altai
     Krai and Altai Republic, Russia, which will switch from +06 to +07
     on the same date and local time.  Also, Asia/Sakhalin moves from +10
     to +11 on 2016-03-27 at 02:00.

     As a trial of a new system that needs less information to be made up,
     the new zones use numeric time zone abbreviations like "+04"
     instead of invented abbreviations like "ASTT".

     Haiti will not observe DST in 2016.

     Palestine's spring-forward transition on 2016-03-26 is at 01:00,
     not 00:00. Guess future transitions will be March's last Saturday
     at 01:00, not March's last Friday at 24:00.

2016c: http://mm.icann.org/pipermail/tz-announce/2016-March/000037.html

   Changes affecting future time stamps

     Azerbaijan no longer observes DST.

     Chile reverts from permanent to seasonal DST.
     Guess that future transitions are August's and May's second
     Saturdays at 24:00 mainland time.  Also, call the period from
     2014-09-07 through 2016-05-14 daylight saving time instead of
     standard time, as that seems more appropriate now.

Note for Openwrt usage:

Either musl or busybox does not like the new timezone format.
Although the rule looks ok in /etc/TZ, timezone is interpreted wrongly
by date, uptime etc. "Old timezones" are handle correctly, but these
new "<+04>-4" style zones do not work. Example below:

Europe/Helsinki
 root@OpenWrt:~# cat /etc/TZ
 EET-2EEST,M3.5.0/3,M10.5.0/4
 root@OpenWrt:~# uptime
  11:00:52 up 18:17,  load average: 0.43, 0.13, 0.11
 root@OpenWrt:~# date
 Wed Mar 30 11:00:55 EEST 2016

Europe/Astrakhan
 ( Time is showed as GMT instead of the correct zone and
   zone name is parsed wrongly )
 root@OpenWrt:~# cat /etc/TZ
 <+04>-4
 root@OpenWrt:~# uptime
  08:02:52 up 18:19,  load average: 0.17, 0.18, 0.13
 root@OpenWrt:~# date
 Wed Mar 30 08:02:59 +04>-4 2016

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #681 from cshore/pull-request-wifi-interface-name
Hannu Nyman [Tue, 29 Mar 2016 12:44:48 +0000 (15:44 +0300)]
Merge pull request #681 from cshore/pull-request-wifi-interface-name

luci-mod-admin-full: Add option to set wireless interface name

4 years agoMerge pull request #680 from cshore/pull-request-dnsmasq-options
Hannu Nyman [Tue, 29 Mar 2016 12:42:45 +0000 (15:42 +0300)]
Merge pull request #680 from cshore/pull-request-dnsmasq-options

luci-mod-admin-full: various dnsmasq options

4 years agoMerge pull request #679 from cshore/pull-request-dnsmasq-dnssec
Hannu Nyman [Tue, 29 Mar 2016 12:41:56 +0000 (15:41 +0300)]
Merge pull request #679 from cshore/pull-request-dnsmasq-dnssec

Pull request dnsmasq dnssec

4 years agoMerge pull request #678 from cshore/pull-request-lib-depends
Hannu Nyman [Tue, 29 Mar 2016 12:33:00 +0000 (15:33 +0300)]
Merge pull request #678 from cshore/pull-request-lib-depends

luci-base: Add option to check linked libraries

4 years agoMerge pull request #690 from stweil/master
Hannu Nyman [Tue, 29 Mar 2016 07:18:06 +0000 (10:18 +0300)]
Merge pull request #690 from stweil/master

Fix some typos found by codespell

4 years agoapplications/luci-app-ddns: Fix typos (found by codespell) 690/head
Stefan Weil [Sat, 26 Mar 2016 09:19:25 +0000 (10:19 +0100)]
applications/luci-app-ddns: Fix typos (found by codespell)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
4 years agoapplications/luci-app-coovachilli: Fix typos (found by codespell)
Stefan Weil [Sat, 26 Mar 2016 09:17:09 +0000 (10:17 +0100)]
applications/luci-app-coovachilli: Fix typos (found by codespell)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
4 years agoMerge pull request #686 from cshore/pull-request-stastiscs-df
Hannu Nyman [Mon, 28 Mar 2016 19:23:57 +0000 (22:23 +0300)]
Merge pull request #686 from cshore/pull-request-stastiscs-df

luci-app-statistics: Fix disk usage graphing

4 years agoMerge pull request #689 from stweil/master
Hannu Nyman [Mon, 28 Mar 2016 18:18:36 +0000 (21:18 +0300)]
Merge pull request #689 from stweil/master

Fix some typos found by codespell

4 years agodocumentation: Fix typos (found by codespell) 689/head
Stefan Weil [Sat, 26 Mar 2016 09:11:33 +0000 (10:11 +0100)]
documentation: Fix typos (found by codespell)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
4 years agobuild/luadoc: Fix typos (found by codespell)
Stefan Weil [Sat, 26 Mar 2016 09:09:27 +0000 (10:09 +0100)]
build/luadoc: Fix typos (found by codespell)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
4 years agoapplications/luci-app-asterisk: Fix typos (found by codespell)
Stefan Weil [Sat, 26 Mar 2016 09:08:41 +0000 (10:08 +0100)]
applications/luci-app-asterisk: Fix typos (found by codespell)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
4 years ago[luci-app-openvpn] Optimized code and added suggested fix from #650 688/head
Vladimir Ulrich [Fri, 25 Mar 2016 16:28:35 +0000 (19:28 +0300)]
[luci-app-openvpn] Optimized code and added suggested fix from #650
Signed-off-by: Vladimir Ulrich <admin@evl.su>
4 years agoluci-app-statistics: Fix disk usage graphing 686/head
Daniel Dickinson [Fri, 25 Mar 2016 08:04:58 +0000 (04:04 -0400)]
luci-app-statistics: Fix disk usage graphing

Disk usage graphing was broken.  This fixes it.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-mod-admin-full: Add option to set wireless interface name 681/head
Daniel Dickinson [Fri, 25 Mar 2016 07:17:49 +0000 (03:17 -0400)]
luci-mod-admin-full: Add option to set wireless interface name

With mac80211 you can set the wireless interface;
expose this capability.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-mod-admin-full: various dnsmasq options 680/head
Daniel Dickinson [Fri, 25 Mar 2016 07:14:39 +0000 (03:14 -0400)]
luci-mod-admin-full: various dnsmasq options

Add some missing dnsmasq options.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-mod-admin-full: Add DNSSEC dnsmasq option 679/head
Daniel Dickinson [Fri, 25 Mar 2016 07:09:59 +0000 (03:09 -0400)]
luci-mod-admin-full: Add DNSSEC dnsmasq option

If dnsmasq with DNSSEC support is enabled, display options
to enable DNSSEC.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-base: Add option to check linked libraries 678/head
Daniel Dickinson [Fri, 25 Mar 2016 07:04:18 +0000 (03:04 -0400)]
luci-base: Add option to check linked libraries

Some packages have different variants that have different
capabilities depending on which libraries against which
they are linked.  Add a function to check which library a
binary links against in order to determine available
functionality.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
4 years agoluci-mod-admin-full: Enable reset in Luci also for ubi
Hannu Nyman [Wed, 23 Mar 2016 14:58:14 +0000 (16:58 +0200)]
luci-mod-admin-full: Enable reset in Luci also for ubi

Enable reset in LuCI also for ubi based firmwares.

This closes #672

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoi18n: sync translations
Hannu Nyman [Mon, 21 Mar 2016 10:46:46 +0000 (12:46 +0200)]
i18n: sync translations

Sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: fix bug in util.lua in 'shellsqescape'
Hannu Nyman [Sun, 20 Mar 2016 11:12:05 +0000 (13:12 +0200)]
luci-base: fix bug in util.lua in 'shellsqescape'

Fix a bug introduced by #561

Function 'shellsqescape' calls 'gsub' with the empty result string 'res'
instead of the actual parameter 'value'. This leads into error:
.../util.lua:160: bad argument #1 to 'gsub' (string expected, got nil)

Fix error by passing the correct parameter to the function.

After the fix, the unmount button introduced by #561 finally works.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-mod-admin-full: Fix dhcpv6 ra_management option stateless value
Hannu Nyman [Sat, 19 Mar 2016 13:38:41 +0000 (15:38 +0200)]
luci-mod-admin-full: Fix dhcpv6 ra_management option stateless value

Fix dhcpv6 ra_management option's handling of "stateless" value.
Default value for the option is 1, so trying to store ""
instead of "0" for stateless is not working.

This fixes #676

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-mod-admin-full: allow writing empty crontab config
Florian Eckert [Wed, 16 Mar 2016 10:08:16 +0000 (11:08 +0100)]
luci-mod-admin-full: allow writing empty crontab config

Write an empty crontab file to remove all content
from file /etc/crontabs/root

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
4 years agoluci-mod-admin-full: add sleep before sysupgrade
Jo-Philipp Wich [Thu, 17 Mar 2016 14:55:02 +0000 (15:55 +0100)]
luci-mod-admin-full: add sleep before sysupgrade

- Under some conditions the system will shutdown
  uhttpd before the page will be delivered to
  the client. Waiting one second should eleminate
  this behaviour.

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoMerge pull request #655 from hnyman/nat6
Jo-Philipp Wich [Thu, 17 Mar 2016 14:32:26 +0000 (15:32 +0100)]
Merge pull request #655 from hnyman/nat6

Add support for showing ipv6 NAT table in Luci

4 years agoAdd support for showing ipv6 NAT table in Luci 655/head
Hannu Nyman [Wed, 16 Mar 2016 13:50:00 +0000 (15:50 +0200)]
Add support for showing ipv6 NAT table in Luci

When kmod-nf-nat6 and kmod-ipt-nat6 are installed, the firewall has also
the 'nat' table for ipv6, and packages like 'adblock' utilize that table.

Currently that table is not shown on the Luci firewall status page,
although it is visible by 'ip6tables -L -v -t nat' from console.

Detect 'nat' table's presence from /proc/net/ip6_tables_names

Show 'nat' table in Status->Firewall->IPv6 if that table is present.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-radvd: mark BROKEN as radvd is still in oldpackages
Hannu Nyman [Sat, 12 Mar 2016 09:26:26 +0000 (11:26 +0200)]
luci-app-radvd: mark BROKEN as radvd is still in oldpackages

Mark luci-app-radvd BROKEN as it has dependency to radvd,
which is still in oldpackages repo.

This commit fixes #553

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: Include Openwrt build revision in displayed version string
Hannu Nyman [Fri, 11 Mar 2016 12:09:39 +0000 (14:09 +0200)]
luci-base: Include Openwrt build revision in displayed version string

The version string displayed in the footer and the overview page contains
both LuCI and Openwrt versions. But due to differences in the contents
of /etc/openwrt_release the exact Openwrt revision r..... may be missing:
* In trunk that revision is included in the DISTRIB_DESCRIPTION field that
  is displayed in Luci as the Openwrt version.
* In release branches, that field contains the release number like 15.05.

Revision number is always present in DISTRIB_REVISION field, so add the
revision from that field in case the revision is not already present
in the string.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #669 from hnyman/git-branch
Jo-Philipp Wich [Fri, 11 Mar 2016 11:23:37 +0000 (12:23 +0100)]
Merge pull request #669 from hnyman/git-branch

LuCI: Display the proper LuCI git branch in GUI

4 years agoLuCI: Display the proper LuCI git branch in GUI 669/head
Hannu Nyman [Thu, 10 Mar 2016 17:50:58 +0000 (19:50 +0200)]
LuCI: Display the proper LuCI git branch in GUI

Adjust luci.mk and luci-base to find out correctly if Luci is built
from master or from a branch. Display that value in the footer and
the overview page.

* Evaluate the git branch in luci.mk and pass that to LuCI submodules
  as a make variable. Use branch name, ignore tags.
* Deprecate svn detection in luci-base's mkversion.sh that generates
  version.lua. Simply use the value passed by make.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #665 from hauke/lantiq-dsl
Jo-Philipp Wich [Tue, 8 Mar 2016 10:02:02 +0000 (11:02 +0100)]
Merge pull request #665 from hauke/lantiq-dsl

add configuration for the DSL line

4 years agoMerge pull request #666 from chris5560/master
Christian Schoenebeck [Mon, 7 Mar 2016 20:08:42 +0000 (21:08 +0100)]
Merge pull request #666 from chris5560/master

luci-app-polipo: fix Parent proxy address field check

4 years agoluci-app-polipo: fix Parent proxy address field check 666/head
Christian Schoenebeck [Mon, 7 Mar 2016 20:06:55 +0000 (21:06 +0100)]
luci-app-polipo: fix Parent proxy address field check

fix Parent proxy address field check https://dev.openwrt.org/ticket/15680

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
4 years agoluci-mod-admin-full: add dsl configuration 665/head
Hauke Mehrtens [Sun, 28 Feb 2016 14:20:37 +0000 (15:20 +0100)]
luci-mod-admin-full: add dsl configuration

This makes it possible to configure the DSL line from luci.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
4 years agoluci-mod-admin-full: extend dsl stats
Hauke Mehrtens [Sat, 27 Feb 2016 19:50:51 +0000 (20:50 +0100)]
luci-mod-admin-full: extend dsl stats

This adds a lot of new status information about the dsl line.
It now looks like this on a Telekom line:

Status: UP
Line State: showtime_tc_sync [0x801]
Line Mode: G.993.2 (VDSL2)
Annex: B
Profile: 17a
Data Rate: 51.391 Mb/s / 10.046 Mb/s
Max. Attainable Data Rate (ATTNDR): 63.817 Mb/s / 23.908 Mb/s
Latency: 4.0 ms / 8.0 ms
Line Attenuation (LATN): 10.5 dB / 9.9 dB
Signal Attenuation (SATN): 8.2 dB / 14.4 dB
Noise Margin (SNR): 10.5 dB / 9.7 dB
Aggregate Transmit Power(ACTATP): -14 dB / 12.4 dB
Forward Error Correction Seconds (FECS): 1 / 1723485
Errored seconds (ES): 0 / 2477
Severely Errored Seconds (SES): 0 / 50
Loss of Signal Seconds (LOSS): 0 / 0
Unavailable Seconds (UAS): 31 / 31
Header Error Code Errors (HEC): 0 / 0
Non Pre-emtive CRC errors (CRC_P): 0 / 0
Pre-emtive CRC errors (CRCP_P): 0 / 0
Line Uptime: 2m 3s
ATU-C System Vendor ID: Broadcom 176.15
Power Management Mode: L0 - Synchronized

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
4 years agoluci-mod-admin-full: rename ADSL to DSL
Hauke Mehrtens [Sat, 27 Feb 2016 19:47:15 +0000 (20:47 +0100)]
luci-mod-admin-full: rename ADSL to DSL

This could also be a VDSL link

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
4 years agoMerge pull request #664 from chris5560/master
Christian Schoenebeck [Mon, 7 Mar 2016 09:57:44 +0000 (10:57 +0100)]
Merge pull request #664 from chris5560/master

luci-app-ddns: fixes because uclient-fetch support "force ip version"

4 years agoluci-app-ddns: fixes because uclient-fetch support "force ip version" 664/head
Christian Schoenebeck [Mon, 7 Mar 2016 09:56:07 +0000 (10:56 +0100)]
luci-app-ddns: fixes because uclient-fetch support "force ip version"

- corrections because uclient-fetch now support "force ip version"
- remove translations already part of base.po/base.pot

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
4 years agoMerge pull request #659 from NeoRaider/default-language
Jo-Philipp Wich [Tue, 1 Mar 2016 16:54:49 +0000 (17:54 +0100)]
Merge pull request #659 from NeoRaider/default-language

modules/base: dispatcher: use default language if automatic choice fails

4 years agomodules/base: dispatcher: use default language if automatic choice fails 659/head
Matthias Schiffer [Tue, 1 Mar 2016 16:25:55 +0000 (17:25 +0100)]
modules/base: dispatcher: use default language if automatic choice fails

Fall back to default language if "auto" is configured, but none provided by
the browser matches.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
4 years agoremove bensheim and heppenheim as requested here: https://github.com/freifunk/meshkit...
Manuel Munz [Mon, 29 Feb 2016 18:17:20 +0000 (19:17 +0100)]
remove bensheim and heppenheim as requested here: https://github.com/freifunk/meshkit/issues/20

4 years agoMerge pull request #653 from tsl0922/tsl0922-patch-1
Hannu Nyman [Mon, 29 Feb 2016 08:49:22 +0000 (10:49 +0200)]
Merge pull request #653 from tsl0922/tsl0922-patch-1

luci-theme-material: remove the double slash (//) from menu url

4 years agoluci-app-adblock: conform to adblock 0.90
Hannu Nyman [Sun, 28 Feb 2016 21:03:14 +0000 (23:03 +0200)]
luci-app-adblock: conform to adblock 0.90

* Add support for disabling "force DNS queries to local resolver" option
* Remove deprecated logging options

Additionally remove unnecessary rmempty definitions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoi18n: sync translations
Hannu Nyman [Fri, 26 Feb 2016 13:17:01 +0000 (15:17 +0200)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-mod-admin-full: host-specific dhcp lease time option for static hosts
Hannu Nyman [Fri, 26 Feb 2016 11:48:36 +0000 (13:48 +0200)]
luci-mod-admin-full: host-specific dhcp lease time option for static hosts

Enable setting a host-specific lease time for static hosts.
Format is similar as for the default lease time: e.g. 2m, 12h, 3d, infinite

Default lease time is used for all hosts without host-specific definition.

Support for the option was added to Openwrt trunk by r48801:
https://dev.openwrt.org/changeset/48801

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-theme-material: remove the double slash (//) from menu url 653/head
Shuanglei Tao [Thu, 25 Feb 2016 16:38:22 +0000 (00:38 +0800)]
luci-theme-material: remove the double slash (//) from menu url

Signed-off-by: Shuanglei Tao <tsl0922@gmail.com>
4 years agoluci-base: cbi: fix misplaced ID in nullsection template
Jo-Philipp Wich [Wed, 24 Feb 2016 16:40:53 +0000 (17:40 +0100)]
luci-base: cbi: fix misplaced ID in nullsection template

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: also initialize JS if pageactions are disabled
Jo-Philipp Wich [Wed, 24 Feb 2016 16:39:54 +0000 (17:39 +0100)]
luci-base: cbi: also initialize JS if pageactions are disabled

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: fix dependency handling of list and multivalues with radio/checkbox...
Jo-Philipp Wich [Tue, 23 Feb 2016 08:27:12 +0000 (09:27 +0100)]
luci-base: cbi: fix dependency handling of list and multivalues with radio/checkbox widgets

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-adblock: remove deprecated options
Hannu Nyman [Mon, 22 Feb 2016 20:23:05 +0000 (22:23 +0200)]
luci-app-adblock: remove deprecated options

Remove support for options deprecated in adblock 0.80.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-adblock: conform to adblock 0.80
Hannu Nyman [Sun, 21 Feb 2016 15:39:19 +0000 (17:39 +0200)]
luci-app-adblock: conform to adblock 0.80

* Change "debug log" to "log"
* Add support for source descriptions
* Support new options for ping targets
* Simplify link to readme

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: luci.sys: canonicalize src and dest addrs in luci.sys.net.conntrack()
Jo-Philipp Wich [Sat, 20 Feb 2016 21:14:37 +0000 (22:14 +0100)]
luci-base: luci.sys: canonicalize src and dest addrs in luci.sys.net.conntrack()

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-adblock: Add support for optional config values
Hannu Nyman [Sat, 20 Feb 2016 10:34:16 +0000 (12:34 +0200)]
luci-app-adblock: Add support for optional config values

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: cbi: fix button handling for dynamic lists
Jo-Philipp Wich [Fri, 19 Feb 2016 16:20:50 +0000 (17:20 +0100)]
luci-base: cbi: fix button handling for dynamic lists

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-adblock: Beautify blocklist selection table and reorganise
Hannu Nyman [Fri, 19 Feb 2016 10:13:44 +0000 (12:13 +0200)]
luci-app-adblock: Beautify blocklist selection table and reorganise

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #644 from chris5560/master
Christian Schoenebeck [Thu, 18 Feb 2016 18:25:41 +0000 (19:25 +0100)]
Merge pull request #644 from chris5560/master

luci-base: fixed tabbed map when using NamedSection of same type

4 years agoMerge pull request #647 from LuttyYang/master
Hannu Nyman [Thu, 18 Feb 2016 13:06:43 +0000 (15:06 +0200)]
Merge pull request #647 from LuttyYang/master

luci-theme-material: Decrease font and spacing

4 years agoluci-theme-material: Rasterization Code 647/head
Lutty Yang [Thu, 18 Feb 2016 12:34:30 +0000 (20:34 +0800)]
luci-theme-material: Rasterization Code

Signed-off-by: Lutty Yang <lutty@wcan.in>
4 years agoluci-theme-material: Decrease font and spacing
Lutty Yang [Thu, 18 Feb 2016 12:29:19 +0000 (20:29 +0800)]
luci-theme-material: Decrease font and spacing

1) Decrease font and spacing
2) Synchronized to the LUCI version 99f5d4e

Signed-off-by: Lutty Yang <lutty@wcan.in>
4 years agoluci-base: cbi.js: properly round down numbers for %u and %d patterns
Jo-Philipp Wich [Wed, 17 Feb 2016 15:33:34 +0000 (16:33 +0100)]
luci-base: cbi.js: properly round down numbers for %u and %d patterns

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-adblock: User interface for the 'adblock' package
Hannu Nyman [Tue, 16 Feb 2016 20:28:46 +0000 (22:28 +0200)]
luci-app-adblock: User interface for the 'adblock' package

Simple user interface for the 'adblock' package from packages feed.
Adds 'Adblock' item to the Services menu in LuCI.
Allows enabling/disabling the service and selecting blocklists.

Configuration of the blocklist URLs and selection of Shalla categories
needs to be done manually to the config file, if needed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: cbi.js: string formatting fixes
Jo-Philipp Wich [Mon, 15 Feb 2016 11:45:39 +0000 (12:45 +0100)]
luci-base: cbi.js: string formatting fixes

* Fix left and right justify/padding in formats
* Do not emit decimal numbers for small values in %m format

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-firewall: rely on auto-serialization for combobox choices
Jo-Philipp Wich [Wed, 10 Feb 2016 18:38:33 +0000 (19:38 +0100)]
luci-app-firewall: rely on auto-serialization for combobox choices

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: rely on auto-serialization for combobox choices
Jo-Philipp Wich [Wed, 10 Feb 2016 18:36:37 +0000 (19:36 +0100)]
luci-base: cbi: rely on auto-serialization for combobox choices

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: rework ListValue and MultiValue templates
Jo-Philipp Wich [Wed, 10 Feb 2016 18:33:01 +0000 (19:33 +0100)]
luci-base: cbi: rework ListValue and MultiValue templates

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: dispatcher: let attr() automatically serialize JSON
Jo-Philipp Wich [Wed, 10 Feb 2016 18:30:43 +0000 (19:30 +0100)]
luci-base: dispatcher: let attr() automatically serialize JSON

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: properly handle dependant elements without parent
Jo-Philipp Wich [Wed, 10 Feb 2016 18:29:29 +0000 (19:29 +0100)]
luci-base: cbi: properly handle dependant elements without parent

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-base: cbi: only spawn dynlist sub-comboboxes if choices are available
Jo-Philipp Wich [Wed, 10 Feb 2016 17:23:39 +0000 (18:23 +0100)]
luci-base: cbi: only spawn dynlist sub-comboboxes if choices are available

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-firewall: align custom cbi teplates with new code
Jo-Philipp Wich [Wed, 10 Feb 2016 17:13:53 +0000 (18:13 +0100)]
luci-app-firewall: align custom cbi teplates with new code

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>