project/luci.git
8 years agoi18n: sync translations
Hannu Nyman [Mon, 21 Mar 2016 10:59:49 +0000 (12:59 +0200)]
i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
8 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>
(cherry picked from commit 355c21304afb0d388fb8bd6132e0dbcb19f03428)

8 years agoluci-app-adblock: backport the package from master
Hannu Nyman [Wed, 16 Mar 2016 14:15:24 +0000 (16:15 +0200)]
luci-app-adblock: backport the package from master

Backport the luci-app-adblock package from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
8 years agoMerge pull request #674 from feckert/cron_bugfix
Jo-Philipp Wich [Wed, 16 Mar 2016 11:35:07 +0000 (12:35 +0100)]
Merge pull request #674 from feckert/cron_bugfix

luci-mod-admin-full: allow writing empty crontab config

8 years agoMerge pull request #673 from feckert/bugfix_sleep_sysupgrade
Jo-Philipp Wich [Wed, 16 Mar 2016 10:46:48 +0000 (11:46 +0100)]
Merge pull request #673 from feckert/bugfix_sleep_sysupgrade

luci-mod-admin-full: add sleep before sysupgrade

8 years agoluci-mod-admin-full: add sleep before sysupgrade
Florian Eckert [Tue, 15 Mar 2016 14:31:54 +0000 (15:31 +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>
8 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>
8 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>
(cherry picked from commit 50451c4ac53c853cbf2837e7bfbbc1268a440180)

8 years agoLuCI: Display the proper LuCI git branch in GUI
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>
(cherry picked from commit 7553654bb10af9206cff9837a485b828d1998213)

8 years agoFix embedded links: github instead of luci.subsignal.org
Hannu Nyman [Tue, 2 Feb 2016 10:07:16 +0000 (12:07 +0200)]
Fix embedded links: github instead of luci.subsignal.org

Fix links to point into Github repo instead of luci.subsignal.org
 - the hint to file a bug in dispatcher
 - footers of Bootstrap and Freifunk themes

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c2cf5d185587c3ad8d550c39707e744ee2b0811d)

8 years agotimezone data: update to 2016a
Hannu Nyman [Sun, 7 Feb 2016 10:28:16 +0000 (12:28 +0200)]
timezone data: update to 2016a

Update timezone data to 2016a.

http://mm.icann.org/pipermail/tz-announce/2016-January/000035.html

   Changes affecting future time stamps

     America/Cayman will not observe daylight saving this year after all.
     Revert our guess that it would.  (Thanks to Matt Johnson.)

     Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
     (Thanks to Alexander Krivenyshev.)

     Asia/Tehran now has DST predictions for the year 2038 and later,
     to be March 21 00:00 to September 21 00:00.  This is likely better
     than predicting no DST, albeit off by a day every now and then.

   Changes affecting past and future time stamps

     America/Metlakatla switched from PST all year to AKST/AKDT on
     2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)

     America/Santa_Isabel has been removed, and replaced with a
     backward compatibility link to America/Tijuana.  Its contents were
     apparently based on a misreading of Mexican legislation.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 9b5724d39ea7b5da3cec358f26ec2ef698c73690)

8 years agoi18n: Sync translations
Hannu Nyman [Wed, 3 Feb 2016 09:51:35 +0000 (11:51 +0200)]
i18n: Sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
8 years agoluci-app-statistics: Remove usually empty std.dev. graph from ping page
Hannu Nyman [Tue, 2 Feb 2016 12:22:16 +0000 (14:22 +0200)]
luci-app-statistics: Remove usually empty std.dev. graph from ping page

Remove the usually empty standard deviation graph from the ping page.

The graph is empty for most users as collectd measures standard deviation
of individual pings inside the general interval of statistics collection.
Default setting for both ping interval and general collection interval
is 30s in Luci statistics, meaning just 1 ping per interval, which
leads to empty graph.

(To provide relveant data, the ping interval should be 1/4-1/5 of the
general collection interval. Even then the graph does not look very
informative due to different scaling than the latency graph.)

Note that this commit does not change collectd itself, which continues
to collect and calculate also the std.dev. data, which can be fetched
with 'rrdtool' if needed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry-picked from 8f8957f90f2c593e233d867cab48519a2215b8a0)

