project/luci.git
7 years agoMerge pull request #1205 from Umeaboy/patch-32
Hannu Nyman [Sat, 17 Jun 2017 19:11:20 +0000 (22:11 +0300)]
Merge pull request #1205 from Umeaboy/patch-32

clamav: Added the Swedish language

7 years agoMerge pull request #1204 from Umeaboy/patch-31
Hannu Nyman [Sat, 17 Jun 2017 19:10:35 +0000 (22:10 +0300)]
Merge pull request #1204 from Umeaboy/patch-31

luci-app-commands: Updated the Swedish translation

7 years agoclamav: Added the Swedish language 1205/head
Kristoffer Grundström [Sat, 17 Jun 2017 18:04:52 +0000 (20:04 +0200)]
clamav: Added the Swedish language

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoluci-app-commands-sv 1204/head
Kristoffer Grundström [Sat, 17 Jun 2017 17:49:23 +0000 (19:49 +0200)]
luci-app-commands-sv

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoMerge pull request #1199 from Umeaboy/patch-29
Hannu Nyman [Sat, 17 Jun 2017 06:22:10 +0000 (09:22 +0300)]
Merge pull request #1199 from Umeaboy/patch-29

Some translations for Swedish done.

7 years agoMerge pull request #1200 from Umeaboy/patch-30
Hannu Nyman [Wed, 14 Jun 2017 19:42:09 +0000 (22:42 +0300)]
Merge pull request #1200 from Umeaboy/patch-30

Some translation for Swedish done.

7 years agoSome translation for Swedish done. 1200/head
Kristoffer Grundström [Wed, 14 Jun 2017 16:08:43 +0000 (18:08 +0200)]
Some translation for Swedish done.

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoSome translations for Swedish done. 1199/head
Kristoffer Grundström [Wed, 14 Jun 2017 15:36:47 +0000 (17:36 +0200)]
Some translations for Swedish done.

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoMerge pull request #1198 from Umeaboy/patch-28
Hannu Nyman [Wed, 14 Jun 2017 15:35:25 +0000 (18:35 +0300)]
Merge pull request #1198 from Umeaboy/patch-28

Some translation for Swedish done.

7 years agoSome translation for Swedish done. 1198/head
Kristoffer Grundström [Wed, 14 Jun 2017 15:32:50 +0000 (17:32 +0200)]
Some translation for Swedish done.

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoMerge pull request #1197 from Umeaboy/patch-27
Hannu Nyman [Wed, 14 Jun 2017 15:20:34 +0000 (18:20 +0300)]
Merge pull request #1197 from Umeaboy/patch-27

Finished translation to Swedish

7 years agoFinished translation to Swedish 1197/head
Kristoffer Grundström [Wed, 14 Jun 2017 15:19:33 +0000 (17:19 +0200)]
Finished translation to Swedish

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoMerge pull request #1196 from Umeaboy/patch-26
Hannu Nyman [Wed, 14 Jun 2017 15:16:13 +0000 (18:16 +0300)]
Merge pull request #1196 from Umeaboy/patch-26

Finished translation into Swedish

7 years agoFinished translation into Swedish 1196/head
Kristoffer Grundström [Wed, 14 Jun 2017 15:14:18 +0000 (17:14 +0200)]
Finished translation into Swedish

Signed-off-by: Kristoffer Grundström <hamnisdude@gmail.com>
7 years agoMerge pull request #1191 from chris5560/master
Hannu Nyman [Sun, 11 Jun 2017 07:12:05 +0000 (10:12 +0300)]
Merge pull request #1191 from chris5560/master

luci-app-privoxy: clear PKG_MAINTAINER

7 years agoluci-app-privoxy: clear PKG_MAINTAINER 1191/head
Christian Schoenebeck [Sat, 10 Jun 2017 19:51:50 +0000 (21:51 +0200)]
luci-app-privoxy: clear PKG_MAINTAINER

I do not use this software any more and due to lack of time, I give the
maintenance responsibility back to the community.

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
7 years agoluci-app-statistics: support specifying line width in graph definitions
Jo-Philipp Wich [Sat, 10 Jun 2017 18:37:29 +0000 (20:37 +0200)]
luci-app-statistics: support specifying line width in graph definitions

