Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8647 commits 13 branches 13 tags 306 MiB
Commit graph

8647 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jo-Philipp Wich
7ae244a26e 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>
 2017-04-20 16:55:29 +02:00
Hannu Nyman
2eda14beee Merge pull request #1111 from liushuyu/master 
luci-app: Improve zh-CN translations
 2017-04-19 09:52:40 +03:00
liushuyu
e741857fc8
luci-app: Improve zh-CN translations 2017-04-18 14:00:07 -06:00
Hannu Nyman
cee4427eeb Merge pull request #1110 from psyborg55/psyborg55-patch-1 
luci-app-mwan3: disable uci/sed errors print to syslog
 2017-04-18 15:40:03 +03:00
Hannu Nyman
91c0b91a2e Merge pull request #1115 from dibdot/app-adblock 
luci-app-adblock: sync with 2.6.0-2
 2017-04-17 20:29:11 +03:00
Dirk Brenken
b234897789 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>
 2017-04-17 17:52:27 +02:00
Jo-Philipp Wich
76ee1ba852 Merge pull request #1113 from yousong/fix 
luci-app-upnp: fix setting ucitrack init option
 2017-04-15 15:16:58 +02:00
Yousong Zhou
ed11130b84 luci-app-upnp: fix setting ucitrack init option 
Fixes FS#693

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
 2017-04-15 11:51:55 +08:00
psyborg55
d912d6bb47 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>
 2017-04-14 23:30:47 +02:00
Hannu Nyman
a82ca22ffc Merge pull request #1109 from musashino205/adblk-upd-ja 
luci-app-adblock: Update Japanese translation
 2017-04-13 09:43:07 +03:00
INAGAKI Hiroshi
738538d14c luci-app-adblock: Update Japanese translation 
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-13 13:11:58 +09:00
INAGAKI Hiroshi
a7dc588a0f luci-app-adblock: Sync translations 
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-13 12:35:16 +09:00
Hannu Nyman
fa6dc645e8 Merge pull request #1108 from dibdot/app-adblock 
luci-app-adblock: sync with adblock 2.6.0
 2017-04-12 17:04:35 +03:00
Dirk Brenken
3096af833b 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>
 2017-04-12 11:56:02 +02:00
Hannu Nyman
4453414970 Merge pull request #1107 from TDT-GmbH/openvpn_remote_random 
luci-app-openvpn: Fix default value for remote_random flag
 2017-04-12 10:08:14 +03:00
Martin Schiller
91daed4530 luci-app-openvpn: Fix default value for remote_random flag 
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
 2017-04-12 06:26:10 +02:00
Hannu Nyman
62743a6c19 Merge pull request #1106 from musashino205/mwan3-upd-ja 
luci-app-mwan3: Update Japanese translation
 2017-04-10 17:54:14 +03:00
INAGAKI Hiroshi
99af05d103 luci-app-mwan3: Update Japanese translation 
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-10 23:05:48 +09:00
Hannu Nyman
54c97738bc 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>
 2017-04-10 14:45:20 +03:00
Hannu Nyman
7a7e08c39b 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>
 2017-04-10 14:42:14 +03:00
Hannu Nyman
4ae4125a08 Merge pull request #1104 from musashino205/mwan3-fix-trans 
luci-app-mwan3: Fix luci tools cannot detect translate()
 2017-04-10 14:28:12 +03:00
INAGAKI Hiroshi
473409ad8e 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>
 2017-04-09 21:38:36 +09:00
Hannu Nyman
a162384bf7 Merge pull request #1103 from kuoruan/zh-cn-tr 
Update Simplified Chinese translation
 2017-04-09 11:37:29 +03:00
Hsing-Wang Liao
5900ca8db7 luci-app-mwan3: Add Simplified Chinese translation 
Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
 2017-04-09 16:18:44 +08:00
Hsing-Wang Liao
a41f97bca1 luci-base: Update Simplified Chinese translation 
Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
 2017-04-09 15:05:36 +08:00
