summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2017-12-05Merge pull request #1463 from dibdot/adblockHannu Nyman
luci-app-adblock: fix minor visual issue
2017-12-04luci-app-adblock: fix minor visual issueDirk Brenken
* fix visual issue in runtime section (originally provided by @ansuel) Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-04Merge pull request #1459 from brianjmurrell/patch-1Jo-Philipp Wich
Fix bad argument #1 to 'tonumber'
2017-12-04Fix bad argument #1 to 'tonumber'Brian J. Murrell
Fixes [FS#1118](https://bugs.lede-project.org/index.php?do=details&task_id=1118) Luci chokes on devices that do not have _iptables_ installed with: /usr/lib/lua/luci/dispatcher.lua:460: Failed to execute function dispatcher target for entry '/'. The called action terminated with an exception: /usr/lib/lua/luci/dispatcher.lua:460: Failed to execute firstchild dispatcher target for entry '/admin'. The called action terminated with an exception: /usr/lib/lua/luci/dispatcher.lua:460: Failed to execute function dispatcher target for entry '/admin/status'. The called action terminated with an exception: /usr/lib/lua/luci/dispatcher.lua:460: Failed to execute template dispatcher target for entry '/admin/status/overview'. The called action terminated with an exception: /usr/lib/lua/luci/template.lua:97: Failed to execute template 'admin_status/index'. A runtime error occured: [string "/usr/lib/lua/luci/view/admin_status/index.h..."]:34: bad argument #1 to 'tonumber' (string expected, got nil) stack traceback: [C]: in function 'assert' /usr/lib/lua/luci/dispatcher.lua:460: in function 'dispatch' /usr/lib/lua/luci/dispatcher.lua:141: in function </usr/lib/lua/luci/dispatcher.lua:140> The code should be more defensive.
2017-11-24luci-app-attendedsysupgrade: use rpc-sys pkglistPaul Spooren
The bash package rpcd-mod-packagelist is no longer required as it has been ported to rpc-sys by @dangowrt. The luci app now uses that feature. The packagelist.acls is no longer required and has been removed. luci-app-attendedsysupgrade: follow new server api a new api uses more status codes and headers instead of genric 400 code with json payload. show error message when ubus call fail fix typo more info here https://github.com/aparcar/attendedsysupgrade-server#response-status-codes luci-app-attendedsysupgrade: refactoring luci-app-attendedsysupgrade: use checksum now compares cgi-io md5 checksum with md5 of server as well checks if enough free memory is available to store image Added needed ACL to let Luci request "system info" rename "image" to "firmware" in output strings. This was requested as "unification" rpcd-mod-packelist used to return a variable called "packagelist", the new "rpc-sys packagelist" returns a variable called "packages". This has been adapted. Signed-off-by: Paul Spooren <paul@spooren.de>
2017-11-21Merge pull request #1445 from dibdot/travelmateHannu Nyman
luci-app-travelmate: Chaos Calmer bugfixes
2017-11-19luci-app-travelmate: Chaos Calmer bugfixesDirk Brenken
* fixes for Chaos Calmer compatibility Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-11-12luci-app-attendedsysupgrade: use commonPaul Spooren
use attendedsysupgrade-common package and rpc-sys instead of rpcd-mod-attendedsysupgrade luci-app-attendedsysupgrade: editable server url the server url can now be changed. The solution is kept as simple as possible to not introduce any lua code. Small cleanup, but needs a refactoring. Add acl rights to edit the attendedsysupgrade file Add cgi-io as a dependencie to upload image to router Signed-off-by: Paul Spooren <paul@spooren.de>
2017-11-11timezone data: update to 2017cHannu Nyman
Update timezone data to 2017c http://mm.icann.org/pipermail/tz-announce/2017-October/000047.html Briefly: Northern Cyprus switches from +03 to +02/+03 on 2017-10-29. Fiji ends DST 2018-01-14, not 2018-01-21. Namibia switches from +01/+02 to +02 on 2018-04-01. Sudan switches from +03 to +02 on 2017-11-01. Tonga likely switches from +13/+14 to +13 on 2017-11-05. Turks & Caicos switches from -04 to -05/-04 on 2018-11-04. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-11-11Merge pull request #1436 from artioni81/patch-5Hannu Nyman
Update openvpn.po
2017-11-11luci-app-openvpn: update Italian translationartioni81
Signed-off-by: Artion Karreci <artionkarreci@gmail.com>
2017-11-11Merge pull request #1438 from musashino205/l10n/upnp-upd-jaHannu Nyman
luci-app-upnp: Update Japanese translation
2017-11-11luci-app-upnp: Update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-11i18n: Sync translationsINAGAKI Hiroshi
Synchronized translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-10luci-mod-admin-full: add SNR tweak option to DSLAndrea Merello
Reported-by: Andrea Merello <andrea.merello@gmail.com> [rebase onto master, fix indentation, commit subject, depend on adsl mode] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10luci-mod-admin-full: restrict DSL xfer_mode and line_mode options to VDSL modemsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10Update openvpn.poartioni81
2017-11-10protocols: fix various interface patternsJo-Philipp Wich
The virtual interface match patterns of various protocols were improperly quoted, causing them to over- or undermatch. Follow up of #1435. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10Merge pull request #1435 from TDT-GmbH/proto_4x6_pattern_fixJo-Philipp Wich
luci-proto-ipv6: fix patterns in proto_4x6.lua
2017-11-10luci-proto-ipv6: fix patterns in proto_4x6.luaMartin Schiller
The dash '-' needs to be escaped by a '%', otherwise it will be interpreted as minus, which means '0 or more repetitions'. This fixes LEDE FS#1157. Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2017-11-10Merge pull request #980 from NvrBst/pull-request-upnp_descriptionJo-Philipp Wich
luci-app-upnp: Adding and displaying "Description" to upnp data
2017-11-10luci-mod-admin-full: add DUID option to static leases sectionJan Pavlinec
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz> [add field validation] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10Merge pull request #1428 from BigNerd95/wifi-80211rJo-Philipp Wich
luci-mod-admin-full: wifi.lua: ft_psk_generate_local and ft_over_ds
2017-11-10Merge pull request #1409 from FreifunkUFO/patch-1Jo-Philipp Wich
meshwizard: upgrade version for some olsr-plugins
2017-11-06luci-mod-admin-full: wifi.lua: 80211r ft_over_dsLorenzo Santina
Allow user to chose if use FT over DS protocol or FT over the Air protocol for Fast BSS Transition Signed-off-by: Lorenzo Santina <lorenzo.santina@edu.unito.it>
2017-11-06luci-mod-admin-full: wifi.lua: 80211r ft_psk_generate_localLorenzo Santina
Add local generation of PMK when using a PSK. So 802.11r is easier to configure and no inter AP communication is needed any more. Signed-off-by: Lorenzo Santina <lorenzo.santina@edu.unito.it>
2017-11-05Merge pull request #1427 from musashino205/l10n/adblk-upd-jaHannu Nyman
luci-app-adblock: Update Japanese translation
2017-11-05luci-app-adblock: Update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-05luci-app-adblock: Sync translationsINAGAKI Hiroshi
Synchronized translations with sources. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-04luci-app-attendedsysupgrade: upgrade to version 2Paul Spooren
Add required ubus acls from package rpcd-mod-attendedsysupgrade. luci-app-attendedsysupgrade: add postinst script removes caches and restarts uhttpd as mentioned here: https://github.com/aparcar/gsoc17-attended-sysupgrade/issues/58#issuecomment-339370803 luci-app-attendedsysupgrade: redesign simplified the interface and made it more "luci" like simplify ubus interaction, use uci_call und ubus_call functions add optional settings: auto_search: search on opening the view without clicking advanced_mode: if set, allow package edits, show build log rename updateserver to upgradeserver rename url to server_url luci-app-attendedsysupgrade: rename uci options remove leading "upgrade" from uci options also rename server_url to url cleaning use new api/ urls wait for successfull reboot Signed-off-by: Paul Spooren <paul@spooren.de>
2017-11-04Merge pull request #1426 from dibdot/app-adblockHannu Nyman
luci-app-adblock: sync with adblock 3.1.0
2017-11-04luci-app-adblock: sync with adblock 3.1.0Dirk Brenken
* add support for new 'whitelist mode' * fix a small css issue in advanced edit tabs Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-11-03Merge pull request #1425 from TDT-GmbH/pr/20171103-luci-app-mwan3-fix-spellingHannu Nyman
luci-app-mwan3: fix i18n spelling
2017-11-03luci-app-mwan3: fix i18n spellingFlorian Eckert
Fix i18n en spelling Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-29Merge pull request #1418 from yangfl/masterHannu Nyman
i18n: Update Chinese translation
2017-10-29Merge pull request #1417 from felixonmars/patch-1Hannu Nyman
Fix typos in luci-base/luasrc/http/protocol.lua
2017-10-29i18n: Update Chinese translationyangfl
Signed-off-by: David Yang <mmyangfl@gmail.com>
2017-10-29Fix typos in luci-base/luasrc/http/protocol.luaFelix Yan
2017-10-28Merge pull request #1416 from yangfl/masterHannu Nyman
i18n: Update Chinese translation
2017-10-28i18n: Update Chinese translationyangfl
Signed-off-by: David Yang <mmyangfl@gmail.com>
2017-10-28i18n: sync translationsHannu Nyman
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-10-25Merge pull request #1414 from musashino205/l10n/minidlna-upd-jaHannu Nyman
luci-app-minidlna: Update Japanese translation
2017-10-25luci-app-minidlna: Update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-10-25luci-app-minidlna: Sync translationsINAGAKI Hiroshi
Synchronized translations with sources. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-10-25luci-app-minidlna: Fix UI textINAGAKI Hiroshi
Add missing colon ":" to the UI text for widelink option. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-10-25luci-app-minidlna: Fix errors in po filesINAGAKI Hiroshi
Modified incorrect "msgid" to "msgstr". Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-10-25luci-base: fix client side "host" datatype validatorJo-Philipp Wich
Fixes #1413. Reported-by: Wojciech Jowsa <wojciech.jowsa@gmail.com> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-10-23Merge pull request #1296 from TDT-GmbH/sort-languageHannu Nyman
luci.mk: sort languages in lexical order
2017-10-21meshwizard: upgrade version for some olsr-pluginsFreifunkUFO
inside OLSR some plugins recently got newer version numbers (and of course improvements) Signed-off-by: Ufo <ufo@rund.freifunk.net>
2017-10-21Merge pull request #1380 from jcadduono/minidlnaHannu Nyman
luci-app-minidlna: add allow wide links option