oweals/luci.git
6 years agoluci-mod-admin-full: git rid of embedded newlines in translation strings
Jo-Philipp Wich [Fri, 8 Jun 2018 11:50:12 +0000 (13:50 +0200)]
luci-mod-admin-full: git rid of embedded newlines in translation strings

Also switch one usage of raw '<%_ ... %>' interpolation to '<%: ... %>' in
order to avoid issues with translations using apostrophes.

Globally resnyc translations after the fix.

Fixes #1866.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1867 from dibdot/adblock
Dirk Brenken [Fri, 8 Jun 2018 07:45:57 +0000 (09:45 +0200)]
Merge pull request #1867 from dibdot/adblock

luci-app-adblock: partly revert last commit

6 years agoluci-app-adblock: partly revert last commit 1867/head
Dirk Brenken [Fri, 8 Jun 2018 07:34:47 +0000 (09:34 +0200)]
luci-app-adblock: partly revert last commit

* use now CSS for non breaking spaces in div table header

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agotreewide: switch firewall zone, network and iface lists to dropdown code
Jo-Philipp Wich [Fri, 8 Jun 2018 06:19:20 +0000 (08:19 +0200)]
treewide: switch firewall zone, network and iface lists to dropdown code

Also switch the weekday and monthday lists in the firewall rule details to
cbi dropdowns, vastly uncluttering the form.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add markup, JS and CSS for new dropdown
Jo-Philipp Wich [Fri, 8 Jun 2018 05:29:44 +0000 (07:29 +0200)]
luci-base: add markup, JS and CSS for new dropdown

This commit introduces the required code for a new, markup based dropdown
widget which can be used as a styleable alternative to select boxes or
radio/checkbox button groups.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: support option aliases in luci.cbi
Jo-Philipp Wich [Thu, 7 Jun 2018 06:49:51 +0000 (08:49 +0200)]
luci-base: support option aliases in luci.cbi

AbstractValue descendants may now specify a new optional property `alias`
which refers to a uci option to read/write/remove that differs from the
option name itself.

This is mainly useful for widgets that are toggled based on dependencies,
e.g. for alternating between SingleValue and MultiValue, but which are
intented to write into the same uci option.

Such a setup was previously possible already by overriding the .cfgvalue(),
.write() and .remove() callbacks with custom implementations, but that
required a lot of boiler plate code and was rather fragile.

With the `alias` property, CBI now takes care of the details and tracks
aliased fields within a section accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1863 from dibdot/adblock
Dirk Brenken [Fri, 8 Jun 2018 05:05:05 +0000 (07:05 +0200)]
Merge pull request #1863 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.3

6 years agoMerge pull request #1864 from Ansuel/master
Dirk Brenken [Thu, 7 Jun 2018 20:01:58 +0000 (22:01 +0200)]
Merge pull request #1864 from Ansuel/master

luci-app-ddns: fix div conversion

6 years agoluci-app-ddns: fix div conversion 1864/head
Ansuel Smith [Thu, 7 Jun 2018 19:54:21 +0000 (21:54 +0200)]
luci-app-ddns: fix div conversion

This fix some error from conversion of #1854

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1854 from jollaman999/master
Hannu Nyman [Thu, 7 Jun 2018 19:25:11 +0000 (22:25 +0300)]
Merge pull request #1854 from jollaman999/master

luci-app-ddns: Convert HTML tables to div

6 years agoluci-app-adblock: sync with adblock 3.5.3 1863/head
Dirk Brenken [Thu, 7 Jun 2018 19:14:06 +0000 (21:14 +0200)]
luci-app-adblock: sync with adblock 3.5.3

* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: fix some minor luci.model.uci issues
Jo-Philipp Wich [Wed, 6 Jun 2018 19:44:12 +0000 (21:44 +0200)]
luci-base: fix some minor luci.model.uci issues

 - Properly serialize option delete changelogs
 - Do not perform a section create if a nil value is passed to set()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-ddns: Convert HTML tables to div 1854/head
jollaman999 [Thu, 31 May 2018 11:48:51 +0000 (20:48 +0900)]
luci-app-ddns: Convert HTML tables to div

