summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base
AgeCommit message (Collapse)Author
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-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>
2016-02-23luci-base: cbi: fix dependency handling of list and multivalues with ↵Jo-Philipp Wich
radio/checkbox widgets Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-20luci-base: luci.sys: canonicalize src and dest addrs in luci.sys.net.conntrack()Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-19luci-base: cbi: fix button handling for dynamic listsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-18Merge pull request #644 from chris5560/masterChristian Schoenebeck
luci-base: fixed tabbed map when using NamedSection of same type
2016-02-17luci-base: cbi.js: properly round down numbers for %u and %d patternsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-15luci-base: cbi.js: string formatting fixesJo-Philipp Wich
* Fix left and right justify/padding in formats * Do not emit decimal numbers for small values in %m format Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: cbi: rely on auto-serialization for combobox choicesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: cbi: rework ListValue and MultiValue templatesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: dispatcher: let attr() automatically serialize JSONJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: cbi: properly handle dependant elements without parentJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: cbi: only spawn dynlist sub-comboboxes if choices are availableJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-10luci-base: cbi: further refactoringJo-Philipp Wich
Eliminate more inline scripts in favor to global initialization, use a global object for sharing fixed strings instead of passing them to each invocation. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-09luci-base: fix dependency handling of optionals (#645)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-09luci-base: cbi: remove duplicate id from templateJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-08luci-base: fixed tabbed map when using NamedSection of same typeChristian Schoenebeck
* fixed tabbed map when using NamedSection of same sectiontype * add error message on which tab(s) the invalid/required fields are located Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2016-02-07timezone data: update to 2016aHannu Nyman
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>
2016-02-03i18n: Sync translationsHannu Nyman
Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-02luci-base: fix parsing of non-TCP streams in conntrack tableJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-02-02Fix embedded links: github instead of luci.subsignal.orgHannu Nyman
Fix links to point into Github repo instead of luci.subsignal.org - the hint to file a bug in dispatcher - footers of Bootstrap and Firefunk themes Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-01-23luci-base: fix initialization of MultiValue optionsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-21sys.lua _nethints(): read location of dhcp.lease file from uciChristian Schoenebeck
status.lua - change default directory of dhcp.leases file sys.lua - read location of dhcp.leases file from uci Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2016-01-20luci-base: luci.sys.net: use luci.ip.neighbors() instead of /proc/net/arpJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-20luci-base: add luci.sys.net.host_hints() and regenerate documentationJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-19luci-base: cbi: optimize tab hide logicJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-19luci-base: cbi: fix event binding jsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-19luci-base: add missing Lua side changes for new dependency codeJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: cbi: prevent unintended focus on combobox initJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: cbi: refactor event handling jsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: cbi: fix reverse field order after dependency changeJo-Philipp Wich
When fields got removed and readded due to unsatisfied dependencies, they got inserted in reverse order into the dom. Fix this issue by properly passing the element index. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: refactor cbi dependency handling codeJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: improve tab hide logicJo-Philipp Wich
Do not rely on explicit child counts but inspect the code instead to decide when to hide tabs or not. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: add extra css class for map level tabs, don't track tab child countJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-18luci-base: do not render section description tag when description is emptyJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-15luci-base: add basic support for CBI map level tabbingJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-15luci-base: prevent CBI map save on invalid values (#618)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-15luci-base: initialize CBI optionals on initial Map render (#618)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2016-01-15Merge pull request #563 from cshore/pull-request-app-uhttpdJo-Philipp Wich
Pull request app uhttpd
2016-01-11luci-base: properly handle ubus connections for non-root (#570, #571)Jo-Philipp Wich
Instead of relying on the connect-before-setuid hack, ship a proper acl definition file whitelisting the procedures that LuCI requires on its non-root pages. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-12-20i18n: sync translationsHannu Nyman
Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-20Add some Simplified Chinese translationsGuoGuo
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
2015-12-17Merge pull request #464 from remakeelectric/pulls/list-operationsJo-Philipp Wich
get/set list operations and documentation
2015-12-17Merge pull request #577 from cshore/pull-request-safe-file-uploadJo-Philipp Wich
luci-base: Make default for FileUpload 'safe'