8 years agoluci-mod-admin-full: prevent crash if channel of sta is unknown (#624)
Jo-Philipp Wich [Sun, 17 Jan 2016 18:04:02 +0000 (19:04 +0100)]
luci-mod-admin-full: prevent crash if channel of sta is unknown (#624)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
8 years agoluci-mod-admin-full: avoid indexing iw.hwmodelist directly
Jo-Philipp Wich [Fri, 15 Jan 2016 13:13:44 +0000 (14:13 +0100)]
luci-mod-admin-full: avoid indexing iw.hwmodelist directly

Prevent a nil field access when hwmodelist is undefined.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
8 years agoMerge pull request #615 from SvenRoederer/for-15.05_openwrt
Hannu Nyman [Tue, 29 Dec 2015 21:40:09 +0000 (23:40 +0200)]
Merge pull request #615 from SvenRoederer/for-15.05_openwrt

[Makefile] make include of luci.mk relative

8 years agobackport [Makefile] make include of luci.mk relative
Sven Roederer [Tue, 29 Dec 2015 14:57:17 +0000 (15:57 +0100)]
backport [Makefile] make include of luci.mk relative
Backport of commit e6ef89307154d496a76c118db7b88aff05b0394b from trunk

Signed-off-by: Sven Roederer devel-sven@geroedel.de
8 years agoluci-mod-admin-full: interface status page / clarify address display
Hannu Nyman [Mon, 21 Dec 2015 21:02:12 +0000 (23:02 +0200)]
luci-mod-admin-full: interface status page / clarify address display

Backport commit e42e5f58651983b9971c2facb08354cc2273dbef
  Copy the changes made by f8d0ba0
  also to the interface details pages in order to clarify display of
  multiple addresses.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agofor-15-05: luci-mod-admin-full: update IPv4/IPv6 list views
Hannu Nyman [Fri, 18 Dec 2015 17:19:36 +0000 (19:19 +0200)]
for-15-05: luci-mod-admin-full: update IPv4/IPv6 list views

Clarify address presentation on the Network/Interfaces page
by backporting f8d0ba00b2ff27dc9e2f10712bc343ae655fbdf9 :
  For better view of 'Interface Overview' IPv4/IPv6 addresses for
  interfaces should be displayed as lists, but not as comma separated
  strings.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agomodules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value)
Sabbir Ahmed [Sat, 12 Sep 2015 09:11:18 +0000 (15:11 +0600)]
modules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value)

9 years agoCONTRIBUTING.md: clarify signed-off-by advice
Hannu Nyman [Tue, 15 Dec 2015 12:37:46 +0000 (14:37 +0200)]
CONTRIBUTING.md: clarify signed-off-by advice

Clarify the signed-off-by advice in CONTRIBUTING.md.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ff2f536dd1473da59ae968e6294c6813d1093c58)

9 years agoCONTRIBUTING.md: Add advice on pull requests
Hannu Nyman [Tue, 29 Sep 2015 07:38:58 +0000 (10:38 +0300)]
CONTRIBUTING.md: Add advice on pull requests

Add advice on pull requests and best practices in working with Github.
Minor corrections & updates.
Adjust to Github 'markdown' syntax.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 0e2c555c30dbc6fc6f48ad3645d6380a3bc98d72)

9 years agofor-15.05 i18n: sync translations
Hannu Nyman [Sun, 6 Dec 2015 11:30:58 +0000 (13:30 +0200)]
for-15.05 i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agocontrib/package/freifunk-policyrouting: remove rc.d symlink
Manuel Munz [Wed, 18 Nov 2015 11:27:20 +0000 (12:27 +0100)]
contrib/package/freifunk-policyrouting: remove rc.d symlink

9 years agofix a typo error in command script shown to users
Ran Bao [Thu, 5 Nov 2015 23:48:47 +0000 (12:48 +1300)]
fix a typo error in command script shown to users

Signed-off-by: Ran Bao <worksev@gmail.com>
(cherry picked from commit 38b7c6cef44b5b8d2a87706a975327c7c7664c49)

9 years agoluci-mod-admin-full: limit interface name length to 15 chars
Hannu Nyman [Thu, 5 Nov 2015 08:54:33 +0000 (10:54 +0200)]
luci-mod-admin-full: limit interface name length to 15 chars

Limit the name of a new interface to 15 characters.
Add a note about the maximum length and the automatic protocol/bridge
prefixes (br-, 6in4-, pppoe- etc.).

Reference to:
https://dev.openwrt.org/ticket/20380
https://github.com/openwrt/luci/issues/507