6 years agoMerge pull request #1835 from Ansuel/ddns-optional
Hannu Nyman [Mon, 4 Jun 2018 09:07:43 +0000 (12:07 +0300)]
Merge pull request #1835 from Ansuel/ddns-optional

luci-app-ddns: make param opt, optional

6 years agoluci-app-ddns: make param opt, optional, add myself as maintainer 1835/head
Ansuel Smith [Sun, 27 May 2018 17:51:38 +0000 (19:51 +0200)]
luci-app-ddns: make param opt, optional, add myself as maintainer

Currently these params should be optional but in the current script then are required for any configuration to save. We add an "optional" boolean value to the validate function so that we can make this pram optional as it should be. Also adds me as maintainer

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1851 from dibdot/lxc_fix
Dirk Brenken [Mon, 4 Jun 2018 07:07:45 +0000 (09:07 +0200)]
Merge pull request #1851 from dibdot/lxc_fix

luci-app-lxc: made container creation more reliable

6 years agoluci-app-lxc: made container creation more reliable 1851/head
Dirk Brenken [Sun, 3 Jun 2018 20:30:59 +0000 (22:30 +0200)]
luci-app-lxc: made container creation more reliable

* wait/lock "create" button until the real end of container creation,
  this includes download time plus tar/gz processing time
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: cbi: atomically reorder uci sections
Jo-Philipp Wich [Thu, 31 May 2018 13:39:43 +0000 (15:39 +0200)]
luci-base: cbi: atomically reorder uci sections

Since the switch to ubus uci operations we do not have a local application-
side cursor cache anymore, instead uci operations happen synchronously in
the rpcd backend server.

This may cause cbi section reorder operations involving multiple elements
to fail, because anonymous section hashes may change due to rehashing
between consecutive ubus uci reorder calls.

In order to avoid that problem, use the ubus uci batch reorder extension,
which allows to pass a complete (or partial) list of section ids in the
desired order in one call, bypassing the volatile section id problem.

Fixes #1844.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1819 from Ansuel/ddns-performance
Hannu Nyman [Sat, 2 Jun 2018 18:11:51 +0000 (21:11 +0300)]
Merge pull request #1819 from Ansuel/ddns-performance

luci-app-ddns: improve performance

6 years agoluci-app-ddns: improve performance 1819/head
Ansuel Smith [Thu, 24 May 2018 00:03:03 +0000 (02:03 +0200)]
luci-app-ddns: improve performance

Every request directed to the ddns app call ddns tools module.
Ddns tools module have lots of global variable that call slow os.execute function. This adds 10 second to every ddns request even if the function that is requested doesn't need that global variable. This commit introduce env_info function that execute os.execute command by executing what is actually requested and not process all the variables. Also remove 2 unecessary module that are not used. More researh find that major slowdown was caused by the calling of ddns script for the version check. Now we check if opkg is present and use it to check ddns-scripts version.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1846 from musashino205/l10n/base-upd-ja
Hannu Nyman [Fri, 1 Jun 2018 16:52:11 +0000 (19:52 +0300)]
Merge pull request #1846 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoMerge pull request #1847 from dibdot/lxc_fix
Dirk Brenken [Fri, 1 Jun 2018 16:41:50 +0000 (18:41 +0200)]
Merge pull request #1847 from dibdot/lxc_fix

luci-app-lxc: bugfix

6 years agoluci-app-lxc: bugfix 1847/head
Dirk Brenken [Fri, 1 Jun 2018 16:33:05 +0000 (18:33 +0200)]
luci-app-lxc: bugfix

* fix remaining javascript errors in Chrome

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: update Japanese translation 1846/head
INAGAKI Hiroshi [Thu, 31 May 2018 17:17:17 +0000 (02:17 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-base: sync translations
INAGAKI Hiroshi [Thu, 31 May 2018 16:59:53 +0000 (01:59 +0900)]
luci-base: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agothemes: drop errorbox styles
Jo-Philipp Wich [Thu, 31 May 2018 17:09:51 +0000 (19:09 +0200)]
themes: drop errorbox styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-freifunk: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:08:14 +0000 (19:08 +0200)]
luci-mod-freifunk: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:05:40 +0000 (19:05 +0200)]
luci-base: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:00:56 +0000 (19:00 +0200)]
luci-mod-admin-full: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agothemes: unify no-password / no-javascript alert boxes
Jo-Philipp Wich [Thu, 31 May 2018 16:56:50 +0000 (18:56 +0200)]
themes: unify no-password / no-javascript alert boxes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: update coxpcall() implementation, fix runtime error reporting
Jo-Philipp Wich [Thu, 31 May 2018 15:41:40 +0000 (17:41 +0200)]
luci-base: update coxpcall() implementation, fix runtime error reporting

