project/luci.git
3 years agoMerge pull request #1154 from stangri/luci-app-simple-adblock
Hannu Nyman [Mon, 8 May 2017 06:55:35 +0000 (09:55 +0300)]
Merge pull request #1154 from stangri/luci-app-simple-adblock

luci-app-simple-adblock: pt/pt-br translations.

3 years agoluci-app-simple-adblock: pt translation 1154/head
Stan Grishin [Sat, 18 Mar 2017 23:24:36 +0000 (16:24 -0700)]
luci-app-simple-adblock: pt translation

Signed-off-by: Stan Grishin <stangri@melmac.net>
3 years agoMerge pull request #1155 from Umeaboy/patch-26
Hannu Nyman [Sun, 7 May 2017 19:19:17 +0000 (22:19 +0300)]
Merge pull request #1155 from Umeaboy/patch-26

Updated adblock

3 years agoUpdated adblock 1155/head
Kristoffer Grundström [Sun, 7 May 2017 19:14:10 +0000 (21:14 +0200)]
Updated adblock

Signed-off-by <hamnisdude@gmail.com>

3 years agoluci-app-travelmate: sync with travelmate 0.7.2
Dirk Brenken [Sun, 7 May 2017 16:57:08 +0000 (19:57 +0300)]
luci-app-travelmate: sync with travelmate 0.7.2

* simplify uplink interface setup (just one Click! ;-),
  now part of the overview tab (removed separate setup page!)
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
Conflict resolved by Hannu Nyman

3 years agoluci-base: luci.dispatcher: allow overriding sysauth template
Jo-Philipp Wich [Sat, 6 May 2017 13:06:07 +0000 (15:06 +0200)]
luci-base: luci.dispatcher: allow overriding sysauth template

In some cases it is useful to be able to override the template used for the
sysauth login dialog.

Add a new property "sysauth_template" which allows overriding the template
name from controller files.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
3 years agoMerge pull request #1145 from musashino205/sync-trans
Hannu Nyman [Tue, 2 May 2017 10:16:38 +0000 (13:16 +0300)]
Merge pull request #1145 from musashino205/sync-trans

i18n: Sync translations

3 years agoi18n: Sync translations 1145/head
INAGAKI Hiroshi [Tue, 2 May 2017 10:12:32 +0000 (19:12 +0900)]
i18n: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-statistics: fix whitespace
Hannu Nyman [Tue, 2 May 2017 07:07:30 +0000 (10:07 +0300)]
luci-app-statistics: fix whitespace

* fix whitespace in config file
* place the contextswitch item corerrctly
  in the sorted options list

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #1144 from LuttyYang/master
Hannu Nyman [Tue, 2 May 2017 06:53:59 +0000 (09:53 +0300)]
Merge pull request #1144 from LuttyYang/master

luci-theme-material: fix some bug and sync some code from luci-theme-bootstrap

3 years agoMerge pull request #1140 from fantom-x/luci-mod-admin-full-mac80211-isolate
Hannu Nyman [Tue, 2 May 2017 06:52:13 +0000 (09:52 +0300)]
Merge pull request #1140 from fantom-x/luci-mod-admin-full-mac80211-isolate

luci-mod-admin-full: "isolate" option is missing for mac80211

3 years agofix some bug and sync some code from luci-theme-bootstrap 1144/head
lutty [Tue, 2 May 2017 04:17:24 +0000 (12:17 +0800)]
fix some bug and sync some code from luci-theme-bootstrap

Signed-off-by: lutty <lutty@lutty.me>
3 years agoluci-mod-admin-full: "isolate" option is missing for mac80211 1140/head
fantom-x [Sun, 30 Apr 2017 20:38:45 +0000 (16:38 -0400)]
luci-mod-admin-full: "isolate" option is missing for mac80211

Signed-off-by: Marc Benoit marcb6218@gmail.com
3 years agoMerge pull request #1139 from fantom-x/luci-app-hd-idle-menu-item
Hannu Nyman [Sun, 30 Apr 2017 20:27:00 +0000 (23:27 +0300)]
Merge pull request #1139 from fantom-x/luci-app-hd-idle-menu-item

luci-app-hd-idle: removed dashes in menu items and text labels

