Commit graph

7626 commits

Author SHA1 Message Date
Hannu Nyman
13aa5ffb7c Merge pull request #1164 from angusding/patch-5
luci.mk: Update language name for Chinese
2017-05-16 19:22:41 +03:00
amitabha
e18404a1f7 luci.mk: Update language name for Chinese
Rectification of non-standard name for language Chinese.
Signed-off-by: Angus Ding angus.ding@gmail.com
2017-05-11 21:59:38 +08:00
Hannu Nyman
1a4fe7068c Merge pull request #1142 from angusding/patch-2
luci-app-upnp: Update Chinese translation
2017-05-01 17:21:11 +03:00
amitabha
a3062723d3 luci-app-upnp Update Chinese translation
Update Chinese translations.
Signed-off-by: Angus Ding angus.ding@gmail.com
2017-05-01 21:06:21 +08:00
Hannu Nyman
78c1566a1e timezone data: update to 2017b
Update timezone data to 2017b.

http://mm.icann.org/pipermail/tz-announce/2017-February/000045.html
http://mm.icann.org/pipermail/tz-announce/2017-March/000046.html

Key changes in 2017a-2017b:

* Mongolia no longer observes DST.
* Chile's Region of Magallanes moves from -04/-03 to -03 year-round.
* Switch to numeric time zone abbreviations for South America, as
  part of the ongoing project of removing invented abbreviations.
* Haiti resumed observance of DST in 2017.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 54c97738bc)
2017-04-10 22:39:27 +03:00
Christian Schoenebeck
d89b022b97 Merge pull request #935 from chris5560/for-15.05
[for-15.05] luci-app-ddns: support for backported ddns-scripts 2.7.6
2017-01-13 09:54:41 +01:00
Christian Schoenebeck
830d1095eb [for-15.05] luci-app-ddns: adaption to support backported ddns-scripts 2.7.6
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2017-01-11 20:13:55 +01:00
Hannu Nyman
cca792beee Merge pull request #920 from cls1997/patch-1
Update statistics.po
2017-01-05 16:44:45 +02:00
ChenLingshu
9ba4eea12a Update statistics.po
Phrase "system load" right Simplified Chinese translated as "系统负载"
2017-01-05 22:39:13 +08:00
Hannu Nyman
d4bec26286 time zone data: Update to 2016j
Changes:
     Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00.
     This hives off a new zone Europe/Saratov from Europe/Volgograd.

     The new zone Asia/Atyrau for Atyraū Region, Kazakhstan, is like
     Asia/Aqtau except it switched from +04/+05 to +05/+06 in spring
     1999, not fall 1994.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit a7c5c018b6)
2016-12-09 18:14:51 +02:00
Hannu Nyman
90474569d2 time zone data: Update to 2016i
Note that several of the time zones now use a numeric name
that is quoted with < >  (e.g. "<+03>-3")

musl 1.1.15 and earlier have a bug with < > quoted time zone names.
Fix for the bug
* has already been patched in musl upstream with
  http://git.musl-libc.org/cgit/musl/commit/?id=8ca27ac4bfe73bff785d0c26c1de0da92b55e5c6
* has been committed in LEDE with
  671cb35880
* has been submitted to Openwrt as pull request
  https://github.com/openwrt/openwrt/pull/163

Key changes in 2016d-2016i:
---------------------------

2016d:
     America/Caracas switches from -0430 to -04 on 2016-05-01.

     Asia/Magadan switches from +10 to +11 on 2016-04-24.

     New zone Asia/Tomsk, split off from Asia/Novosibirsk.

2016f:
     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24.

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

2016g:
     Turkey switched from EET/EEST (+02/+03) to permanent +03,
     effective 2016-09-07. Use "+03" rather than an invented
     abbreviation for the new time.

     Several zones in Antarctica and the former Soviet Union, along
     with zones intended for ships at sea that cannot use POSIX TZ
     strings, now use numeric time zone abbreviations instead of
     invented or obsolete alphanumeric abbreviations.

2016h:
     Asia/Gaza and Asia/Hebron end DST on 2016-10-29, not
     2016-10-21. Predict that future fall transitions will
     be on the last Saturday of October.

     Asia/Colombo now uses numeric time zone abbreviations like "+0530"
     instead of alphabetic ones like "IST" and "LKT".

2016i:
     Pacific/Tongatapu begins DST on 2016-11-06, ending on
     2017-01-15.  Assume future observances in Tonga will be
     from the first Sunday in November through the third Sunday in
     January, like Fiji. Switch to numeric time zone abbreviations
     for this zone.

     Northern Cyprus is now +03 year round, causing a split in Cyprus
     time zones starting 2016-10-30 at 04:00. This creates a zone
     Asia/Famagusta.

     Antarctica/Casey switched from +08 to +11 on 2016-10-22.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3936e79cf8)
