summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | luci-app-commands: do not escape pipe on cmd lineFlorian Eckert2020-05-131-1/+1
| | | | | | | | | | | | | | fixes #4036 Signed-off-by: Florian Eckert <fe@dev.tdt.de> (cherry picked from commit 8120e1d484ec6b46768593ea1a8c569fe2a60637)
* | timezone data: update to 2020aHannu Nyman2020-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update timezone data to 2020a http://mm.icann.org/pipermail/tz-announce/2020-April/000058.html 2020a: Morocco springs forward on 2020-05-31, not 2020-05-24. Canada's Yukon advanced to -07 year-round on 2020-03-08. America/Nuuk renamed from America/Godthab. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit e5fe16c9ea405ac8c58607f5083eecd3551ef4ae)
* | Merge pull request #4003 from stangri/18.06-luci-app-vpnbypassStan2020-05-034-47/+43
|\ \ | | | | | | [18.06] luci-app-vpnbypass: better localizeable resources
| * | luci-app-vpnbypass: better localizeable resourcesStan Grishin2020-05-034-47/+43
|/ / | | | | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #3999 from stangri/18.06-luci-app-simple-adblockStan2020-05-024-5/+4
|\ \ | | | | | | [18.06] luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources
| * | luci-app-simple-adblock: bugfix: remove escaped double-quotes from ↵Stan Grishin2020-05-024-5/+4
| | | | | | | | | | | | | | | | | | translateable resources Signed-off-by: Stan Grishin <stangri@melmac.net>
* | | Merge pull request #3993 from stangri/18.06-luci-app-https-dns-proxyStan2020-05-024-4/+4
|\ \ \ | |/ / |/| | [18.06] luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources
| * | luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from ↵Stan Grishin2020-05-024-4/+4
|/ / | | | | | | | | | | translateable resources Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #3961 from stangri/18.06-luci-app-https-dns-proxyHannu Nyman2020-04-247-56/+80
|\ \ | |/ |/| [18.06] luci-app-https-dns-proxy: add CIRA Canadian Shiled
| * luci-app-https-dns-proxy: add CIRA Canadian ShiledStan Grishin2020-04-247-56/+80
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3945 from stangri/18.06-luci-app-simple-adblockHannu Nyman2020-04-213-111/+107
|\ | | | | [18.06] luci-app-simple-adblock: bugfix: get package version from opkg
| * luci-app-simple-adblock: bugfix: get package version from opkgStan Grishin2020-04-213-111/+107
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* luci-app-advanced-reboot: fix syntaxHannu Nyman2020-04-121-2/+2
| | | | | | | | | Add the missing ")" to lines 45 and 54. Fixes 75a4a80c1dd Fixes #3903 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit 2c812fbd58fd7399969185cc501bdba561d98d95)
* Merge pull request #3900 from stangri/18.06-luci-app-simple-adblockHannu Nyman2020-04-113-150/+115
|\ | | | | [18.06] luci-app-simple-adblock: improve i18n
| * luci-app-simple-adblock: improve i18nStan Grishin2020-04-113-150/+115
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3879 from stangri/18.06-luci-app-advanced-rebootHannu Nyman2020-04-1117-119/+363
|\ | | | | [18.06] luci-app-advanced-reboot: bring up-to-date with master
| * luci-app-advanced-reboot: improve localization by moving from translate to ↵Stan Grishin2020-04-1117-119/+363
|/ | | | | | translatef Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3854 from stangri/18.06-luci-app-https-dns-proxyHannu Nyman2020-04-0714-39/+101
|\ | | | | [18.06] luci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS
| * luci-app-https-dns-proxy: Move help links to providers files, Add LibreDNS.Stan Grishin2020-04-0614-39/+101
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3830 from stangri/18.06-luci-app-https-dns-proxyHannu Nyman2020-04-034-32/+225
|\ | | | | [18.06] luci-app-https-dns-proxy: better service control & buttons styling
| * luci-app-https-dns-proxy: better service control & buttons stylingStan Grishin2020-04-034-32/+225
| | | | | | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #3827 from stangri/18.06-luci-app-vpnbypassHannu Nyman2020-04-038-82/+151
|\ \ | | | | | | [18.06] luci-app-vpnbypass: better service control & buttons styling
| * | luci-app-vpnbypass: better service control & buttons stylingStan Grishin2020-04-038-82/+151
| |/ | | | | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* | Merge pull request #3822 from stangri/18.06-luci-app-simple-adblockHannu Nyman2020-04-034-100/+119
|\ \ | |/ |/| [18..06] luci-app-simple-adblock: better service control & buttons styling
| * luci-app-simple-adblock: better service control & buttons stylingStan Grishin2020-04-034-100/+119
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3794 from stangri/18.06-luci-app-simple-adblockHannu Nyman2020-03-299-72/+491
|\ | | | | [18.06] luci-app-simple-adblock: better status/error display, better service control
| * luci-app-simple-adblock: better status/error displayStan Grishin2020-03-299-72/+491
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* luci-base: iface_get_network(): fix conditionJo-Philipp Wich2020-03-041-3/+1
| | | | | Fixes: #3717 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* luci-base: iface_get_network(): fix conditionJo-Philipp Wich2020-03-031-1/+3
| | | | | Fixes: #3715 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* luci-base: cbi.js: fix unintended number sign overflow in formatJo-Philipp Wich2020-01-291-6/+7
| | | | | | Fixes: #3003 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (backported from commit 6d9a23af60f796e14dd9652d4f401db1a5ac456f)
* Merge pull request #3423 from stangri/18.06-luci-app-https-dns-proxyHannu Nyman2019-12-1925-0/+598
|\ | | | | [18.06] luci-app-https-dns-proxy: package name change, support for RFC8484 binary
| * luci-app-https-dns-proxy: package name change, support for RFC8484 binaryStan Grishin2019-12-1925-0/+598
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* i18n: sync translationsHannu Nyman2019-11-3066-295/+1764
| | | | | | Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Merge pull request #3368 from stangri/18.06-luci-app-advanced-rebootFlorian Eckert2019-11-282-1/+7
|\ | | | | luci-app-advanced-reboot: better information for snapshots
| * luci-app-advanced-reboot: better information for snapshotsStan Grishin2019-11-272-1/+7
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3338 from stangri/18.06-luci-app-advanced-rebootHannu Nyman2019-11-202-2/+39
|\ | | | | [18.06] luci-app-advanced-reboot: add logger messages, README update
| * luci-app-advanced-reboot: add logger messages, README updateStan Grishin2019-11-192-2/+39
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* Merge pull request #3335 from stangri/18.06-luci-app-advanced-rebootHannu Nyman2019-11-193-13/+71
|\ | | | | [18.06] luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors
| * luci-app-advanced-reboot: bugfix: luci error on reboot, logger errorsStan Grishin2019-11-193-13/+71
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* treewide: fix "Unhandled token" errors with Lua CBI mapsJo-Philipp Wich2019-11-163-10/+10
| | | | | | | | | | | | The `data-type` attribute is used to bind datatype validators to a widget while some templates used the same attribute to denote the name of the underlying widget. Change the `data-type` attributes referring to the widget name to `data-widget` in order to stop the JS token error spam. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (backported from commit 13e9e3e9e8633c7a54fe5fec1481e9df62594982)
* Merge pull request #3313 from stangri/18.06-luci-app-advanced-rebootHannu Nyman2019-11-166-254/+338
|\ | | | | luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers
| * luci-app-advanced-reboot: show OpenWrt info on compatible NAND routersStan Grishin2019-11-156-254/+338
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>
* luci-app-firewall: fix stored XSS in rule-details.luaJo-Philipp Wich2019-11-151-1/+1
| | | | | | | | A previous fix to this file failed to address a second instance of the same issue. Fixes: c048f23ba ("luci-app-firewall: fix stored XSS in rule- and forward detail pages") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* luci-compat: add transitional packageJo-Philipp Wich2019-11-141-0/+19
| | | | | | | | Add an empty luci-compat package to allow forward compatibility with openwrt-19.07 and master for packages that support all three branches. Ref: https://forum.openwrt.org/t/luci-compat-and-18-06/48369 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* luci-app-nlbwon: fix parsing relative interval values from configJo-Philipp Wich2019-11-131-2/+2
| | | | | | Fixes: #3302 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 2e8aa301aa2a1aa07438de8dd962c21f0c8559f2)
* luci-lib-jsonc: store large JSON integer values as Lua doublesJo-Philipp Wich2019-11-131-1/+8
| | | | | | Fixes: #3293 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 8da8f38bf97c925f6f113d3b4793edb23e7e0dc2)
* luci-mod-admin-full: proper SSID escaping in wifi join and iface overviewJo-Philipp Wich2019-11-052-2/+3
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* luci-mod-system: validate log_ip as "host" instead of just ipaddrYousong Zhou2019-11-041-1/+1
| | | | | | | | Fixes FS#2444 A replicate of commit 90051b685 on master branch Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* Merge pull request #3246 from stangri/18.06-luci-app-vpnbypassFlorian Eckert2019-10-294-11/+10
|\ | | | | [18.06] luci-app-vpnbypass: bugfix: call to action has no parent node
| * luci-app-vpnbypass: bugfix: call to action has no parent nodeStan Grishin2019-10-284-11/+10
|/ | | | Signed-off-by: Stan Grishin <stangri@melmac.net>