Sync our coxpcall() implementation to the newest upstream version in order to
get access to the inner backtrace information and propagate these traces to
the browser in luci.dispatcher.dispatch().

This should make tracking down runtime errors much easier.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agothemes: adjust CSS for reworked apply widget
Jo-Philipp Wich [Thu, 31 May 2018 13:38:03 +0000 (15:38 +0200)]
themes: adjust CSS for reworked apply widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add full page overlay during apply
Jo-Philipp Wich [Thu, 31 May 2018 13:34:32 +0000 (15:34 +0200)]
luci-base: add full page overlay during apply

After applying uci configuration, a full map reload is required in many
cases as the anonymous section identifiers might have been rehashed, causing
the rendered map to go out of sync.

To avoid that, add both a full page overlay preventing further page
interaction and let the apply widget forcibly reload the current view once
the operation is complete.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1845 from dibdot/lxc_fix
Dirk Brenken [Thu, 31 May 2018 06:50:07 +0000 (08:50 +0200)]
Merge pull request #1845 from dibdot/lxc_fix

luci-app-lxc: fix "plain-vanilla" integration, part 3

6 years agoluci-mod-admin-full: fix status page render glitch on Chrome
Jo-Philipp Wich [Thu, 31 May 2018 05:38:40 +0000 (07:38 +0200)]
luci-mod-admin-full: fix status page render glitch on Chrome

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-lxc: fix "plain-vanilla" integration, part 3 1845/head
Dirk Brenken [Wed, 30 May 2018 19:56:50 +0000 (21:56 +0200)]
luci-app-lxc: fix "plain-vanilla" integration, part 3

* migrate JS generated HTML tables to divs
* remove (most of) the inline styles
* various markup cleanups

That's the final part ... hopefully it's now in a  more usable &
maintainable state.

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: cbi.js: remove unused serialize functions
Jo-Philipp Wich [Wed, 30 May 2018 14:04:07 +0000 (16:04 +0200)]
luci-base: cbi.js: remove unused serialize functions

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: cbi.js: fix cbi_row_swap() after recent table markup changes
Jo-Philipp Wich [Wed, 30 May 2018 13:59:52 +0000 (15:59 +0200)]
luci-base: cbi.js: fix cbi_row_swap() after recent table markup changes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: rework network and wifi status displays
Jo-Philipp Wich [Wed, 30 May 2018 12:50:14 +0000 (14:50 +0200)]
luci-mod-admin-full: rework network and wifi status displays

Use a more compact flex layout instead of the tabular display.
Also rename "WAN status" to "Upstream" to avoid future confusion about
wan interfaces vs. defaultroute interfaces.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-material: add new style classes
Jo-Philipp Wich [Wed, 30 May 2018 12:49:24 +0000 (14:49 +0200)]
luci-theme-material: add new style classes

Add new style classes required for status page changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: add new style classes
Jo-Philipp Wich [Wed, 30 May 2018 12:46:10 +0000 (14:46 +0200)]
luci-theme-bootstrap: add new style classes

Add new style classes required for status page changes, also drop old
Internet Explorer compatibility script and vendor prefixed properties.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: add new style classes
Jo-Philipp Wich [Wed, 30 May 2018 12:42:00 +0000 (14:42 +0200)]
luci-theme-openwrt: add new style classes

Add new style classes required for status page changes, also drop old
Internet Explorer compatibility CSS.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix revert page
Ansuel Smith [Mon, 28 May 2018 12:42:10 +0000 (14:42 +0200)]
luci-mod-admin-full: fix revert page