2016-11-08 12:56:02 +02:00
Christian Schoenebeck
6f5c46681b Merge pull request #667 from chris5560/for-15.05
[for-15.05] luci-app-polipo: remove Parent proxy address field check
2016-07-24 20:27:48 +02:00
Hannu Nyman
692049432c luci-app-adblock: adjust to adblock 1.2.0
* more status info
* change in default nullipv addresses
* two uhttpd instances (for ports 80/443)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit cd50f27956)
2016-06-16 11:25:15 +03:00
Hannu Nyman
70a4d43cc8 luci-app-adblock: support 1.16
Add support for 'adb_restricted'

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e87132021b)
2016-06-04 10:45:55 +03:00
Hannu Nyman
798e7361ed luci-app-adblock: support adb_fetchttl option
Support adb_fetchttl options from adblock 1.1.15

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c46963613f)
2016-06-04 10:45:37 +03:00
Hannu Nyman
0eef20a066 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>
(cherry picked from commit a77ff30057)
2016-06-03 10:30:17 +03:00
Hannu Nyman
cfd3bb1aba luci-base: remove deprecated 6relayd from ucitrack
Cleanup /etc/config/ucitrack by removing '6relayd' item,
as the whole 6relayd package was removed in 2014.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e336dbed39)
2016-05-25 22:31:14 +03:00
Hannu Nyman
1e4705d904 i18n: sync translations
Sync transltions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-05-21 11:23:19 +03:00
Chuanhong Guo
a64448b16b luci-base: Turn off pattern matching when generating distversion
Otherwize the distrevision may be displayed twice
if it contains some special matching patterns.
(For example I am using "git-$hash" in my own OpenWrt branch.)
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

(cherry picked from commit c1f0a9971a)
2016-05-21 11:14:41 +03:00
Hannu Nyman
84083ce54d luci-app-statistics: option for max/avg data when not rrasingle
Introduce option that enables the user to select max values
instead of averages for graphs if the user has disabled RRAsingle.

The option defaults to average values, which have been the default
in Luci statistics.

Remove 'optional' from RRASingle, as it is a key option for statistics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b213573682)
2016-05-21 11:12:45 +03:00
Kevin Darbyshire-Bryant
d2054da3a2 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>
(cherry picked from commit f960a52868)
2016-05-21 11:12:35 +03:00
Hannu Nyman
a0f22fdec9 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>
(cherry picked from commit b9dbf1bc2c)
2016-05-21 11:12:11 +03:00
Hannu Nyman
7a4741ebbd Merge pull request #719 from SvenRoederer/add_community_cottbus
freifunk-profiles: add profile Cottbus
2016-05-11 09:13:19 +03:00
Hannu Nyman
06a32ecdca Merge pull request #718 from SvenRoederer/fix/freifunk-communitysetting-selection/for-15.05
luci-mod-freifunk: fix lookup of community-name
2016-05-11 09:13:13 +03:00
Sven Roederer
d7e36244dd freifunk-profiles: add profile Cottbus
- add the current community-file for freifunk Cottbus to for-15.05 branch
- this is a copy of the file with all commits up to "Jan 4, 2016"

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2016-05-11 01:41:54 +02:00
Sven Roederer
30fbac75ac luci-mod-freifunk: fix lookup of community-name
restore the lookup of the freifunk community-name stored in
uci "freifunk.community.name".
In 9780ee382e
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.

This is a backport of 61c7157a66

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2016-05-11 00:51:53 +02:00
Hannu Nyman
0b84fe25a6 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>
(cherry picked from commit 96c5069ca6)
2016-05-10 16:44:44 +03:00
Hannu Nyman
234ca580c7 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>
(cherry picked from commit b45520011f)
2016-05-10 16:44:32 +03:00
Hannu Nyman
11d5867a45 Merge pull request #712 from SvenRoederer/fix/deps_for_app-olsr
luci-app-olsr: depend on luci-lib-json
2016-05-08 20:56:59 +03:00
Sven Roederer
51afb12611 luci-app-olsr: depend on luci-lib-json
backport of ba897c6a20

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2016-05-05 14:20:44 +02:00
Hannu Nyman
c0ae328b63 Merge pull request #704 from feckert/fix_dsl_spelling
luci-mod-admin-full: change spelling ADSL to xDSL
2016-04-19 10:26:19 +03:00
Florian Eckert
b2271ea5bc luci-mod-admin-full: change spelling ADSL to xDSL
DSL has one more transmission technologies this is VDSL.
Spelling xDSL reflect this

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
2016-04-19 07:56:42 +02:00
Hannu Nyman
fdc0783b88 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>
(cherry picked from commit 51a7f96877)
2016-04-18 20:43:49 +03:00
Hannu Nyman
605d1f1947 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>
(cherry picked from commit 859e435378)
2016-03-30 11:43:36 +03:00
Hannu Nyman
34dbc700c6 CC luci-mod-admin-full: Enable reset in Luci also for ubi
Enable reset in LuCI also for ubi based firmwares.
Discussion at #672

Backport of 5b79e62c0a

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-03-29 10:37:29 +03:00
Daniel Dickinson
b7c182165f luci-app-statistics: Fix disk usage graphing
Disk usage graphing was broken.  This fixes it.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
(cherry picked from commit 6d2163eb62)
2016-03-29 10:35:00 +03:00
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
Christian Schoenebeck
4b594cb1aa [for-15.05] luci-app-polipo: remove Parent proxy address field check
remove Parent proxy address field check https://dev.openwrt.org/ticket/15680

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2016-03-07 21:20:47 +01: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