Commit graph

12175 commits

Author SHA1 Message Date
Anton Kikin
f77df82cd2 luci-base: Add missed config parameter for cbi when converting to JSON
The cbi() function has a second argument 'config' in which various
configuration parameters can be passed. When converting the lua menu
to JSON, we must also convert this parameter.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 2d8299338e)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
fa534c4578 luci-base: dispatcher.lua: remove redundant check_fs_depends() call
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 08eea3f93e)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
68784d4e61 luci-base: dispatcher.lua: fix filesystem dependency checks
A variable clash led to declarative `fs` dependencies being ineffective.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7cfce56553)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
4b7fe42410 luci-base: dispatcher: remove empty firstchild nodes from menu
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fd7961337f)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
0f83d819b8 luci-base: dispatcher: fix rpc controller regression
When testing the luci-rpc authnetication, avoid clobbering the HTTP
post request body.

Fixes: #3470
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 38c9c9e0a2)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
400e3ac4ec luci-base: dispatcher.lua: add support for loading JSON menu files
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cf1219bd07)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
4618dee211 luci-base: dispatcher.lua: refactor dispatch logic
Refactor the dispatch logic to operate on the internal JSON representation
of the menu tree.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 184ea62300)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
8059a49efc luci-base: dispatcher.lua: factor out template class init into own function
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1ec6e72106)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
be5116814e luci-base: dispatcher.lua: factor out language check into own function
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a6b214f873)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
0f6af6e00d luci-base: dispatcher.lua: introduce dispatch tree JSON conversion
Introduce a new method menu_json() which converts the current dispatch
tree into JSON structure.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 852d24061d)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
cecc13b9d4 luci-mod-status: use LuCI.ui.instantiateView() to load index view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f9d61213fb)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
a60ea6915c luci-base: ui.js: add instantiateView() helper
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d9e9cf92d1)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
c2f30fbe4d treewide: import utility classes explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 3c4bc228a1)
2020-05-07 19:40:49 +02:00
Jo-Philipp Wich
28489b12eb luci-base: harmonize JS class naming and requesting
- Make builtin classes available via `require` to allow view code to
   request external and internal classes in a consistent manner without
   having to know which classes are builtin and which not

 - Make base classes request any used class explicitely instead of
   relying on implicitly set up L.{dom,view,Poll,Request,Class} aliases

 - Consistently convert class names to lower case in JSdoc to match
   the names used in `require` statements

 - Deprecate L.{dom,view,Poll,Request,Class} aliases

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 711f759278)
2020-05-07 19:40:48 +02:00
Kevin Darbyshire-Bryant
9705b53322 luci-base: Improve change application message
As a native English speaker the luci message displayed when clicking
'Save & Apply' has a somewhat uncomfortable English phrasing of "Waiting
for configuration to get applied".  It could be improved by replacing
'get' with 'be' but once you've got that far you might as well replace
this with the shorter & simpler "Applying configuration changes".  This
is also technically more correct since luci/openwrt should only be
updating/restarting processes that are related to the changed areas, not
changing the entire configuration.