This fix the strange redirect link, a bug with uwsgi where the controller
is empty and a bug with the revert page showing the apply content empty.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[drop unrelated revert.html template change]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1839 from EricLuehrsen/unbound_defdoc
Hannu Nyman [Tue, 29 May 2018 08:29:43 +0000 (11:29 +0300)]
Merge pull request #1839 from EricLuehrsen/unbound_defdoc

 luci-app-unbound: add root zone file cache option

6 years agoluci-app-unbound: add root zone file cache option 1839/head
Eric Luehrsen [Tue, 29 May 2018 04:14:00 +0000 (00:14 -0400)]
luci-app-unbound: add root zone file cache option

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
6 years agoluci-app-unbound: provide transparent defaults with documentation
Eric Luehrsen [Mon, 28 May 2018 20:30:50 +0000 (16:30 -0400)]
luci-app-unbound: provide transparent defaults with documentation

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
6 years agoluci-proto-3g: make it a self-contained package
Florian Eckert [Thu, 15 Mar 2018 09:21:05 +0000 (10:21 +0100)]
luci-proto-3g: make it a self-contained package

The follow error will appear after clicking "Switch protcol" to 3g when
luci-proto-3g was not installed.  Fix this by moving the relevant parts
from luci-proto-ppp into luci-proto-3g and making it complete as a
single protocol handler

> Missing protocol extension for proto "3g"
> cannot open /usr/lib/lua/luci/model/cbi/admin_network/proto_3g.lua: No such file or directory

Closes openwrt/luci#1815

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoMerge pull request #1822 from Ansuel/luci-cpuinfo
Dirk Brenken [Mon, 28 May 2018 14:09:09 +0000 (16:09 +0200)]
Merge pull request #1822 from Ansuel/luci-cpuinfo

luci-admin-full: add architecture info

6 years agoluci-admin-full: add architecture info 1822/head
Ansuel Smith [Fri, 25 May 2018 16:28:18 +0000 (18:28 +0200)]
luci-admin-full: add architecture info

Referring to this, #1698 , we add architecture info and we show Unknown instead of ?. This is usefull if someone needs to install opkg packages manually.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1827 from Ansuel/luci-map
Jo-Philipp Wich [Mon, 28 May 2018 13:19:30 +0000 (15:19 +0200)]
Merge pull request #1827 from Ansuel/luci-map

luci-theme-material: upgrade jquery

6 years agotreewide: convert HTML tables to div
Jo-Philipp Wich [Mon, 28 May 2018 12:57:54 +0000 (14:57 +0200)]
treewide: convert HTML tables to div

Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add element creation helper to cbi.js
Jo-Philipp Wich [Mon, 28 May 2018 12:56:15 +0000 (14:56 +0200)]
luci-base: add element creation helper to cbi.js

Add a new helper function `E()` to cbi.js which can be used to conveniently
build HTML markup.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agothemes: add forward-compatibility CSS
Jo-Philipp Wich [Mon, 28 May 2018 12:54:50 +0000 (14:54 +0200)]
themes: add forward-compatibility CSS

Subsequent changes will largely replace tables with div based markup, so
add forward compatibility style rules to keep the rendering intact.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1836 from sotux/master-zh_CN-translation
Hannu Nyman [Mon, 28 May 2018 04:59:17 +0000 (07:59 +0300)]
Merge pull request #1836 from sotux/master-zh_CN-translation

luci-app-firewall: zh_CN: update Simplified Chinese translation

6 years agoluci-app-firewall: zh_CN: update Simplified Chinese translation 1836/head
Zheng Qian [Mon, 28 May 2018 04:33:56 +0000 (12:33 +0800)]
luci-app-firewall: zh_CN: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoshadowsocks-libev: fix enumerating server and ss_redir sections
Yousong Zhou [Mon, 28 May 2018 03:01:51 +0000 (11:01 +0800)]
shadowsocks-libev: fix enumerating server and ss_redir sections

The issue existed since the first revision of the rewrite and was
exposed by commit 4024d4f (luci-base: switch to ubus uci operations)

A quick scan of the current repo indicates that these are the only sites
of wrong call pattern

Fixes openwrt/packages#6113

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoMerge pull request #1834 from Ansuel/fixpo
Hannu Nyman [Sun, 27 May 2018 19:07:52 +0000 (22:07 +0300)]
Merge pull request #1834 from Ansuel/fixpo