This allows a graph definition to explicitely request LINE1, LINE2 or
LINE3 for a data source.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-statistics: support graph menu entries without corresponding labels
Jo-Philipp Wich [Sat, 10 Jun 2017 18:26:10 +0000 (20:26 +0200)]
luci-app-statistics: support graph menu entries without corresponding labels

Properly render menu items for plugin instances that do not have a
corresponding label defined.

This allows for registering new graph pages solely by dropping files
into /usr/lib/lua/luci/statistics/rrdtool/definitions/

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoMerge pull request #1190 from musashino205/mwan3-fix-trans
Hannu Nyman [Sat, 10 Jun 2017 17:15:14 +0000 (20:15 +0300)]
Merge pull request #1190 from musashino205/mwan3-fix-trans

luci-app-mwan3: Fix mismatched texts

7 years agoluci-app-mwan3: Fix mismatched texts 1190/head
INAGAKI Hiroshi [Sat, 10 Jun 2017 15:47:42 +0000 (00:47 +0900)]
luci-app-mwan3: Fix mismatched texts

"hostname" and "address" in interfaceconfig.lua are mismatched with
the strings in po/pot files, and their translations are not applied.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoMerge pull request #1188 from dibdot/master
Hannu Nyman [Sat, 10 Jun 2017 07:20:31 +0000 (10:20 +0300)]
Merge pull request #1188 from dibdot/master

luci-app-adblock: sync with adblock 2.7.1

7 years agoluci-app-adblock: sync with adblock 2.7.1 1188/head
Dirk Brenken [Fri, 9 Jun 2017 18:18:23 +0000 (20:18 +0200)]
luci-app-adblock: sync with adblock 2.7.1

* "Save & Reply" now distinguish between normal and manual/backup mode
  and triggers an appropriate reload or a start action

Signed-off-by: Dirk Brenken <dev@brenken.org>
7 years agoMerge pull request #1187 from musashino205/adblk-upd-ja
Hannu Nyman [Wed, 7 Jun 2017 21:12:38 +0000 (00:12 +0300)]
Merge pull request #1187 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

7 years agoluci-app-adblock: Update Japanese translation 1187/head
INAGAKI Hiroshi [Wed, 7 Jun 2017 20:55:29 +0000 (05:55 +0900)]
luci-app-adblock: Update Japanese translation