Hannu Nyman
3fc0465cfe Merge pull request #1071 from TDT-GmbH/add-force-link-option 
luci-mod-admin-full: Add force link option in interfaces advanced settings section
 2017-04-06 23:01:48 +03:00
Hannu Nyman
73d284c880 Merge pull request #1099 from musashino205/mwan3-upd-ja 
luci-app-mwan3: Update Japanese translation
 2017-04-06 22:00:23 +03:00
INAGAKI Hiroshi
601784f283 luci-app-mwan3: Update Japanese translation 
Synchronized translations with sources and updated japanese
translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-07 03:53:13 +09:00
Hannu Nyman
a33dfdd67c Merge pull request #1094 from TDT-GmbH/luci-app-mwan3-update 
luci-app-mwan3: update interfaceconfig page with new params
 2017-04-06 11:11:37 +03:00
Hannu Nyman
d3fc9b2a37 Merge pull request #1098 from musashino205/mwan3-add-ja 
luci-app-mwan3: Add Japanese translation
 2017-04-04 18:06:19 +03:00
Hannu Nyman
fc02f58301 Merge pull request #1097 from musashino205/adblk-upd-ja 
luci-app-adblock: Update Japanese translation
 2017-04-04 18:05:34 +03:00
INAGAKI Hiroshi
c528be41b7 luci-app-adblock: Update Japanese translation 
Added and Modified some Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-04 23:33:16 +09:00
INAGAKI Hiroshi
09c33440da luci-app-adblock: Sync translations 
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-04 23:28:50 +09:00
INAGAKI Hiroshi
fce9f5248b luci-app-mwan3: Add Japanese translation 
Added po templates and Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-04 22:49:38 +09:00
Hannu Nyman
1390a6465d Merge pull request #1096 from dibdot/app-adblock 
luci-app-adblock: sync with adblock 2.5.1
 2017-04-04 15:28:44 +03:00
Dirk Brenken
03ae05549d 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>
 2017-04-04 14:11:41 +02:00
Hannu Nyman
ae542668f5 Merge pull request #1095 from musashino205/adblk-upd-ja 
luci-app-adblock: Update Japanese translation
 2017-04-04 14:10:07 +03:00
INAGAKI Hiroshi
a0e9d3474d luci-app-adblock: Update Japanese translation 
Updated Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-04 20:04:51 +09:00
Florian Eckert
71f2f045b2 luci-app-mwan3: add me as co maintainer 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-04-03 11:19:56 +02:00
Florian Eckert
7e4fb9998b luci-app-mwan3: add failure and recovery interval 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-04-03 11:16:42 +02:00
Florian Eckert
e49e657859 luci-app-mwan3: call translatef funktion if reasonable 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-04-03 11:04:34 +02:00
Hannu Nyman
18ed405d28 Merge pull request #1093 from musashino205/base-upd-ja 
luci-base: Update Japanese translation
 2017-04-02 23:56:34 +03:00
INAGAKI Hiroshi
b4f080b136 luci-base: Update Japanese translation 
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-04-03 02:32:28 +09:00
Hannu Nyman
d4816ded63 Merge pull request #1091 from TDT-GmbH/mwan3-add-params 
Mwan3 add params
 2017-03-31 16:09:33 +03:00
Florian Eckert
e1e5743a1a luci-app-mwan3: add new ip family param 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-03-31 15:02:03 +02:00
Florian Eckert
7d5579b3e0 luci-app-mwan3: add new conntrack flash param 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-03-31 15:01:51 +02:00
Florian Eckert
585b6b3111 luci-app-mwan3: add new ping size param 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2017-03-31 15:01:41 +02:00
Hannu Nyman
f6dd2a09c9 Merge pull request #1090 from musashino205/i18n-sync 
i18n: Sync translations
 2017-03-30 19:46:27 +03:00
INAGAKI Hiroshi
369dbbfe71 i18n: Sync translations 
Synchronized all translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-03-31 00:50:22 +09:00
Hannu Nyman
3dc08a354b Merge pull request #1088 from dibdot/luci-app-adblock 
luci-app-adblock: fix XHTML/HTML5 markup
 2017-03-28 21:12:27 +03:00