3 years agoluci-app-hd-idle: removed dashes in menu items and text labels 1139/head
fantom-x [Sun, 30 Apr 2017 19:42:55 +0000 (15:42 -0400)]
luci-app-hd-idle: removed dashes in menu items and text labels

"hd-idle" replaced with "HDD Idle" in the menu and on the page. All translation files updated accordingly.

Signed-off-by: Marc Benoit marcb6218@gmail.com
3 years agoluci-app-statistics: processes plugin: add labels, correct data
Hannu Nyman [Sun, 30 Apr 2017 16:00:39 +0000 (19:00 +0300)]
luci-app-statistics: processes plugin: add labels, correct data

Enhance processes statistics page:
* add proper labels to graphs
* correct RSS memory stats title, add VSZ stats

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #1133 from fantom-x/luci-app-samba-browseable
Hannu Nyman [Sun, 30 Apr 2017 13:14:15 +0000 (16:14 +0300)]
Merge pull request #1133 from fantom-x/luci-app-samba-browseable

luci-app-samba: add "Browsable" checkbox to each share

3 years agoMerge pull request #1134 from fantom-x/luci-app-samba-allow-homes
Hannu Nyman [Sun, 30 Apr 2017 13:13:50 +0000 (16:13 +0300)]
Merge pull request #1134 from fantom-x/luci-app-samba-allow-homes

luci-app-samba: "Share home-directories" check box

3 years agoluci-app-samba: use flag for "Share home-directories" option 1134/head
fantom-x [Sat, 29 Apr 2017 23:47:12 +0000 (19:47 -0400)]
luci-app-samba: use flag for "Share home-directories" option

"Share home-directories" has only two values 0 and 1. There is no need for it to be a text box

Signed-off-by: Marc Benoit marcb6218@gmail.com
3 years agoluci-app-samba: add "Browsable" checkbox to the "Network Shares" page for each share 1133/head
fantom-x [Sat, 29 Apr 2017 20:53:08 +0000 (16:53 -0400)]
luci-app-samba: add "Browsable" checkbox to the "Network Shares" page for each share

Signed-off-by: Marc Benoit marcb6218@gmail.com
3 years agoMerge pull request #1132 from fantom-x/luci-collectd-mod-contextswitch
Hannu Nyman [Sat, 29 Apr 2017 17:26:48 +0000 (20:26 +0300)]
Merge pull request #1132 from fantom-x/luci-collectd-mod-contextswitch

Support for collectd-mod-contextswitch

3 years agoSupport for collectd-mod-contextswitch 1132/head
fantom-x [Sat, 29 Apr 2017 15:26:16 +0000 (11:26 -0400)]
Support for collectd-mod-contextswitch

Signed-off-by: Marc Benoit marcb6218@gmail.com
3 years agoMerge pull request #1131 from musashino205/adblk-upd-ja
Hannu Nyman [Sat, 29 Apr 2017 07:59:16 +0000 (10:59 +0300)]
Merge pull request #1131 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