As a result of that, change both the 'success' and 'rolled back'
messages to "Configuration changes have been applied" & "Configuration
changes have been rolled back"

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 9b266d11c6)
2020-05-07 19:40:48 +02:00
Jo-Philipp Wich
c7c78291f1 luci-base: ui.js: dispatch "cbi-tab-active" event when a tab is selected
This is useful to lazy-load tab contents.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bf774e4c2a)
2020-05-07 19:40:48 +02:00
Jo-Philipp Wich
ce4d8c5a9a luci-base: ui.js: allow custom validation in Dropdown and DynamicList
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 90a161018c)
2020-05-07 19:40:48 +02:00
Jo-Philipp Wich
f68a32d294 luci-base: ui.js: add documentation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1bb2717729)
2020-05-07 19:40:48 +02:00
Hannu Nyman
fcdd57a51d luci-app-statistics: remove quotemark from comment
Having quote " in a comment may cause error with non-minified code.
(explanation: caused by 'require' function's parsing behaviour)

Remove also ";" just in case.

Reference to issue 4020

(backported from 4f80f9542)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-07 19:17:42 +03:00
Stan
d320179573
Merge pull request #4009 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: support phys-dev policies
2020-05-04 15:55:41 -07:00
Stan Grishin
16699b971b luci-app-vpn-policy-routing: support phys-dev policies
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-04 22:54:30 +00:00
Hannu Nyman
5e8ca2ac12 luci-base: i18n - cleanup after backport
The backport script apparently imported some stale strings.
Remove them.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-04 23:03:11 +03:00
Hannu Nyman
ba0b87d3ee treewide: i18n - backport translations from master
Backport updates to translations from master by using
build/i18n-merge-master.pl

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-04 22:47:26 +03:00
Hannu Nyman
331915272e treewide: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-04 22:32:44 +03:00
Stan
85909bc020
Merge pull request #4002 from stangri/19.07-luci-app-vpnbypass
[19.07] luci-app-vpnbypass: better localizeable resources
2020-05-03 12:49:24 -07:00
Stan Grishin
ba376390b5 luci-app-vpnbypass: better localizeable resources
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-03 09:12:22 +00:00
Stan
e62ca668e1
Merge pull request #3998 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources
2020-05-02 09:20:56 -07:00
Stan
7738037254
Merge pull request #3996 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: bugfix: remove escaped double-quotes from translateable resources
2020-05-02 09:20:29 -07:00
Stan Grishin
9a8489107a luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-02 16:00:54 +00:00
Hannu Nyman
9d596c5a77
Merge pull request #3992 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources
2020-05-02 18:55:56 +03:00
Stan Grishin
3d1bc78da9 luci-app-vpn-policy-routing: bugfix: remove escaped double-quotes from translateable resources
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-02 15:46:47 +00:00
Stan Grishin
fcddad1dfb luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-02 15:31:49 +00:00
Hannu Nyman
39a82906a1
Merge pull request #3960 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: add CIRA Canadian Shiled
2020-04-24 17:32:11 +03:00
Stan Grishin
46aa498f2d luci-app-https-dns-proxy: add CIRA Canadian Shiled
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-24 10:06:01 +00:00
Dirk Brenken
2aeb83aefd
luci-app-travelmate: refine logical interface selection
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit c2d8275fda)
2020-04-24 09:47:57 +02:00
Dirk Brenken
50c05f3ef7
luci-app-travelmate: sync with travelmate 1.5.4
* change wifi scanning to logical interface name,
  no longer use the radio device

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 9d02ef1bd9)
2020-04-22 21:50:44 +02:00
Friendly fellow
d6c07c85b2 luci-proto-openconnect: fix certificate file paths
This addresses the issue of openconnect.sh from openconnect package expecting
a vpn- suffix for the files, while the frontend didn't.

Signed-off-by: Friendly fellow <DasTestament@users.noreply.github.com>
[reword commit message]
Ref: https://github.com/openwrt/packages/issues/11584
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit adf0fb1879)
Fixes: #3951
2020-04-22 13:14:23 +02:00
Hannu Nyman
c4d35431e0
Merge pull request #3944 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: bugfix: get package version from opkg
2020-04-21 19:48:23 +03:00
Stan Grishin
f3c8cb6835 luci-app-simple-adblock: bugfix: get package version from opkg
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-21 00:51:30 +00:00
Dirk Brenken
eeba108ed6
luci-app-adblock: accept capital letters in DNS filter
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e7cb6efb5a)
2020-04-14 19:48:19 +02:00
Dirk Brenken
9bb1624446
luci-app-adblock: more DNS Report tweaks
* revert last page loading change,
  this breaks the filter functionality on that page
* Add a short paragraph to explain the page functionality
* Fix search to accept ":" character as well
  (e.g. for IPv6 address search)

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 94799995aa)
2020-04-12 10:06:10 +02:00
Hannu Nyman
30af84e305 luci-app-advanced-reboot: fix syntax
Add the missing ")" to lines 45 and 54.
Fixes 75a4a80c1d
Fixes #3903

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2c812fbd58)
2020-04-12 09:01:19 +03:00
Dirk Brenken
a58122d0aa
luci-app-adblock: refresh report data on page load
* refresh report data on page load (without hitting
  the refresh button explicity)

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit bfcd962ffd)
2020-04-11 20:42:52 +02:00
Hannu Nyman
6f0a24f85b
Merge pull request #3897 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: improve i18n
2020-04-11 15:40:26 +03:00
Hannu Nyman
bf5a37646a
Merge pull request #3899 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: improve i18n
2020-04-11 15:39:37 +03:00
Stan Grishin
10e902450a luci-app-vpn-policy-routing: improve i18n
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-11 11:42:23 +00:00
Stan Grishin
4efe27dedf luci-app-simple-adblock: improve i18n
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-11 11:39:26 +00:00
Hannu Nyman
8fd385039e
Merge pull request #3878 from stangri/19.07-luci-app-advanced-reboot
[19.07] luci-app-advanced-reboot: improve localization by moving from translate to translatef
2020-04-11 10:50:56 +03:00
Hannu Nyman
7248fecd6c
Merge pull request #3890 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: improve i18n
2020-04-11 10:49:47 +03:00
Stan Grishin
34f3bce133 luci-app-https-dns-proxy: improve i18n
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-11 02:30:14 +00:00