summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base
AgeCommit message (Collapse)Author
2016-12-10Fix config files getting overwritten in opkg installHannu Nyman
Commit 39ff053890 accidentally removed the conffiles definitions from luci-base, statistics, splash and diag-devinfo apps. That has caused existing config files to get overwritten if the package has been reinstalled via opkg. Additionally, the splash text files have not been saved in sysupgrade or backup as they are located outside /etc/config This commit adds back the conffiles definitions to the respective packages. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-09time zone data: Update to 2016jHannu Nyman
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>
2016-12-09luci-base: luci.tools.status: properly parse infinite odhcpd leasesJo-Philipp Wich
The expiry time in an odhcpd lease file line may be -1 to denote an infinite lease time, so adjust the code to properly support that. The expiry attribute of the lease object will be set to "false" in case of an infinite lease. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-11-08time zone data: Update to 2016iHannu Nyman
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 https://github.com/lede-project/source/commit/671cb35880308404a17c430c4b3b13dd506a5671 * 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>
2016-10-30i18n: sync translationsHannu Nyman
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-10-23i18n: sync translationsHannu Nyman
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-10-09luci-base: use default install paths for host utilsMatthias Schiffer
This reverts commit d4c33720208346ee7983213fe764df3102b8a771. PATH inconsistencies and Host/Install arguments have been fixed in both LEDE and OpenWrt, so we can revert the revert. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-06luci-base: remove default diag host from /etc/config/luciJo-Philipp Wich
Now that luci-mod-admin-full figures out the proper diagnostics host during postinstall we can remove the UCI section from the default configuration file. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-05Revert "luci-base: use default install paths for host utils"Jo-Philipp Wich
This reverts commit 87a7570690f7aeffb1aff01f320973c9acb668d3. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-05Revert "luci-base: fix luci-base host tool install on OpenWrt"Jo-Philipp Wich
This reverts commit f7639bcd6a2caf7cc0f03e85744906c577eefeab. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-04luci-base: fix luci-base host tool install on OpenWrtMatthias Schiffer
OpenWrt doesn't provide an argument to Host/Install like LEDE does; use HOST_BUILD_PREFIX instead, which is available on both. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-03luci-base: use default install paths for host utilsMatthias Schiffer
Also, don't make any assumptions about the staging dir lua and LuaSrcDiet were installed to. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-08-25Merge pull request #782 from Ansuel/masterHannu Nyman
Fix some capital and add some translation
2016-08-24Fix some capital and add some translationBuildTools
Hope this time I have done a good work
2016-08-24i18n: sync translationsHannu Nyman
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-24Revert "Fix and update italian translation"Jo-Philipp Wich
This reverts commit 66d5023891ee948480042e7e0af81b5fc3e3b53e since the original change was apparently untested. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-23Fix and update italian translationAnsuel
I have fixed some capital letter and add some translation
2016-08-18luci-base: properly style login alert messageJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-16i18n: sync translations, fix sv for adblockHannu Nyman
Sync translations. Fix the newly added sv translation for adblock. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-15luci-base: support reading switch topology from /etc/board.jsonJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04luci-base: cbi.js: handle undefined arguments in formattingJo-Philipp Wich
Fix the JavaScript String.format() to not trigger an exception if the argument for an escaped format like %h or %q is undefined. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04luci-base: fix handling of monitor ifacesJo-Philipp Wich
Wireless monitor interfaces usually have no SSID set in their config and various network model utility functions did not handle this case properly, mainly while trying to incorperate the SSID string into various description labels. Fall back to the internal network id (radioX.networkY) in cases where neither the SSID nor the BSSID are available. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04luci-base: improve string format error reportingJo-Philipp Wich
In mod metamethod, execute string format under pcall() and rethrow error in caller context to report caller of function in errors and not the meta method itself. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-07-29luci-mod-admin-full: make diagnostics url customizableFlorian Eckert
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
2016-06-09luci-base: cleanup translationsHannu Nyman
Cleanup the .po files by removing the archived old translation strings. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-06-09i18n: sync translationsHannu Nyman
sync translations Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-06-03luci-base: fix lua interpreter locationKevin Darbyshire-Bryant
An lua interpreter is required on the building host to run the luasrcdiet lua script. Due to a build change, the interpreter was not being installed to the correct location. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2016-06-03luci-base: fix whitespaceHannu Nyman
change spaces to tabs Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-05-30i18n: sync translationsHannu Nyman
sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-05-25luci-base: remove deprecated 6relayd from ucitrackHannu Nyman
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>
2016-05-14luci-base:Turn off pattern matching when generating distversionChuanhong Guo
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>
2016-05-01i18n: sync translationsHannu Nyman
Sync translations Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-04-26luci-base: fix syntax error in luci.model.networkJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-26luci-base: add more ignore patterns to luci.model.networkJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-26luci-base: fix luci.model.network.ignore_interface()Jo-Philipp Wich
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>
2016-04-17luci-base: read odhcpd leasefile location via uciHannu Nyman
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>
2016-04-08luci-base: utils: Make checklib return a booleanDaniel Dickinson
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>
2016-04-01Update network.luaOskari Rauta
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.
2016-03-30timezone data: update to 2016cHannu Nyman
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>
2016-03-25luci-base: Add option to check linked librariesDaniel Dickinson
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>
2016-03-21i18n: sync translationsHannu Nyman
Sync translations Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-03-20luci-base: fix bug in util.lua in 'shellsqescape'Hannu Nyman
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>
2016-03-16Add support for showing ipv6 NAT table in LuciHannu Nyman
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>
2016-03-11luci-base: Include Openwrt build revision in displayed version stringHannu Nyman
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>
2016-03-10LuCI: Display the proper LuCI git branch in GUIHannu Nyman
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>
2016-03-03luci-base: view: make checkboxes and radio buttons styleableMatthias Schiffer
Add an empty, normally invisible label after checkboxes and radio buttons with cbi-input-{checkbox,radio} classes to allow CSS styling them as suggested on http://www.paulund.co.uk/style-checkboxes-with-css Signed-off-by: Nils Schneider <nils@nilsschneider.net> Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-03-01modules/base: dispatcher: use default language if automatic choice failsMatthias Schiffer
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>
2016-02-26i18n: sync translationsHannu Nyman
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-24luci-base: cbi: fix misplaced ID in nullsection templateJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-24luci-base: cbi: also initialize JS if pageactions are disabledJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>