luci-base: fix broken translation

6 years agoluci-base: fix broken translation 1834/head
Ansuel Smith [Sun, 27 May 2018 17:33:11 +0000 (19:33 +0200)]
luci-base: fix broken translation

Currently this translation refer to an old string, sync to the new one.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1828 from dibdot/lxc_fix
Dirk Brenken [Sun, 27 May 2018 18:52:31 +0000 (20:52 +0200)]
Merge pull request #1828 from dibdot/lxc_fix

luci-app-lxc: fix "plain-vanilla" integration, part 2

6 years agoluci-app-lxc: fix "plain-vanilla" integration, part 2 1828/head
Dirk Brenken [Sat, 26 May 2018 17:32:39 +0000 (19:32 +0200)]
luci-app-lxc: fix "plain-vanilla" integration, part 2

I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.

* check /etc/config/lxc in controller, not in cbi
* more controller cleanups
* remove unused 'fork_exec' function
* check path before container creation
* check space requirements before container creation
  * support new uci options 'min_space' and 'min_temp',
    default for both is 100000 KB
  * both options are configurable via LuCI CBI template
* write messages to log in case of an error
* validate the container name during creation,
  automatically remove invalid chars
* inform the user that only a stopped container can be destroyed
* add experimental ssl support (untested, disabled by default)

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1833 from ysoyipek/patch-3
Hannu Nyman [Sun, 27 May 2018 13:22:27 +0000 (16:22 +0300)]
Merge pull request #1833 from ysoyipek/patch-3

Update base.po

6 years agoUpdate base.po 1833/head
Yusuf Soyipek [Sun, 27 May 2018 13:17:15 +0000 (16:17 +0300)]
Update base.po

Some of the shortcomings in Turkish were added.

6 years agoMerge pull request #1832 from musashino205/l10n/fw-upd-ja
Hannu Nyman [Sun, 27 May 2018 12:32:38 +0000 (15:32 +0300)]
Merge pull request #1832 from musashino205/l10n/fw-upd-ja

luci-app-firewall: update Japanese translation

6 years agoluci-app-firewall: update Japanese translation 1832/head
INAGAKI Hiroshi [Sun, 27 May 2018 12:27:32 +0000 (21:27 +0900)]
luci-app-firewall: update Japanese translation

Added Japanese translations for offloading options.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-firewall: sync translations
INAGAKI Hiroshi [Sun, 27 May 2018 12:07:07 +0000 (21:07 +0900)]
luci-app-firewall: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1826 from hnyman/offload
Hannu Nyman [Sun, 27 May 2018 06:55:55 +0000 (09:55 +0300)]
Merge pull request #1826 from hnyman/offload

luci-app-firewall: expose flow offloading options

6 years agoMerge pull request #1829 from musashino205/l10n/mwan3-upd-ja
Hannu Nyman [Sat, 26 May 2018 18:33:36 +0000 (21:33 +0300)]
Merge pull request #1829 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

6 years agoluci-app-mwan3: update Japanese translation 1829/head
INAGAKI Hiroshi [Sat, 26 May 2018 18:12:24 +0000 (03:12 +0900)]
luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-firewall: expose flow offloading options 1826/head
Hannu Nyman [Sat, 26 May 2018 17:31:23 +0000 (20:31 +0300)]
luci-app-firewall: expose flow offloading options

Expose options related to routing/NAT flow offloading
feature in firewall3. Offloading is available in kernel 4.14+

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoluci-theme-material: upgrade jquery 1827/head
Ansuel Smith [Sat, 26 May 2018 16:58:45 +0000 (18:58 +0200)]
luci-theme-material: upgrade jquery

This upgrade jquery to latest version and solve 404 error for the useless .map file. Also it's 85kb instead of 97kb

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoi18n: one more fix for Polish translation
Hannu Nyman [Fri, 25 May 2018 14:11:47 +0000 (17:11 +0300)]
i18n: one more fix for Polish translation

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoi18n: sync, fix and cleanup translations
Hannu Nyman [Fri, 25 May 2018 13:43:09 +0000 (16:43 +0300)]
i18n: sync, fix and cleanup translations