3 years agoluci-app-adblock: Update Japanese translation 1131/head
INAGAKI Hiroshi [Sat, 29 Apr 2017 00:32:17 +0000 (09:32 +0900)]
luci-app-adblock: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-adblock: Sync translations
INAGAKI Hiroshi [Sat, 29 Apr 2017 00:19:44 +0000 (09:19 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1128 from dibdot/app-adblock
Hannu Nyman [Thu, 27 Apr 2017 07:16:57 +0000 (10:16 +0300)]
Merge pull request #1128 from dibdot/app-adblock

luci-app-adblock: fix markup

3 years agoluci-app-adblock: fix markup 1128/head
Dirk Brenken [Wed, 26 Apr 2017 21:31:11 +0000 (23:31 +0200)]
luci-app-adblock: fix markup

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1126 from chris5560/master
Hannu Nyman [Wed, 26 Apr 2017 20:00:04 +0000 (23:00 +0300)]
Merge pull request #1126 from chris5560/master

luci-app-ddns: fix to correct system status

3 years agoluci-app-ddns: fix to correct system status 1126/head
Christian Schoenebeck [Wed, 26 Apr 2017 19:54:57 +0000 (21:54 +0200)]
luci-app-ddns: fix to correct system status

preset network "wan", if not configured in ddns config to correct
display system status #1117

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
3 years agoMerge pull request #1124 from dibdot/app-adblock
Hannu Nyman [Wed, 26 Apr 2017 11:52:16 +0000 (14:52 +0300)]
Merge pull request #1124 from dibdot/app-adblock

luci-app-adblock: sync with 2.6.1

3 years agoluci-app-adblock: sync with 2.6.1 1124/head
Dirk Brenken [Tue, 25 Apr 2017 21:17:08 +0000 (23:17 +0200)]
luci-app-adblock: sync with 2.6.1

* add two new extra options
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1123 from Wedmer/master
Hannu Nyman [Tue, 25 Apr 2017 17:14:19 +0000 (20:14 +0300)]
Merge pull request #1123 from Wedmer/master

[luci-app-openvpn] Fixed ivalid checks for parameters in VPN tab.

3 years ago[luci-app-openvpn] Fixed ivalid checks for parameters in VPN tab. 1123/head
Vladimir Ulrich [Tue, 25 Apr 2017 16:40:41 +0000 (19:40 +0300)]
[luci-app-openvpn] Fixed ivalid checks for parameters in VPN tab.
closes #887

Signed-off-by: Vladimir Ulrich <admin@evl.su>
3 years agoluci-mod-admin-full: correct logic for dnsmasq boguspriv keyword
muddyfeet [Tue, 25 Apr 2017 11:52:04 +0000 (12:52 +0100)]
luci-mod-admin-full: correct logic for dnsmasq boguspriv keyword

Prevents deletion of the UCI dns boguspriv keyword and explicitly sets it to
either 0 or removes it as the LEDE/Openwrt dnsmasq.conf default is 1 - not 0.

This allows boguspriv to be turned off from the GUI.

Signed-off-by: Warren Linton <warren@linton.id.au>
[Jo-Philipp Wich: squashed commits, updated commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
3 years agoluci-app-uhttpd: remove unnecessary fields from Makefile
Hannu Nyman [Sun, 23 Apr 2017 14:07:44 +0000 (17:07 +0300)]
luci-app-uhttpd: remove unnecessary fields from Makefile

Remove unnecessary fields from Makefile and
rely on LuCI automatics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-dynapoint: remove unnecessary fields from Makefile
Hannu Nyman [Sun, 23 Apr 2017 10:12:30 +0000 (13:12 +0300)]
luci-app-dynapoint: remove unnecessary fields from Makefile

Remove unnecessary fields from Makefile and
rely on LuCI automatics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-fwknopd: remove unnecessary fields from Makefile
Hannu Nyman [Sun, 23 Apr 2017 10:05:58 +0000 (13:05 +0300)]
luci-app-fwknopd: remove unnecessary fields from Makefile

Remove unnecessary version fields from Makefile and
rely on LuCI automatics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-proto-vpnc: remove unnecessary fields from Makefile
Hannu Nyman [Sun, 23 Apr 2017 10:03:58 +0000 (13:03 +0300)]
luci-proto-vpnc: remove unnecessary fields from Makefile

Remove unnecessary fields from Makefile and
rely on LuCI automatics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci.mk: fix length of abbreviated hash in version
Hannu Nyman [Sun, 23 Apr 2017 06:36:29 +0000 (09:36 +0300)]
luci.mk: fix length of abbreviated hash in version

Fix the length of the abbreviated commit hash used in
the LuCI version string used in the package names.
Use the old standard of seven characters in hash.

New git versions vary the length of the abbreviated
commit hash based on the number of objects in repo. That
may lead into different hash lengths with e.g. having
full/shallow git history, having all/single branch or
having different git versions in different build hosts.

Different hash lengths in package name may lead to
sneaky opkg install errors, as opkg apparently preserves
info for removed packages and may prefer that.
Example:
$ opkg install http://downloads...luci-app-statistics_git-17.073.42825-b47a21f-1_all.ipk
Downloading http://downloads...luci-app-statistics_git-17.073.42825-b47a21f-1_all.ipk
Installing luci-app-statistics (git-17.073.42825-b47a21fbb-1) to root...
Collected errors:
 * opkg_download_pkg: Package luci-app-statistics is not available from any configured src.

The error above is ultimately in opkg, but mitigate
the problem by fixing the hash length when building LuCI.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #1119 from musashino205/tmate-upd-ja
Hannu Nyman [Sat, 22 Apr 2017 14:59:29 +0000 (17:59 +0300)]
Merge pull request #1119 from musashino205/tmate-upd-ja

luci-app-travelmate: Update Japanese translation

3 years agoluci-app-travelmate: Update Japanese translation 1119/head
INAGAKI Hiroshi [Sat, 22 Apr 2017 08:43:01 +0000 (17:43 +0900)]
luci-app-travelmate: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-travelmate: Sync translations
INAGAKI Hiroshi [Sat, 22 Apr 2017 07:41:57 +0000 (16:41 +0900)]
luci-app-travelmate: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-travelmate: Fix detection issues of i18n tools
INAGAKI Hiroshi [Sat, 22 Apr 2017 07:25:37 +0000 (16:25 +0900)]
luci-app-travelmate: Fix detection issues of i18n tools

Fixed detection issues of i18n tools for translation target.
'translate()' -> 'translatef()'
And fixed the format within that function.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1118 from dibdot/app-travelmate
Hannu Nyman [Fri, 21 Apr 2017 19:19:35 +0000 (22:19 +0300)]
Merge pull request #1118 from dibdot/app-travelmate

travelmate: major frontend update

3 years agotravelmate: major frontend update 1118/head
Dirk Brenken [Fri, 21 Apr 2017 19:01:52 +0000 (21:01 +0200)]
travelmate: major frontend update

* all options are full configurable via frontend
* show current runtime information
* show current travelmate logfile information
* automatic wwan network interface setup (advanced section)
* direct access to all relevant configuration files (advanced section)

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoluci-mod-admin-full: use `nf_conntrack_count` for counting connections (#1114)
Jo-Philipp Wich [Thu, 20 Apr 2017 14:55:29 +0000 (16:55 +0200)]
luci-mod-admin-full: use `nf_conntrack_count` for counting connections (#1114)

As suggested by PR #1114, use `/proc/sys/net/netfilter/nf_conntrack_count`
instead of counting the lines in `/proc/net/nf_conntrack` but use a slightly
more efficient approach which avoids spawning an extra `cat` command.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
3 years agoMerge pull request #1111 from liushuyu/master
Hannu Nyman [Wed, 19 Apr 2017 06:52:40 +0000 (09:52 +0300)]
Merge pull request #1111 from liushuyu/master

luci-app: Improve zh-CN translations

3 years agoluci-app: Improve zh-CN translations 1111/head
liushuyu [Sat, 15 Apr 2017 00:06:19 +0000 (18:06 -0600)]
luci-app: Improve zh-CN translations

3 years agoMerge pull request #1110 from psyborg55/psyborg55-patch-1
Hannu Nyman [Tue, 18 Apr 2017 12:40:03 +0000 (15:40 +0300)]
Merge pull request #1110 from psyborg55/psyborg55-patch-1

luci-app-mwan3: disable uci/sed errors print to syslog

3 years agoMerge pull request #1115 from dibdot/app-adblock
Hannu Nyman [Mon, 17 Apr 2017 17:29:11 +0000 (20:29 +0300)]
Merge pull request #1115 from dibdot/app-adblock

luci-app-adblock: sync with 2.6.0-2

3 years agoluci-app-adblock: sync with 2.6.0-2 1115/head
Dirk Brenken [Sun, 16 Apr 2017 06:24:03 +0000 (08:24 +0200)]
luci-app-adblock: sync with 2.6.0-2

* made default trigger delay more conservative to fix possible start up
issues
* add luci-lib-jsonc dependency

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1113 from yousong/fix
Jo-Philipp Wich [Sat, 15 Apr 2017 13:16:58 +0000 (15:16 +0200)]
Merge pull request #1113 from yousong/fix

luci-app-upnp: fix setting ucitrack init option

3 years agoluci-app-upnp: fix setting ucitrack init option 1113/head
Yousong Zhou [Sat, 15 Apr 2017 03:50:32 +0000 (11:50 +0800)]
luci-app-upnp: fix setting ucitrack init option

Fixes FS#693

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
3 years agoluci-app-mwan3: disable uci/sed errors print to syslog 1110/head
psyborg55 [Fri, 14 Apr 2017 21:30:47 +0000 (23:30 +0200)]
luci-app-mwan3: disable uci/sed errors print to syslog

Maintainer: @arfett
Compile tested: ramips, xiaomi mini, r50082
Run tested: ramips, xiaomi mini, r50082

Add uci parameter to silence errors printed to syslog and append extra redirect of sed error messages to /dev/null.

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
3 years agoMerge pull request #1109 from musashino205/adblk-upd-ja
Hannu Nyman [Thu, 13 Apr 2017 06:43:07 +0000 (09:43 +0300)]
Merge pull request #1109 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

3 years agoluci-app-adblock: Update Japanese translation 1109/head
INAGAKI Hiroshi [Thu, 13 Apr 2017 04:11:58 +0000 (13:11 +0900)]
luci-app-adblock: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-adblock: Sync translations
INAGAKI Hiroshi [Thu, 13 Apr 2017 03:35:16 +0000 (12:35 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1108 from dibdot/app-adblock
Hannu Nyman [Wed, 12 Apr 2017 14:04:35 +0000 (17:04 +0300)]
Merge pull request #1108 from dibdot/app-adblock

luci-app-adblock: sync with adblock 2.6.0

3 years agoluci-app-adblock: sync with adblock 2.6.0 1108/head
Dirk Brenken [Mon, 10 Apr 2017 05:01:33 +0000 (07:01 +0200)]
luci-app-adblock: sync with adblock 2.6.0

* add new trigger timeout input field
* the download utility plus SSL Library will be listed in runtime
  information and the blocklist source table contains an additional
  "SSL req." column
* various small fixes
* changed copyright notice

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1107 from TDT-GmbH/openvpn_remote_random
Hannu Nyman [Wed, 12 Apr 2017 07:08:14 +0000 (10:08 +0300)]
Merge pull request #1107 from TDT-GmbH/openvpn_remote_random

luci-app-openvpn: Fix default value for remote_random flag

3 years agoluci-app-openvpn: Fix default value for remote_random flag 1107/head
Martin Schiller [Wed, 12 Apr 2017 04:26:10 +0000 (06:26 +0200)]
luci-app-openvpn: Fix default value for remote_random flag

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
3 years agoMerge pull request #1106 from musashino205/mwan3-upd-ja
Hannu Nyman [Mon, 10 Apr 2017 14:54:14 +0000 (17:54 +0300)]
Merge pull request #1106 from musashino205/mwan3-upd-ja

luci-app-mwan3: Update Japanese translation

3 years agoluci-app-mwan3: Update Japanese translation 1106/head
INAGAKI Hiroshi [Mon, 10 Apr 2017 14:05:48 +0000 (23:05 +0900)]
luci-app-mwan3: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agotimezone data: update to 2017b
Hannu Nyman [Mon, 10 Apr 2017 11:45:20 +0000 (14:45 +0300)]
timezone data: update to 2017b

Update timezone data to 2017b.

http://mm.icann.org/pipermail/tz-announce/2017-February/000045.html
http://mm.icann.org/pipermail/tz-announce/2017-March/000046.html

Key changes in 2017a-2017b:

* Mongolia no longer observes DST.
* Chile's Region of Magallanes moves from -04/-03 to -03 year-round.
* Switch to numeric time zone abbreviations for South America, as
  part of the ongoing project of removing invented abbreviations.
* Haiti resumed observance of DST in 2017.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-mwan3: sync translations
Hannu Nyman [Mon, 10 Apr 2017 11:42:14 +0000 (14:42 +0300)]
luci-app-mwan3: sync translations

Fix manually minor breakage from the previous commit.
Prune some deleted strings.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoMerge pull request #1104 from musashino205/mwan3-fix-trans
Hannu Nyman [Mon, 10 Apr 2017 11:28:12 +0000 (14:28 +0300)]
Merge pull request #1104 from musashino205/mwan3-fix-trans

luci-app-mwan3: Fix luci tools cannot detect translate()

3 years agoluci-app-mwan3: Fix luci tools cannot detect translate() 1104/head
INAGAKI Hiroshi [Sun, 9 Apr 2017 12:38:36 +0000 (21:38 +0900)]
luci-app-mwan3: Fix luci tools cannot detect translate()

Fixed strings in Lua sources where the LuCI i18n tools cannot be
detected. And also fixed some other problems.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1103 from kuoruan/zh-cn-tr
Hannu Nyman [Sun, 9 Apr 2017 08:37:29 +0000 (11:37 +0300)]
Merge pull request #1103 from kuoruan/zh-cn-tr

Update Simplified Chinese translation

3 years agoluci-app-mwan3: Add Simplified Chinese translation 1103/head
Hsing-Wang Liao [Sun, 9 Apr 2017 08:18:44 +0000 (16:18 +0800)]
luci-app-mwan3: Add Simplified Chinese translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
3 years agoluci-base: Update Simplified Chinese translation
Hsing-Wang Liao [Sun, 9 Apr 2017 06:54:32 +0000 (14:54 +0800)]
luci-base: Update Simplified Chinese translation

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
3 years agoMerge pull request #1071 from TDT-GmbH/add-force-link-option
Hannu Nyman [Thu, 6 Apr 2017 20:01:48 +0000 (23:01 +0300)]
Merge pull request #1071 from TDT-GmbH/add-force-link-option

luci-mod-admin-full: Add force link option in interfaces advanced settings section

3 years agoMerge pull request #1099 from musashino205/mwan3-upd-ja
Hannu Nyman [Thu, 6 Apr 2017 19:00:23 +0000 (22:00 +0300)]
Merge pull request #1099 from musashino205/mwan3-upd-ja

luci-app-mwan3: Update Japanese translation

3 years agoluci-app-mwan3: Update Japanese translation 1099/head
INAGAKI Hiroshi [Thu, 6 Apr 2017 18:53:13 +0000 (03:53 +0900)]
luci-app-mwan3: Update Japanese translation

Synchronized translations with sources and updated japanese
translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1094 from TDT-GmbH/luci-app-mwan3-update
Hannu Nyman [Thu, 6 Apr 2017 08:11:37 +0000 (11:11 +0300)]
Merge pull request #1094 from TDT-GmbH/luci-app-mwan3-update

luci-app-mwan3: update interfaceconfig page with new params

3 years agoMerge pull request #1098 from musashino205/mwan3-add-ja
Hannu Nyman [Tue, 4 Apr 2017 15:06:19 +0000 (18:06 +0300)]
Merge pull request #1098 from musashino205/mwan3-add-ja

luci-app-mwan3: Add Japanese translation

3 years agoMerge pull request #1097 from musashino205/adblk-upd-ja
Hannu Nyman [Tue, 4 Apr 2017 15:05:35 +0000 (18:05 +0300)]
Merge pull request #1097 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

3 years agoluci-app-adblock: Update Japanese translation 1097/head
INAGAKI Hiroshi [Tue, 4 Apr 2017 14:33:16 +0000 (23:33 +0900)]
luci-app-adblock: Update Japanese translation

Added and Modified some Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-adblock: Sync translations
INAGAKI Hiroshi [Tue, 4 Apr 2017 14:28:50 +0000 (23:28 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-mwan3: Add Japanese translation 1098/head
INAGAKI Hiroshi [Tue, 4 Apr 2017 13:49:38 +0000 (22:49 +0900)]
luci-app-mwan3: Add Japanese translation

Added po templates and Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1096 from dibdot/app-adblock
Hannu Nyman [Tue, 4 Apr 2017 12:28:44 +0000 (15:28 +0300)]
Merge pull request #1096 from dibdot/app-adblock

luci-app-adblock: sync with adblock 2.5.1

3 years agoluci-app-adblock: sync with adblock 2.5.1 1096/head
Dirk Brenken [Tue, 4 Apr 2017 12:11:41 +0000 (14:11 +0200)]
luci-app-adblock: sync with adblock 2.5.1

* made buttons translatable
* accept empty values for interface trigger input field
* replace 'url' with 'luci.dispatcher.build_url'

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1095 from musashino205/adblk-upd-ja
Hannu Nyman [Tue, 4 Apr 2017 11:10:07 +0000 (14:10 +0300)]
Merge pull request #1095 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

3 years agoluci-app-adblock: Update Japanese translation 1095/head
INAGAKI Hiroshi [Tue, 4 Apr 2017 11:04:51 +0000 (20:04 +0900)]
luci-app-adblock: Update Japanese translation

Updated Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-mwan3: add me as co maintainer 1094/head
Florian Eckert [Mon, 3 Apr 2017 09:19:56 +0000 (11:19 +0200)]
luci-app-mwan3: add me as co maintainer

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoluci-app-mwan3: add failure and recovery interval
Florian Eckert [Mon, 3 Apr 2017 09:16:42 +0000 (11:16 +0200)]
luci-app-mwan3: add failure and recovery interval

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoluci-app-mwan3: call translatef funktion if reasonable
Florian Eckert [Mon, 3 Apr 2017 09:04:34 +0000 (11:04 +0200)]
luci-app-mwan3: call translatef funktion if reasonable

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoMerge pull request #1093 from musashino205/base-upd-ja
Hannu Nyman [Sun, 2 Apr 2017 20:56:34 +0000 (23:56 +0300)]
Merge pull request #1093 from musashino205/base-upd-ja

luci-base: Update Japanese translation

3 years agoluci-base: Update Japanese translation 1093/head
INAGAKI Hiroshi [Sun, 2 Apr 2017 17:32:28 +0000 (02:32 +0900)]
luci-base: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1091 from TDT-GmbH/mwan3-add-params
Hannu Nyman [Fri, 31 Mar 2017 13:09:33 +0000 (16:09 +0300)]
Merge pull request #1091 from TDT-GmbH/mwan3-add-params

Mwan3 add params

3 years agoluci-app-mwan3: add new ip family param 1091/head
Florian Eckert [Fri, 31 Mar 2017 12:57:27 +0000 (14:57 +0200)]
luci-app-mwan3: add new ip family param

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoluci-app-mwan3: add new conntrack flash param
Florian Eckert [Fri, 31 Mar 2017 12:56:06 +0000 (14:56 +0200)]
luci-app-mwan3: add new conntrack flash param

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoluci-app-mwan3: add new ping size param
Florian Eckert [Fri, 31 Mar 2017 12:52:45 +0000 (14:52 +0200)]
luci-app-mwan3: add new ping size param

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoMerge pull request #1090 from musashino205/i18n-sync
Hannu Nyman [Thu, 30 Mar 2017 16:46:27 +0000 (19:46 +0300)]
Merge pull request #1090 from musashino205/i18n-sync

i18n: Sync translations

3 years agoi18n: Sync translations 1090/head
INAGAKI Hiroshi [Thu, 30 Mar 2017 15:50:22 +0000 (00:50 +0900)]
i18n: Sync translations

Synchronized all translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1088 from dibdot/luci-app-adblock
Hannu Nyman [Tue, 28 Mar 2017 18:12:27 +0000 (21:12 +0300)]
Merge pull request #1088 from dibdot/luci-app-adblock

luci-app-adblock: fix XHTML/HTML5 markup

3 years agoluci-app-adblock: fix XHTML/HTML5 markup 1088/head
Dirk Brenken [Tue, 28 Mar 2017 18:05:03 +0000 (20:05 +0200)]
luci-app-adblock: fix XHTML/HTML5 markup

* fix XHTML parsing errors in openwrt theme
* tested with openwrt, bootstrap & material theme

Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoMerge pull request #1085 from musashino205/adblk-upd-ja
Hannu Nyman [Mon, 27 Mar 2017 14:22:07 +0000 (17:22 +0300)]
Merge pull request #1085 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

3 years agoluci-app-adblock: Update Japanese translation 1085/head
INAGAKI Hiroshi [Mon, 27 Mar 2017 13:20:46 +0000 (22:20 +0900)]
luci-app-adblock: Update Japanese translation

Added Japanese translations of recently added strings.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoluci-app-adblock: Sync translations
INAGAKI Hiroshi [Mon, 27 Mar 2017 13:04:31 +0000 (22:04 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with Lua sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
3 years agoMerge pull request #1083 from dibdot/luci-app-adblock
Hannu Nyman [Mon, 27 Mar 2017 11:25:49 +0000 (14:25 +0300)]
Merge pull request #1083 from dibdot/luci-app-adblock

luci-app-adblock: small fixes in overview tab