Commit graph

7589 commits

Author SHA1 Message Date
Manuel Munz
f2ffa30a76 a cleaner solution for disabling dyngw and dyngw_plain in freifunk-policyrouting init 2016-03-26 19:04:39 +01:00
Hannu Nyman
0207cb7a17 i18n: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-03-21 12:59:49 +02:00
Hannu Nyman
2c34a421a9 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 355c21304a)
2016-03-19 15:55:10 +02:00
Hannu Nyman
e8b6cbb530 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>
2016-03-16 16:15:24 +02:00
Jo-Philipp Wich
4a211573d9 Merge pull request #674 from feckert/cron_bugfix
luci-mod-admin-full: allow writing empty crontab config
2016-03-16 12:35:07 +01:00
Jo-Philipp Wich
d710d218c8 Merge pull request #673 from feckert/bugfix_sleep_sysupgrade
luci-mod-admin-full: add sleep before sysupgrade
2016-03-16 11:46:48 +01:00
Florian Eckert
2e4dea8046 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>
2016-03-16 11:38:09 +01:00
Florian Eckert
53b75d4562 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>
2016-03-16 11:08:16 +01:00
Hannu Nyman
f1190e2d07 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 50451c4ac5)
2016-03-11 14:30:24 +02:00
Hannu Nyman
b83942a596 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 7553654bb1)
2016-03-11 14:30:10 +02:00
Hannu Nyman
e2f9172b21 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 c2cf5d1855)
2016-02-12 14:18:25 +02:00
Hannu Nyman
cdcdfd2594 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 9b5724d39e)
2016-02-07 12:36:22 +02:00
Hannu Nyman
80a09b604b i18n: Sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-03 11:51:35 +02:00
Hannu Nyman
a23d69eb71 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 8f8957f90f)
2016-02-02 15:12:33 +02:00
Jo-Philipp Wich
3201903e37 luci-mod-admin-full: prevent crash if channel of sta is unknown (#624)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18 10:18:02 +01:00
Jo-Philipp Wich
31cfd4df4c 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>
2016-01-18 10:18:02 +01:00
Hannu Nyman
956be55671 Merge pull request #615 from SvenRoederer/for-15.05_openwrt
[Makefile] make include of luci.mk relative
2015-12-29 23:40:09 +02:00
Sven Roederer
f80351df6f backport [Makefile] make include of luci.mk relative
Backport of commit e6ef89307154d496a76c118db7b88aff05b0394b from trunk

Signed-off-by: Sven Roederer devel-sven@geroedel.de
2015-12-29 19:15:49 +01:00
Hannu Nyman
6e179419dc luci-mod-admin-full: interface status page / clarify address display
Backport commit e42e5f5865
  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>
2015-12-21 23:02:12 +02:00
Hannu Nyman
b7fe44ab0b for-15-05: luci-mod-admin-full: update IPv4/IPv6 list views
Clarify address presentation on the Network/Interfaces page
by backporting f8d0ba00b2 :
  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>
2015-12-18 19:25:01 +02:00
Sabbir Ahmed
7ad426e54f modules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value) 2015-12-15 23:46:48 +01:00
Hannu Nyman
ce36802229 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 ff2f536dd1)
2015-12-15 14:47:29 +02:00
Hannu Nyman
1902e1454b 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 0e2c555c30)
2015-12-15 14:47:21 +02:00
Hannu Nyman
ab31abd244 for-15.05 i18n: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-06 13:30:58 +02:00
Manuel Munz
4e44955ab2 contrib/package/freifunk-policyrouting: remove rc.d symlink 2015-11-18 12:27:20 +01:00
Ran Bao
7200d69cae fix a typo error in command script shown to users
Signed-off-by: Ran Bao <worksev@gmail.com>
(cherry picked from commit 38b7c6cef4)
2015-11-06 10:04:37 +02:00
Hannu Nyman
5511c29bdf 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 b1217c88c3)
2015-11-05 11:08:50 +02:00
Hannu Nyman
a66c08849a 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 87b6bb0daf)
2015-10-28 13:15:38 +02:00
Daniel Dickinson
4b048cd18c applications/asterisk: Remove incorrect dependency
ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

(cherry picked from commit 91220dac08 )
2015-10-27 16:11:23 +02:00
Jo-Philipp Wich
eb1ff5b8e6 Move libubus-lua dependency to luci-base
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-27 13:11:01 +01:00
Hannu Nyman
d38c2394b9 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 ec6ccf1cd3)
2015-10-27 10:08:47 +02:00
Hannu Nyman
103e5a39b0 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 53d767de5e)
2015-10-26 11:47:25 +02:00
Hannu Nyman
ae4f8d5cd8 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 dccf485922)
2015-10-26 11:47:08 +02:00
Hannu Nyman
18d9c672c0 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>
2015-10-24 13:39:36 +03:00
Jo-Philipp Wich
8a9ff2b210 luci-app-statistics: add support for sorting RRD data sources
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c8c4a343c2)
2015-10-24 13:36:54 +03:00
Jo-Philipp Wich
d4b293bfb0 luci-app-statistics: improve diagram generation, add missing title
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c10a7380bf)
2015-10-24 13:36:07 +03:00
Jo-Philipp Wich
7b3fea1100 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 96b031bbad)
2015-10-24 13:35:45 +03:00
Hannu Nyman
c8b12e7fa9 Backport luci-base: filter invalid opkg status lines
Backport of commit 6b3f804 from trunk.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-10-24 09:40:55 +03:00
Hannu Nyman
ce5c787989 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 3288fe76ab)
2015-10-15 18:02:44 +03:00
Hannu Nyman
3e199390f7 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>
2015-10-13 13:00:37 +03:00
Hannu Nyman
fcc24dbbc2 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 1d37c9c25d)
2015-10-13 10:20:19 +03:00
Hannu Nyman
ce4ee38f46 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 da5b25187b)
2015-10-12 14:23:10 +03:00
Hannu Nyman
321864a213 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 b6fe9a70e6)
2015-10-12 14:18:00 +03:00
nightcoffee
4bff6283af luci-base: Add cache control in index.html
Signed-off-by: Night Coffee <ydkf@qq.com>

(cherry picked from commit 08a38a0493)
2015-10-12 14:17:02 +03:00
Hannu Nyman
94d8e86941 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 2cfd11b272)
2015-10-12 11:18:20 +03:00
Jo-Philipp Wich
8832d534e9 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>
2015-10-03 16:12:24 +02:00
Jo-Philipp Wich
f21eb789e1 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>
2015-10-03 11:41:41 +02:00
Oliver Middleton
af9f093104 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 0857aaa28b)
2015-09-28 12:25:42 +03:00
Hannu Nyman
6787a0aa61 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 55ab4e4ce2

After 55ab4e4ce2 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 1209ab6ba6)
2015-09-27 10:01:36 +03:00
Hannu Nyman
0b72c51475 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 c91a5eb2c4)
2015-09-26 21:10:30 +03:00