There is a 15 character limit to the "real" interface name,
enforced both in the firewall and dnsmasq. The real interface name
includes the possible prefix "br-", "6in4-" etc. Example of an error:
  interface name `br-lan_protected' must be shorter than IFNAMSIZ (15)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b1217c88c3566c1bd726bce9203da591af564bcf)

9 years agoluci-app-firewall: limit zone name length to 11 characters
Hannu Nyman [Wed, 28 Oct 2015 11:07:47 +0000 (13:07 +0200)]
luci-app-firewall: limit zone name length to 11 characters

Change the maximum length of a firewall zone name from 14 to 11 characters.

Longer names break iptables rule generation (max. 29 chars are allowed).

XT_EXTENSION_MAXNAMELEN = 29
29 - sizeof("postrouting_") - sizeof("_rule") - sizeof("\0") = 11

References to:
https://github.com/openwrt/luci/issues/507
https://dev.openwrt.org/ticket/20380

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 87b6bb0dafbbe46dc7669356ac3db24aa975c4b7)

9 years agoapplications/asterisk: Remove incorrect dependency
Daniel Dickinson [Tue, 29 Sep 2015 07:47:31 +0000 (03:47 -0400)]
applications/asterisk: Remove incorrect dependency

ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

(cherry picked from commit 91220dac08f9eff27f011fb19d49f1a6ec98bcb0 )

9 years agoMove libubus-lua dependency to luci-base
Jo-Philipp Wich [Tue, 27 Oct 2015 12:09:03 +0000 (13:09 +0100)]
Move libubus-lua dependency to luci-base

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-diag-devinfo: mark broken due to dependencies
Hannu Nyman [Tue, 27 Oct 2015 07:57:57 +0000 (09:57 +0200)]
luci-app-diag-devinfo: mark broken due to dependencies

Mark luci-app-diag-devinfo @BROKEN as it has several failing dependencies:

Four dependencies from "oldpackages":
 httping, mac-to-devinfo, smap-to-devinfo, netdiscover-to-devinfo

One dependency from "abandoned":
 smap

(netdiscover is currently ok in trunk, but not in 15.05.)

Reference to Luci issue #523.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ec6ccf1cd3225b51b958b38c7439f1dea8c28457)

9 years agoluci-app-statistics: Adjust ping graphs to show target hosts separately
Hannu Nyman [Sun, 25 Oct 2015 08:19:26 +0000 (10:19 +0200)]
luci-app-statistics: Adjust ping graphs to show target hosts separately

Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).

Clarify the plugin definition with some additional line spacing.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 53d767de5ea8c596936fbf0bddce357efe0c4425)

9 years agoluci-app-statistics: improve scaling of the associated stations graph
Hannu Nyman [Sun, 25 Oct 2015 08:11:35 +0000 (10:11 +0200)]
luci-app-statistics: improve scaling of the associated stations graph

Improve scaling of the associated stations graph on the wireless page.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit dccf4859221c79718f08eeb085aefa866492427c)

9 years agoluci-app-statistics: backport 'reorder interface and netlink datasources'
Hannu Nyman [Sat, 24 Oct 2015 10:39:36 +0000 (13:39 +0300)]
luci-app-statistics: backport 'reorder interface and netlink datasources'

Backport from commit 78c61d6d the interface and netlink plugin changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-statistics: add support for sorting RRD data sources
Jo-Philipp Wich [Mon, 5 Oct 2015 17:11:13 +0000 (19:11 +0200)]
luci-app-statistics: add support for sorting RRD data sources

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c8c4a343c2e7ab2f7af00531d0c2fd30c33e51b4)

9 years agoluci-app-statistics: improve diagram generation, add missing title
Jo-Philipp Wich [Sat, 3 Oct 2015 13:30:59 +0000 (15:30 +0200)]
luci-app-statistics: improve diagram generation, add missing title

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c10a7380bf91d0d78ab55471d6becc501752602f)

9 years agoluci-app-statistics: rework graph label handling
Jo-Philipp Wich [Sat, 3 Oct 2015 13:29:25 +0000 (15:29 +0200)]
luci-app-statistics: rework graph label handling

Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit 96b031bbad59555cb2523a3cab1d0a058b39455b)

9 years agoBackport luci-base: filter invalid opkg status lines
Hannu Nyman [Sat, 24 Oct 2015 06:40:55 +0000 (09:40 +0300)]
Backport luci-base: filter invalid opkg status lines

Backport of commit 6b3f804 from trunk.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agofor-15.05 opkg/packages: Show package size in list of available packages
Hannu Nyman [Wed, 16 Sep 2015 09:47:48 +0000 (12:47 +0300)]
for-15.05 opkg/packages: Show package size in list of available packages

CC15.05 opkg was patched by https://dev.openwrt.org/changeset/47196
to support the --size option. This commit backports the Luci features:

Add package *.ipk size information to package listing in Luci,
as opkg was today extended to support listing also the size information.
Visible fields are now: name, version, size, description

That will help users considering installation of a certain package
to assess its size impact on flash.

Note: Opkg data includes the size of the .ipk file, not the expanded size.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3288fe76ab3d2269abcf902d0df6f847c6200e8e)

9 years agofor-15.05: Sync translations
Hannu Nyman [Tue, 13 Oct 2015 10:00:37 +0000 (13:00 +0300)]
for-15.05: Sync translations

Sync translations to the current strings.

Changes in luci-app-ddns, luci-app-statistics and luci-base

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci.mk: correct SK language name to Slovak
Hannu Nyman [Tue, 13 Oct 2015 07:13:50 +0000 (10:13 +0300)]
luci.mk: correct SK language name to Slovak

SK language code refers to Slovak, not Slovene.
Native language name is correct.

References:
https://forum.openwrt.org/viewtopic.php?id=60235
https://en.wikipedia.org/wiki/Slovak_language

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1d37c9c25dbe69967a2d71495109380299974aa8)

9 years agoluci-app-statistics: reorganise menu items
Hannu Nyman [Mon, 12 Oct 2015 11:23:10 +0000 (14:23 +0300)]
luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit da5b25187b245883fa52d569970a6f5810330954)

9 years agoluci-base: change index.html to be more like current themes
Hannu Nyman [Mon, 12 Oct 2015 11:18:00 +0000 (14:18 +0300)]
luci-base: change index.html to be more like current themes

Change index.html that is visible for a second when entering Luci:
* Black text on white background (instead of white on black)
* Specify font as Arial/Helvetica

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b6fe9a70e6a3182b0d4bc7c7071c59b242402a05)

9 years agoluci-base: Add cache control in index.html
nightcoffee [Mon, 12 Oct 2015 11:17:02 +0000 (14:17 +0300)]
luci-base: Add cache control in index.html

Signed-off-by: Night Coffee <ydkf@qq.com>
(cherry picked from commit 08a38a0493465a933687f79542f7f9dca3d6a816)

9 years agoTimezone information: update to 2015g
Hannu Nyman [Mon, 12 Oct 2015 07:58:09 +0000 (10:58 +0300)]
Timezone information: update to 2015g

Changes in 2015g:
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html

     Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

     Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

     Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.

Note: the Turkey-related one-time rule change is not apparently catched by
the zoneinfo2lua script, so that change is not included in this commit.
(Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2cfd11b27268b21adc3ed126fb2b6c90da604528)

9 years agoluci-mod-admin-full: status: survive broken DSL status output
Jo-Philipp Wich [Sat, 3 Oct 2015 14:11:11 +0000 (16:11 +0200)]
luci-mod-admin-full: status: survive broken DSL status output

Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: only render index view for more than one instance
Jo-Philipp Wich [Sat, 3 Oct 2015 09:40:09 +0000 (11:40 +0200)]
luci-app-statistics: only render index view for more than one instance

If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options
Oliver Middleton [Sun, 27 Sep 2015 23:49:47 +0000 (00:49 +0100)]
luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

no-hosts does not disable addn-hosts.

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
(cherry picked from commit 0857aaa28b79c9ede1029aa9ce3160e92473f4d7)

9 years agofor-15.05 luci-base: set default mediaurlbase to bootstrap (default theme)
Hannu Nyman [Sun, 27 Sep 2015 07:01:36 +0000 (10:01 +0300)]
for-15.05 luci-base: set default mediaurlbase to bootstrap (default theme)

The mediaurlbase option in the default /etc/config/luci still points
to the old openwrt.org theme that is not installed by default.
The discrepancy was noted in the commit message for 55ab4e4ce22

After 55ab4e4ce22 the installed theme's uci-defaults script will correct
the setting at first boot, but we should not have a deprecated theme as
the default value. Set the default value to the default theme 'bootstrap'.

Related old discussion at #302

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1209ab6ba617c5bf3a97a91653ea9210e07cf3af)

9 years agofor-15.05 luci-mod-admin-full: opkg config / prevent word-wrap
Hannu Nyman [Sat, 26 Sep 2015 18:06:46 +0000 (21:06 +0300)]
for-15.05 luci-mod-admin-full: opkg config / prevent word-wrap

Prevent word-wrap on the config input areas. Especially the feed
definition lines can be long, and automatic word-wrap can decrease
clarity.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c91a5eb2c49e583717913ca9da45b9175567649a)

9 years agofor-15.05 luci-mod-admin-full: restore opkg feed config capability
Hannu Nyman [Sat, 26 Sep 2015 18:04:10 +0000 (21:04 +0300)]
for-15.05 luci-mod-admin-full: restore opkg feed config capability

opkg config change from r46491 was backported to CC15.05
by https://dev.openwrt.org/changeset/46848/

Existing /etc/opkg.conf was split to three:
   /etc/opkg.conf -> base opkg configuration
   /etc/opkg/distfeeds.conf -> default Openwrt package feeds
   /etc/opkg/customfeeds.conf -> custom package feeds

Since then the actual feed definitions have not been visible/configurable,
as only /etc/opkg.conf has been visible in Luci.

This patch restores the capability to see and edit package feed definitions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit a42c0bb6182fdde7591d1f1b163a9a3354b45f5a)

9 years agofor-15.05 luci-app-firewall: use maxlength datatype for zone name validation
Hannu Nyman [Sat, 26 Sep 2015 17:33:46 +0000 (20:33 +0300)]
for-15.05 luci-app-firewall: use maxlength datatype for zone name validation

Backport from trunk the zonename validation using
a compound datatype "and(uciname,maxlength(14))"

fw3 sets the maximum length of the zone name to 14 and
ignores zone definitions with too long names.
Add a simple validation to ensure that the new zone name is short enough.

Backport of 34e875b3 and edc58332

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #486 from dwmw2/for-15.05
Jo-Philipp Wich [Tue, 22 Sep 2015 21:04:34 +0000 (23:04 +0200)]
Merge pull request #486 from dwmw2/for-15.05

luci/statistics: Fix nut UPS graphs

9 years agoluci/statistics: Fix nut UPS graphs
David Woodhouse [Thu, 17 Sep 2015 10:35:38 +0000 (11:35 +0100)]
luci/statistics: Fix nut UPS graphs

At some point since I last checked, the nut plugin for collectd changed the
names of the timeleft and percent datasets. Update the luci module to match
so that those graphs are generated correctly again.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
(cherry picked from commit 41ec4c68adf7e6545aa10b359fea1883bec79b3e)

9 years agoMerge pull request #474 from hnyman/entropy-1505
Hannu Nyman [Tue, 15 Sep 2015 07:51:42 +0000 (10:51 +0300)]
Merge pull request #474 from hnyman/entropy-1505

for-15.05 statistics: Backport entropy support, config cleanup, init scripts cleanup

9 years agostatistics: remove references to Lucid from scripts
Hannu Nyman [Sun, 30 Aug 2015 11:00:29 +0000 (14:00 +0300)]
statistics: remove references to Lucid from scripts

Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
https://github.com/openwrt/luci/commit/91b97bc9f625d09431dc1c753209a037d7c42fbc

Changes to scripts:
* init.d: lucid reference removed,
          /var/etc creation moved earlier (before first possible use)
* uci-defaults: lucid parameters & restart removed
  (but busybox httpd stuff was left intact, although it might be unnecessary)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 0d5070c51089deb448476f1abadcea8e185eaf9b)

9 years agostatistics: adjust default settings to match default plugins
Hannu Nyman [Sat, 29 Aug 2015 08:15:39 +0000 (11:15 +0300)]
statistics: adjust default settings to match default plugins

Adjust default settings to match the plugins installed by default
(default plugins: iwinfo, interface, load)

* disable plugins not installed by default to avoid error messages at start
* remove references to Freifunk interfaces, as most users do not have those

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4f429c5c8d95bdd74a7e005364cb511410caea5e)

9 years agostatistics: cleanup config file
Hannu Nyman [Sat, 29 Aug 2015 07:59:01 +0000 (10:59 +0300)]
statistics: cleanup config file

No functional changes, but the file is reorganised:
* group settings: general settings / output plugins / input plugins
* sort settings inside a group
* remove quotes from option names to match the current uci behaviour
* whitespace corrections

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 6a4226b3d1cd71e5d3abd7219552aa7fb9dd6f65)

9 years agofor-15.05 statistics: Add support for entropy stats
Hannu Nyman [Tue, 15 Sep 2015 07:09:57 +0000 (10:09 +0300)]
for-15.05 statistics: Add support for entropy stats

Backport the addition of statistics on the available entropy
from 7df0df48c006bbe3a8f4f73cd7b0bdc9bec0f80e

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoLuci opkg/packages: Limit version string display to 26 chars
Hannu Nyman [Sat, 5 Sep 2015 08:24:37 +0000 (11:24 +0300)]
Luci opkg/packages: Limit version string display to 26 chars

Many packages currently include a git commit hash in version string.
That makes version strings very long and the version column takes much space
when listing available/installed packages in Luci.

Longest version string is 58 characters (micropython).
85 packages have at least 50 chars and 150 packages at least 40 chars.

Adjust Luci to display max. 26 characters (= luci's own version string).

Longer version strings are cut to: "first 21c" + ".." + "last 3c"

The last 3 chars are used to preserve the possible PKG_REVISION string.
E.g. 'opkg' has only hash+PKG_REVISION, so using only start of the string
might not be optimal.

Examples:

1.3.10-20150302-f2a889564b3a215902622b040a1247af38cb8203-1
1.3.10-20150302-f2a88..3-1

0.1-20150302-654c7d288603f7dae09eb09b57fb67b38c7ac6c3-1
0.1-20150302-654c7d28..3-1

9c97d5ecd795709c8584e972bfdf3aee3a5b846d-7
9c97d5ecd795709c8584e..d-7

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(backport of commit ca75918ff3a9069d9e31fd0a0742ad5be1089309)

9 years agostatistics: fix typo
Hannu Nyman [Wed, 2 Sep 2015 12:40:56 +0000 (15:40 +0300)]
statistics: fix typo

sed -i "s/collected date/collected data/"

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #455 from hnyman/backport-stats
hnyman [Sat, 29 Aug 2015 12:48:31 +0000 (15:48 +0300)]
Merge pull request #455 from hnyman/backport-stats

for-15.05: statistics: Backport recent improvements

9 years agostatistics: clarify CPU/processor graph by removing "idle" from it
Hannu Nyman [Fri, 28 Aug 2015 19:58:16 +0000 (22:58 +0300)]
statistics: clarify CPU/processor graph by removing "idle" from it

Clarify the CPU time consumption graph by removing the "idle" data from it.
Especially with light traffic, removing "idle" enables the graph
to scale better and to properly show the CPU load variations.

If "idle" data needs to be seen, it might be added as a second graph below.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 5ce647746e584bc10ce5238126bd6ec933fcf609)

9 years agostatistics: clarify stats introduction
Hannu Nyman [Fri, 28 Aug 2015 19:48:03 +0000 (22:48 +0300)]
statistics: clarify stats introduction

* Clarify the short explanation on the statistics section's front page.
* Mention the possibility of additional collectd plugins to get more stats.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 01414949359d2725d23c98a00144a64e1f920a4c)

9 years agostatistics: memory plugin - improve graph by better scaling of y-axis
Hannu Nyman [Sun, 23 Aug 2015 18:12:56 +0000 (21:12 +0300)]
statistics: memory plugin - improve graph by better scaling of y-axis

Utilise alt_autoscale_max to make the memory chart y-axis to scale better
for devices with e.g. 128 MB RAM.

Also fix the axis min value to 0.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 9a06498dbdf5f5878d2ce86a4b9ac8abc9173bdc)

9 years agostatistics: support rrdtool's alt_autoscale and alt_autoscale_max options
Hannu Nyman [Sun, 23 Aug 2015 18:02:14 +0000 (21:02 +0300)]
statistics: support rrdtool's alt_autoscale and alt_autoscale_max options

Implement support for alternative scaling of the y-axis.
By default, rrdtool will autoscale to 1,2,5,10,20,50,100,200,... etc.,
which is not always suitable (e.g. memory charts for device with 128 MB).

Rrdtool 1.0.50 already supports alternative autoscaling that creates
a tighter y-axis. Implement graph-level options in Luci statistics to
support those boolean options as "alt_autoscale" and "alt_autoscale_max".

info at http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 86ff4bd3a4a39674c51bd52576a0a87e803a7c53)

9 years agostatistics: cpu graph - add label definitions, add softirq and interrupt stats
Hannu Nyman [Sun, 23 Aug 2015 14:14:22 +0000 (17:14 +0300)]
statistics: cpu graph - add label definitions, add softirq and interrupt stats

CPU plugin in the Luci statistics was missing the label definitions,
so the field labels are like "cpu_system" instead of "System".
Add proper label definitions to CPU (like the other plugins already have).

The statistics graph was also missing softirq and interrupt stats, although colors
for them were defined. Softirq consumes massive amount of CPU especially with
any qos in use, so it is important for the user to see also that data. Add both
softirq and interrupt stats to the graph.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 962cd2c4c1609566e3dd600f41c3bd16ca0276fb)

9 years agoDelete luci-upnp
kdarbyshirebryant [Mon, 22 Jun 2015 17:58:58 +0000 (18:58 +0100)]
Delete luci-upnp

Stop sys upgrade automatically disabling miniupnpd on first boot after upgrade.
I spent a lot of time tracking this behaviour down which only occurs if you have luci-app-upnp installed.

9 years agoMerge pull request #445 from hnyman/for-15.05
Jo-Philipp Wich [Wed, 19 Aug 2015 08:14:53 +0000 (10:14 +0200)]
Merge pull request #445 from hnyman/for-15.05

statistics: fix ping graph label regression

9 years agostatistics: fix ping graph label regression
Hannu Nyman [Wed, 19 Aug 2015 08:10:30 +0000 (11:10 +0300)]
statistics: fix ping graph label regression

Update to collectd 5.4.1 changed the field from "ping" to "value",
which was changed in the graph definition here, but the label definition
was forgotten. Field's label now reads "ping_IPaddr_value".

Correct the label definition to show only IPaddr like the other two graphs.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agohttp.protocol: Support filehandlers for unhandled encodings
Karl Palsson [Tue, 18 Aug 2015 13:59:32 +0000 (13:59 +0000)]
http.protocol: Support filehandlers for unhandled encodings

The setfilehandler() functions used for mime and url encoded message
bodies all operate with a signature of fh(meta, chunk, eof), but for
unhandled encodings, the callback was directly assigned to the sink
function, which has a signature of snk(chunk).  Insert a wrapper to
properly generate the EOF flag, and include a stub "meta" block
providing a virtual "name" and also the original client provided
Content-Type header, to possibly help with taking alternative actions in
the file handler.

The sink function created for raw content decoding also used the wrong
signature for the sink function.

Signed-off-by: Karl Palsson <karlp@remake.is>
9 years agoMerge pull request #442 from hnyman/for-15.05
Christian Schoenebeck [Tue, 18 Aug 2015 07:49:46 +0000 (09:49 +0200)]
Merge pull request #442 from hnyman/for-15.05

for-15:05: Timezone information: update to 2015f

9 years agofor-15:05: Timezone information: update to 2015f
Hannu Nyman [Mon, 17 Aug 2015 19:59:53 +0000 (22:59 +0300)]
for-15:05: Timezone information: update to 2015f

Changes in 2015e and 2015f:
http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html
http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html

     Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
     not 06-13 and 07-18 as we had guessed.

     Assume Cayman Islands will observe DST starting next year, using US rules.
     Although it isn't guaranteed, it is the most likely.

     North Korea switches to +0830 on 2015-08-15.
     The abbreviation remains "KST".

     Uruguay no longer observes DST.

     Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-vnstat: Fix blank graphs for iface names with underscores
Michael Marley [Sun, 12 Jul 2015 15:38:40 +0000 (11:38 -0400)]
luci-app-vnstat: Fix blank graphs for iface names with underscores

The regex used to process the iface query string argument in
vnstat.htm was stripping underscores, which caused the graph not to
display for interfaces with names containing underscores.  This
patch adds the underscore to that regex so that the interface name
will be correct and the graph will be displayed.

Signed-off-by: Michael Marley <michael@michaelmarley.com>
9 years agoFix: A disabled wireless network may be shown as enabled, when multiple networks...
Georgi Valkov [Fri, 17 Jul 2015 23:28:54 +0000 (02:28 +0300)]
Fix: A disabled wireless network may be shown as enabled, when multiple networks are defined on the same radio.

9 years agoFix: Status for disabled wireless networks may display the SSID, BSSID and Mode of...
Georgi Valkov [Fri, 17 Jul 2015 22:22:47 +0000 (01:22 +0300)]
Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio.

9 years agoWhen editing an AP wireless network in LuCI, if one or more STA networks are also...
Georgi Valkov [Fri, 17 Jul 2015 17:03:58 +0000 (20:03 +0300)]
When editing an AP wireless network in LuCI, if one or more STA networks are also present on the same radio, then the channel is locked and cannot be changed for the AP. The case when all STA networks are disabled is not considered. This patch fixes the issue. Disabled networks no longer apply a lock on the channel.

9 years agoWorkaround: saved administration site user and pass may appear on the Wireless config...
Georgi Valkov [Fri, 17 Jul 2015 16:52:24 +0000 (19:52 +0300)]
Workaround: saved administration site user and pass may appear on the Wireless configuration page, replacing the WPA key.

9 years agoluci-mod-rpc: move luci config require into the authentication function (#427)
Jo-Philipp Wich [Wed, 15 Jul 2015 21:25:43 +0000 (23:25 +0200)]
luci-mod-rpc: move luci config require into the authentication function (#427)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-rpc: add missing luci config require
Jo-Philipp Wich [Wed, 15 Jul 2015 20:30:45 +0000 (22:30 +0200)]
luci-mod-rpc: add missing luci config require

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agocontrib/meshwizard: fix LAN with OLSR and DHCP
Manuel Munz [Tue, 7 Jul 2015 10:22:39 +0000 (12:22 +0200)]
contrib/meshwizard: fix LAN with OLSR and DHCP

9 years agocontrib/meshwizard: fix a bug that occured when processing list options in set_defaults()
Manuel Munz [Sat, 4 Jul 2015 23:32:25 +0000 (01:32 +0200)]
contrib/meshwizard: fix a bug that occured when processing list options in set_defaults()

9 years agofix ifname in wifi overview (freifunk public status).
Manuel Munz [Sun, 28 Jun 2015 13:59:53 +0000 (15:59 +0200)]
fix ifname in wifi overview (freifunk public status).

9 years agoFix routes on freifunk public status page
Manuel Munz [Sun, 28 Jun 2015 13:55:37 +0000 (15:55 +0200)]
Fix routes on freifunk public status page

9 years agocontrib/community-profiles/augsburg: Increase leasetime and bandwidth limits
Manuel Munz [Sun, 31 May 2015 14:41:11 +0000 (16:41 +0200)]
contrib/community-profiles/augsburg: Increase leasetime and bandwidth limits

9 years agoapplications/splash: remove set -x from splash.sh
Manuel Munz [Sat, 30 May 2015 23:13:30 +0000 (01:13 +0200)]
applications/splash: remove set -x from splash.sh

9 years agomodules/freifunk: fix basics cbi model
Manuel Munz [Sat, 30 May 2015 21:01:24 +0000 (23:01 +0200)]
modules/freifunk: fix basics cbi model

9 years agoapplications/olsr: change config file download on olsr overview page to use seperate...
Manuel Munz [Sat, 30 May 2015 20:53:11 +0000 (22:53 +0200)]
applications/olsr: change config file download on olsr overview page to use seperate v4 and v6 config files

9 years agocontrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config
Manuel Munz [Sat, 30 May 2015 20:02:05 +0000 (22:02 +0200)]
contrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config

9 years agoapplications/olsr: redirect errors on jsoninfo connects with netcat to /dev/null...
Manuel Munz [Sat, 30 May 2015 19:04:50 +0000 (21:04 +0200)]
applications/olsr: redirect errors on jsoninfo connects with netcat to /dev/null to avoid spamming the log

9 years agoapplications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file
Manuel Munz [Sat, 30 May 2015 18:48:57 +0000 (20:48 +0200)]
applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file

9 years agomeshwizard: use different port (9091) for ipv6 jsoninfo
Manuel Munz [Sat, 30 May 2015 18:45:17 +0000 (20:45 +0200)]
meshwizard: use different port (9091) for ipv6 jsoninfo

9 years agoadd changes that were missing in the last commit
Manuel Munz [Sat, 30 May 2015 15:01:02 +0000 (17:01 +0200)]
add changes that were missing in the last commit

9 years agocontrib/meshwizard: fix interaction with uci in OpenWrt CC, see https://dev.openwrt...
Manuel Munz [Sat, 30 May 2015 14:56:18 +0000 (16:56 +0200)]
contrib/meshwizard: fix interaction with uci in OpenWrt CC, see https://dev.openwrt.org/ticket/19539

9 years agoMerge pull request #418 from chris5560/for-15.05
Christian Schoenebeck [Tue, 16 Jun 2015 19:59:10 +0000 (21:59 +0200)]
Merge pull request #418 from chris5560/for-15.05

[for-15.05] luci-app-radicale: copied from master

9 years ago[for-15.05] luci-app-radicale: copied from master
Christian Schoenebeck [Tue, 16 Jun 2015 15:30:50 +0000 (17:30 +0200)]
[for-15.05] luci-app-radicale: copied from master

Initial release
with fixed function ipkg_ver_compare()

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
9 years agoMerge pull request #415 from chris5560/for-15.05
Jo-Philipp Wich [Tue, 16 Jun 2015 07:55:47 +0000 (09:55 +0200)]
Merge pull request #415 from chris5560/for-15.05

[for-15.05]luci-app-privoxy: update to version 1.0.4-2

9 years agoMerge pull request #417 from fabio70mi/patch-2
Jo-Philipp Wich [Tue, 16 Jun 2015 07:54:36 +0000 (09:54 +0200)]
Merge pull request #417 from fabio70mi/patch-2

Update base.po

9 years agoUpdate base.po
fabio70mi [Mon, 15 Jun 2015 12:40:52 +0000 (14:40 +0200)]
Update base.po

Corrected "Aggironamento Automatico" to "Aggiornamento Automatico"

9 years ago[for-15.05]luci-app-privoxy: update to version 1.0.4-2
Christian Schoenebeck [Sun, 14 Jun 2015 19:03:15 +0000 (21:03 +0200)]
[for-15.05]luci-app-privoxy: update to version 1.0.4-2

* fixed function ipkg_ver_compare()
* add chinese translations (thanks to maz-1) taken from #410

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
9 years agoMerge pull request #412 from chris5560/for-15.05
Christian Schoenebeck [Sun, 14 Jun 2015 18:46:18 +0000 (20:46 +0200)]
Merge pull request #412 from chris5560/for-15.05

[for-15.05] luci-app-ddns: update to 2.2.4-1 (not copied from master)