* sync translations (aiccu removal)
* remove some other old strings
* fix Polish translation

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoMerge pull request #1821 from TDT-AG/pr/20180521-protocols-remove-aiccu
Hannu Nyman [Fri, 25 May 2018 13:10:19 +0000 (16:10 +0300)]
Merge pull request #1821 from TDT-AG/pr/20180521-protocols-remove-aiccu

luci-proto-ipv6: remove outdated aiccu proto support

6 years agoluci-proto-ipv6: remove outdated aiccu proto support 1821/head
Florian Eckert [Fri, 25 May 2018 09:37:10 +0000 (11:37 +0200)]
luci-proto-ipv6: remove outdated aiccu proto support

Remove outdated package for luci proto section.
See commit:
https://github.com/openwrt/packages/commit/441f8a3ed1da96f6236988d672011bff11057d6b

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #1481 from TDT-AG/luci-app-openvpn-fixes
Jo-Philipp Wich [Fri, 25 May 2018 05:22:27 +0000 (07:22 +0200)]
Merge pull request #1481 from TDT-AG/luci-app-openvpn-fixes

luci-app-openvpn: several fixes

6 years agoMerge pull request #1818 from dibdot/lxc_fix
Dirk Brenken [Wed, 23 May 2018 22:26:42 +0000 (00:26 +0200)]
Merge pull request #1818 from dibdot/lxc_fix

luci-app-lxc: remove wrong leftover from last commit

6 years agoluci-app-lxc: remove wrong leftover from last commit 1818/head
Dirk Brenken [Wed, 23 May 2018 22:25:36 +0000 (00:25 +0200)]
luci-app-lxc: remove wrong leftover from last commit

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1817 from dibdot/travelmate
Dirk Brenken [Wed, 23 May 2018 21:52:03 +0000 (23:52 +0200)]
Merge pull request #1817 from dibdot/travelmate

luci-app-travelmate: fix url ampersand encoding

6 years agoluci-app-travelmate: fix url ampersand encoding 1817/head
Dirk Brenken [Wed, 23 May 2018 21:48:47 +0000 (23:48 +0200)]
luci-app-travelmate: fix url ampersand encoding

* fix ampersand encoding in wireless stations overview

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1808 from dibdot/lxc_fix
Dirk Brenken [Wed, 23 May 2018 20:22:44 +0000 (22:22 +0200)]
Merge pull request #1808 from dibdot/lxc_fix

luci-app-lxc: fix "plain-vanilla" integration

6 years agoluci-app-lxc: fix "plain-vanilla" integration 1808/head
Dirk Brenken [Sun, 20 May 2018 17:23:53 +0000 (19:23 +0200)]
luci-app-lxc: fix "plain-vanilla" integration

I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.

* fix missing tar/xz dependency,
  only if LXC_BUSYBOX_OPTIONS is not selected
* mute needless gpg validation warning
* tidy up controller a little bit
* fix multiple possible dispatcher errors
* fix compatibility with XHTML standard theme (looks still horrible ;-)
* inform the user about custom kernel prerequisites
* inform the user about the template download
* inform the user if no template was found

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1814 from Ansuel/lua-interpreter
Jo-Philipp Wich [Wed, 23 May 2018 07:58:53 +0000 (09:58 +0200)]
Merge pull request #1814 from Ansuel/lua-interpreter

luci-base: fix dispacher fail

6 years agoluci-base: fix dispacher fail 1814/head
Ansuel Smith [Sun, 20 May 2018 17:51:33 +0000 (19:51 +0200)]
luci-base: fix dispacher fail

http.getenv("SCRIPT_NAME") fail if it's not provided. This can happen in the login screen when we don't have any script to load.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1810 from musashino205/l10n/tmate-upd-ja
Hannu Nyman [Mon, 21 May 2018 15:07:54 +0000 (18:07 +0300)]
Merge pull request #1810 from musashino205/l10n/tmate-upd-ja

luci-app-travelmate: update Japanese translation