Updated Japanese translations, and cleaned up old translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-adblock: Sync translations
INAGAKI Hiroshi [Wed, 7 Jun 2017 20:22:11 +0000 (05:22 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoMerge pull request #1185 from dibdot/master
Hannu Nyman [Wed, 7 Jun 2017 18:31:53 +0000 (21:31 +0300)]
Merge pull request #1185 from dibdot/master

luci-app-adblock: sync with adblock 2.7.0

7 years agoluci-app-adblock: sync with adblock 2.7.0 1185/head
Dirk Brenken [Wed, 7 Jun 2017 17:33:31 +0000 (19:33 +0200)]
luci-app-adblock: sync with adblock 2.7.0

* add new 'Manual mode' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
7 years agoluci-mod-admin-full: automatically set dns=1 for static leases with hostname
Jo-Philipp Wich [Thu, 1 Jun 2017 23:00:12 +0000 (01:00 +0200)]
luci-mod-admin-full: automatically set dns=1 for static leases with hostname

Most users likely want the hostname of a static DHCP lease to be resolveable,
even if the corresponding host is currently offline.

Adjust the form logic to automatically set 'option dns 1' whenever a name is
specified in the static lease entry.

FIxes LEDE FS#815.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoMerge pull request #1180 from musashino205/mwan3-upd-ja
Jo-Philipp Wich [Thu, 1 Jun 2017 18:00:46 +0000 (20:00 +0200)]
Merge pull request #1180 from musashino205/mwan3-upd-ja

luci-app-mwan3: Update Japanese translation

7 years agoluci-app-mwan3: Update Japanese translation 1180/head
INAGAKI Hiroshi [Thu, 1 Jun 2017 17:56:22 +0000 (02:56 +0900)]
luci-app-mwan3: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoMerge pull request #1178 from TDT-GmbH/luci-app-mwan3-fixes
Hannu Nyman [Thu, 1 Jun 2017 10:04:21 +0000 (13:04 +0300)]
Merge pull request #1178 from TDT-GmbH/luci-app-mwan3-fixes

Luci app mwan3 fixes

7 years agoluci-app-mwan3: update language po 1178/head
Florian Eckert [Thu, 1 Jun 2017 09:55:41 +0000 (11:55 +0200)]
luci-app-mwan3: update language po

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
7 years agoluci-app-mwan3: fix css styling
Florian Eckert [Tue, 16 May 2017 13:34:43 +0000 (15:34 +0200)]
luci-app-mwan3: fix css styling

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
7 years agoluci-app-mwan3: make interface list non sortable
Florian Eckert [Tue, 16 May 2017 13:14:10 +0000 (15:14 +0200)]
luci-app-mwan3: make interface list non sortable

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
7 years agoluci-app-mwan3: change track_ip from ip to host datatype
Florian Eckert [Thu, 6 Apr 2017 10:05:58 +0000 (12:05 +0200)]
luci-app-mwan3: change track_ip from ip to host datatype

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
7 years agoluci-base: resync translations, update German translations 1175/head
Jo-Philipp Wich [Tue, 30 May 2017 21:11:18 +0000 (23:11 +0200)]
luci-base: resync translations, update German translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-theme-freifunk: fix a few broken translation directives
Jo-Philipp Wich [Tue, 30 May 2017 21:07:51 +0000 (23:07 +0200)]
luci-theme-freifunk: fix a few broken translation directives

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-wireguard: use "Optional" instead of "Optional." as translation
Jo-Philipp Wich [Tue, 30 May 2017 19:45:54 +0000 (21:45 +0200)]
luci-proto-wireguard: use "Optional" instead of "Optional." as translation

This allows sharing the translation string with other components.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: use "Lease time" instead of "Leasetime" as translation label
Jo-Philipp Wich [Tue, 30 May 2017 19:24:41 +0000 (21:24 +0200)]
luci-mod-admin-full: use "Lease time" instead of "Leasetime" as translation label

This allows sharing a common translation string between DHCP and interface pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-ipv6: use "Automatic" instead as "automatic" as translation label
Jo-Philipp Wich [Tue, 30 May 2017 18:20:34 +0000 (20:20 +0200)]
luci-proto-ipv6: use "Automatic" instead as "automatic" as translation label

This allows sharing a common translation string with all other protocols.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-openconnect: fix authgroup translation
Jo-Philipp Wich [Tue, 30 May 2017 18:16:29 +0000 (20:16 +0200)]
luci-proto-openconnect: fix authgroup translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: auto-migrate ifnames when changing VLAN configuration
Jo-Philipp Wich [Mon, 29 May 2017 06:45:38 +0000 (08:45 +0200)]
luci-mod-admin-full: auto-migrate ifnames when changing VLAN configuration

This change extends the switch VLAN configuration page to automatically
adjust interface ifname options when altering VLAN settings.

For example "eth0" is changed to "eth0.1" when a previously untagged LAN
VLAN is switched to tagged on the CPU port and vice versa.

Notifications are displayed in the page header if an auto migration was
performed.

This change should make the switch configuration more user friendly and
less prone to soft bricking.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoMerge pull request #1168 from EricLuehrsen/unbound_may2017
Hannu Nyman [Thu, 25 May 2017 05:21:43 +0000 (08:21 +0300)]
Merge pull request #1168 from EricLuehrsen/unbound_may2017

luci-app-unbound: option 'add_extra_dns' and list 'trigger'

7 years agoluci-app-unbound: option 'add_extra_dns' and list 'trigger' 1168/head
Eric Luehrsen [Tue, 16 May 2017 04:23:05 +0000 (00:23 -0400)]
luci-app-unbound: option 'add_extra_dns' and list 'trigger'

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
7 years agoluci-base: support ip6ifaceid option for proto_static
Hannu Nyman [Sun, 21 May 2017 19:02:46 +0000 (22:02 +0300)]
luci-base: support ip6ifaceid option for proto_static

Add support for 'ip6ifaceid' option for proto_static in LuCI.

Information about the option:
 The option is optional and defaults to '::1'.
 Allowed values: 'eui64', 'random', fixed value like '::1' or '::1:2'

 When IPv6 prefix (like 'a:b:c:d::') is received from a delegating
 server, the ip6ifaceid suffix (like '::1') is used to form
 the IPv6 address ('a:b:c:d::1') for the interface.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoMerge pull request #1160 from zx2c4/wg-psk-change
Hannu Nyman [Wed, 17 May 2017 19:36:31 +0000 (22:36 +0300)]
Merge pull request #1160 from zx2c4/wg-psk-change

wireguard: preshared-key is now an attribute of the peer

7 years agoMerge pull request #1167 from musashino205/mwan3-fix-path
Hannu Nyman [Tue, 16 May 2017 19:39:37 +0000 (22:39 +0300)]
Merge pull request #1167 from musashino205/mwan3-fix-path

luci-app-mwan3: Fix "ip" command path

7 years agoMerge pull request #1031 from feckert/add_dhcp_to_system_ucitrack
Hannu Nyman [Tue, 16 May 2017 16:28:57 +0000 (19:28 +0300)]
Merge pull request #1031 from feckert/add_dhcp_to_system_ucitrack

luci-base: add dhcp to system ucitrack

7 years agoluci-app-mwan3: Fix "ip" command path 1167/head
INAGAKI Hiroshi [Mon, 15 May 2017 06:24:42 +0000 (15:24 +0900)]
luci-app-mwan3: Fix "ip" command path

Fixed an issue that mwan3 fails to detect connection because "ip"
command relocated.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-statistics: check that uci config sections exist
Hannu Nyman [Wed, 10 May 2017 16:06:10 +0000 (19:06 +0300)]
luci-app-statistics: check that uci config sections exist

A missing or faulty luci_statistics config file may prevent
LuCI access completely already at the login phase as
the statistics config is parsed already then.

The error is like:
  .../statistics/datatree.lua:16: attempt to index upvalue 'sections' (a nil value)

User may be completely locked out of LuCI until he figures out
the need to have a proper luci_statistics config file.

Prevent the error by checking for the existence of
the uci config sections before trying to use values from them.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoMerge pull request #1163 from dibdot/luci-app-travelmate
Hannu Nyman [Wed, 10 May 2017 15:12:38 +0000 (18:12 +0300)]
Merge pull request #1163 from dibdot/luci-app-travelmate

luci-app-travelmate: sync with travelmate 0.7.3

7 years agoluci-app-travelmate: sync with travelmate 0.7.3 1163/head
Dirk Brenken [Wed, 10 May 2017 14:56:58 +0000 (16:56 +0200)]
luci-app-travelmate: sync with travelmate 0.7.3

* Automatically refresh the overview page after button onclick event,
e.g. 'Save & Apply'

Signed-off-by: Dirk Brenken <dev@brenken.org>
7 years agoMerge pull request #1162 from musashino205/tmate-upd-ja
Hannu Nyman [Wed, 10 May 2017 09:24:55 +0000 (12:24 +0300)]
Merge pull request #1162 from musashino205/tmate-upd-ja

luci-app-travelmate: Update Japanese translation

7 years agoluci-app-travelmate: Update Japanese translation 1162/head
INAGAKI Hiroshi [Wed, 10 May 2017 07:54:07 +0000 (16:54 +0900)]
luci-app-travelmate: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoMerge pull request #1161 from musashino205/adblk-upd-ja
Hannu Nyman [Wed, 10 May 2017 07:18:10 +0000 (10:18 +0300)]
Merge pull request #1161 from musashino205/adblk-upd-ja

luci-app-adblock: Update Japanese translation

7 years agoluci-app-adblock: Update Japanese translation 1161/head
INAGAKI Hiroshi [Wed, 10 May 2017 07:12:39 +0000 (16:12 +0900)]
luci-app-adblock: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agowireguard: preshared-key is now an attribute of the peer 1160/head
Jason A. Donenfeld [Tue, 9 May 2017 14:45:42 +0000 (16:45 +0200)]
wireguard: preshared-key is now an attribute of the peer

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
7 years agoMerge pull request #1159 from musashino205/adblk-fix-dup
Hannu Nyman [Tue, 9 May 2017 12:48:48 +0000 (15:48 +0300)]
Merge pull request #1159 from musashino205/adblk-fix-dup

luci-app-adblock: Fix duplicated text

7 years agoluci-app-adblock: Sync translations 1159/head
INAGAKI Hiroshi [Tue, 9 May 2017 12:30:27 +0000 (21:30 +0900)]
luci-app-adblock: Sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-adblock: Fix syntax error
INAGAKI Hiroshi [Tue, 9 May 2017 12:25:40 +0000 (21:25 +0900)]
luci-app-adblock: Fix syntax error

Fixed syntax error in sv/adblock.po.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-adblock: Fix duplicated text
INAGAKI Hiroshi [Tue, 9 May 2017 10:10:21 +0000 (19:10 +0900)]
luci-app-adblock: Fix duplicated text

Added text "Input file not found. Please check your configuration." by
commit 9b4b1df is duplicated. so I replaced the text with previously
existed.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoi18n: sync translations
Hannu Nyman [Tue, 9 May 2017 08:11:36 +0000 (11:11 +0300)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci-app-statistics: processes: fix graph visibility
Hannu Nyman [Tue, 9 May 2017 06:42:42 +0000 (09:42 +0300)]
luci-app-statistics: processes: fix graph visibility

Fix graph visibility on processes page based on plugin
instance. The overview instance is empty, while monitored
processes have their own instances.

Original version of the patch created by @koblack and
discussed in #1021

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoMerge pull request #1158 from angusding/patch-4
Hannu Nyman [Mon, 8 May 2017 16:49:58 +0000 (19:49 +0300)]
Merge pull request #1158 from angusding/patch-4

luci.mk: Update language name for Chinese

7 years agoluci-base: add Etc/GMT timezones
Hannu Nyman [Mon, 8 May 2017 16:31:36 +0000 (19:31 +0300)]
luci-base: add Etc/GMT timezones

Add Etc/GMT timezones like GMT+5

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agobuild/zoneinfo2lua.pl: logic for Etc/GMT timezones
Hannu Nyman [Mon, 8 May 2017 16:29:43 +0000 (19:29 +0300)]
build/zoneinfo2lua.pl: logic for Etc/GMT timezones

Add logic to add Etc/GMT timezones (like GMT+5)
although the zones are not included in zone.tab

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci.mk: Update language name for Chinese 1158/head
amitabha [Mon, 8 May 2017 15:29:39 +0000 (23:29 +0800)]
luci.mk: Update language name for Chinese

Rectification of non-standard name for language Chinese.
Signed-off-by: Angus Ding angus.ding@gmail.com
7 years agoluci-mod-admin-full: add advice to restart cron
Hannu Nyman [Mon, 8 May 2017 12:20:13 +0000 (15:20 +0300)]
luci-mod-admin-full: add advice to restart cron

Cron init script starts the service only if a crontab file
exists. If there is no crontab file at boot and the user
later creates one, he needs to manually restart the service.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoMerge pull request #1157 from dibdot/app-adblock
Hannu Nyman [Mon, 8 May 2017 09:28:06 +0000 (12:28 +0300)]
Merge pull request #1157 from dibdot/app-adblock

luci-app-adblock: sync with adblock 2.6.3

7 years agoluci-app-adblock: sync with adblock 2.6.3 1157/head
Dirk Brenken [Mon, 8 May 2017 09:15:19 +0000 (11:15 +0200)]
luci-app-adblock: sync with adblock 2.6.3

* Limit Blacklist/Whitelist Online editing to max. 512 KB, approx.
20.000 domains per list
* Automatically refresh the overview page after button onclick event,
e.g. 'Suspend/Resume' or 'Save & Apply'
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
7 years agoMerge pull request #1151 from TDT-GmbH/luci-app-openvpn-fix
Hannu Nyman [Mon, 8 May 2017 07:46:09 +0000 (10:46 +0300)]
Merge pull request #1151 from TDT-GmbH/luci-app-openvpn-fix

luci-app-openvpn: fix proto param selection in basic

7 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.

7 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>
7 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

7 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>

7 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

7 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>
7 years agoluci-app-openvpn: fix proto param selection in basic 1151/head
Florian Eckert [Thu, 4 May 2017 12:01:03 +0000 (14:01 +0200)]
luci-app-openvpn: fix proto param selection in basic

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
7 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

7 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>
7 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>
7 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

7 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

7 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>
7 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
7 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

7 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
7 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>
7 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

7 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

7 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
7 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
7 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

7 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
7 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

7 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>
7 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>
7 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

7 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>
7 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