6 years agoluci-app-travelmate: update Japanese translation 1810/head
INAGAKI Hiroshi [Mon, 21 May 2018 14:55:39 +0000 (23:55 +0900)]
luci-app-travelmate: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1809 from musashino205/l10n/adblk-upd-ja
Hannu Nyman [Mon, 21 May 2018 14:17:13 +0000 (17:17 +0300)]
Merge pull request #1809 from musashino205/l10n/adblk-upd-ja

luci-app-adblock: update Japanese translation

6 years agoluci-app-adblock: update Japanese translation 1809/head
INAGAKI Hiroshi [Mon, 21 May 2018 14:11:24 +0000 (23:11 +0900)]
luci-app-adblock: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1805 from musashino205/l10n/base-upd-ja
Hannu Nyman [Sun, 20 May 2018 16:26:57 +0000 (19:26 +0300)]
Merge pull request #1805 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoluci-base: update Japanese translation 1805/head
INAGAKI Hiroshi [Sun, 20 May 2018 16:01:31 +0000 (01:01 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoi18n: sync translations
INAGAKI Hiroshi [Sun, 20 May 2018 13:29:33 +0000 (22:29 +0900)]
i18n: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-mod-admin-full: fix crash on wireless when no networks are declared
Jo-Philipp Wich [Sat, 19 May 2018 21:28:14 +0000 (23:28 +0200)]
luci-mod-admin-full: fix crash on wireless when no networks are declared

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: do not override iface section in wireless cbi map
Jo-Philipp Wich [Sat, 19 May 2018 21:26:34 +0000 (23:26 +0200)]
luci-mod-admin-full: do not override iface section in wireless cbi map

Do override the iface section id upon commit to avoid clobbering the resulting
configuration. The manual config sync is not needed anymore after switching
to uncached ubus uci operations.

Fixes #1770.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: handle potential crash in luci.model.network.interface.get_i18n()
Jo-Philipp Wich [Sat, 19 May 2018 20:11:05 +0000 (22:11 +0200)]
luci-base: handle potential crash in luci.model.network.interface.get_i18n()

Should prevent the crash mentioned in #1779.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: break circular luci.config <> luci.model.uci dependency
Jo-Philipp Wich [Sat, 19 May 2018 11:07:37 +0000 (13:07 +0200)]
luci-base: break circular luci.config <> luci.model.uci dependency

On certain environments, mainly with the embedded uhttpd interpreter, the
luci.config class cannot be loaded due to a circular dependency with the
luci.model.uci class.

Break up the dependency by deferring the loading of luci.config in
luci.model.uci until it is actually needed.

Fixes #1803, FS#1553.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1801 from dibdot/adblock
Dirk Brenken [Fri, 18 May 2018 16:31:07 +0000 (18:31 +0200)]
Merge pull request #1801 from dibdot/adblock

luci-app-adblock: respect SimpleForm size limit

6 years agoluci-app-adblock: respect SimpleForm size limit 1801/head
Dirk Brenken [Fri, 18 May 2018 16:17:31 +0000 (18:17 +0200)]
luci-app-adblock: respect SimpleForm size limit

* respect SimpleForm size limit of 100KB for advanced online editing

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-lib-json: support serializing userdata
Jo-Philipp Wich [Fri, 18 May 2018 14:59:16 +0000 (16:59 +0200)]
luci-lib-json: support serializing userdata

Fixes the following error when attempting to serialize userdata objects:

    .../json.lua:81: attempt to call local 'parser' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-rpc: fix unresolved controller reference in rpc_auth()
Jo-Philipp Wich [Fri, 18 May 2018 14:58:17 +0000 (16:58 +0200)]
luci-mod-rpc: fix unresolved controller reference in rpc_auth()

Fixes the following error:

   .../rpc.lua:85: attempt to index global 'ctrl' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1769 from jow-/master
Jo-Philipp Wich [Fri, 18 May 2018 14:44:33 +0000 (16:44 +0200)]
Merge pull request #1769 from jow-/master

UCI apply/rollback workflow

6 years agoluci-base: raise maximum POST value size to 100KB
Jo-Philipp Wich [Fri, 18 May 2018 14:42:43 +0000 (16:42 +0200)]
luci-base: raise maximum POST value size to 100KB

Signed-off-by: Jo-Philipp Wich <jo@mein.io>