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

10455 commits

This branch
This branch
All branches
Author SHA1 Message Date
INAGAKI Hiroshi
37b0211e62 i18n: sync translations 
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2018-12-20 02:21:14 +09:00
Jo-Philipp Wich
e3b91d1a62
Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system 
luci-mod-system: add translation for led trigger names
 2018-12-19 07:49:56 +01:00
Jo-Philipp Wich
91a73bebfb luci-theme-bootstrap: fix textarea height after CSS minification 
Fixes #2378
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-16 15:08:05 +01:00
Hannu Nyman
1cc6c58d1f
Merge pull request #2377 from sotux/master-luci-app-aria2 
luci-app-aria2: fix the log option
 2018-12-15 15:46:05 +02:00
Zheng Qian
e56af3c3e5 luci-app-aria2: fix the log option 
According to the package aria2, the log option
is enable_logging, so fix this option name.

As luci-app-aria2 can't set custom log file dir,
the default log file is /var/log/aria2.log but not
in the config file dir.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
 2018-12-15 21:44:49 +08:00
Jo-Philipp Wich
b5fb2a841f
Merge pull request #2375 from sotux/master-luci-app-aria2 
luci-app-aria2: fix showRPCURL when using https
 2018-12-14 07:14:18 +01:00
Zheng Qian
83703aaec0 luci-app-aria2: fix showRPCURL when using https 
if login luci-admin with https, RPC protocol should be https or wss.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
 2018-12-14 13:32:49 +08:00
Zheng Qian
76f81c262c luci-base: update Simplified Chinese translation 
Signed-off-by: Zheng Qian <sotux82@gmail.com>
 2018-12-14 10:14:01 +08:00
Jo-Philipp Wich
efb4d7c40a luci-base: fix table compare upon writing ipaddr changes 
Fixes: b33192a03 ("luci-base: support cidr list notation for option ipaddr and ip6addr")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 12:14:37 +01:00
Jo-Philipp Wich
11b271d4a9 luci-base: properly option ipaddr in single cidr string notation as well 
When an interface configuration specifies both "option ipaddr 1.2.3.4/24"
and "option netmask", then netifd will ignore the netmask in favor to the
prefix encoded in the cidr string.

Support this variant as well by treating a sole cidr string value as
singöe-item cidr list.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:57:16 +01:00
Jo-Philipp Wich
67c34c5f5f luci-base: fix typo in german translation 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:44:17 +01:00
Jo-Philipp Wich
c50849ddd2 luci-base: update german translation 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:41:24 +01:00
Jo-Philipp Wich
6c76300505 luci-base: resync translation templates 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:36:35 +01:00
Jo-Philipp Wich
b33192a033 luci-base: support cidr list notation for option ipaddr and ip6addr 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:35:38 +01:00
Jo-Philipp Wich
979a478001 luci-base: cbi.js: update deps on dynlist changes, honor placeholder 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-13 11:35:38 +01:00
Jo-Philipp Wich
3094c5dbb8
Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo 
luci-app-openvpn: re-add options comp_lzo and comp_noadapt
 2018-12-13 08:26:44 +01:00
Martin Schiller
ab234df3df luci-app-openvpn: re-add options comp_lzo and comp_noadapt 
* re-add config option comp_lzo according to
  openwrt/openwrt@3850b41
* re-add config option comp_noadapt. This has never been removed
  from openwrt

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
 2018-12-13 08:08:24 +01:00
Jo-Philipp Wich
aa954d1c69 csstidy: update to latest Git head 
33594b4 ("csstidy: do not dequote selector strings")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-12 16:25:59 +01:00
Jo-Philipp Wich
c0c05ace9f
Merge pull request #2369 from tano-systems/fix-changelog-mistake 
luci-base: fix UCI changelog markup mistake
 2018-12-12 10:47:06 +01:00
Jo-Philipp Wich
0de1dcbf4a build: add build option to minify *.css files 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-12 09:47:37 +01:00
Jo-Philipp Wich
e90431b870 contrib: add csstidy package 
Package a fork of the CSSTidy C++ implementation for CSS minification
use in a later commit.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-12 09:47:37 +01:00
Anton Kikin
43c7cb344c luci-base: fix UCI changelog markup mistake 
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
 2018-12-12 02:05:59 +03:00
Hannu Nyman
6f0bed8c54
Merge pull request #2361 from stokito/master 
CONTRIBUTING.md
 2018-12-11 18:39:40 +02:00
Jo-Philipp Wich
1fb069f235 luci-app-nlbwmon: rewrite display section 
- Move CSS and JS code to external files
 - Use responsive table markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-11 11:54:42 +01:00
Jo-Philipp Wich
a692ca789a luci-lib-httpclient: prevent nil access with invalid IP address literals 
Fixes: a54baf7be ("luci-lib-httpclient: revamp URL handling")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-11 09:17:50 +01:00
Jo-Philipp Wich
a54baf7be0 luci-lib-httpclient: revamp URL handling 
- Introduce a parse_url() helper which properly deals with literal IPv4
   and IPv6 host parts and returns the decomposed uri string as table
 - Properly format IPv6 literals in autogenerated Host headers
 - Omit default port numbers in Host headers and calculated redirect URLs.

Supersedes PR #2337.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-11 09:12:32 +01:00
Jo-Philipp Wich
b94be57aff
Merge pull request #2285 from dengqf6/luci-ssl-nginx 
luci-ssl-nginx: fix dependencies
 2018-12-11 06:56:35 +01:00
Jo-Philipp Wich
8649e5b4c6
Merge pull request #2367 from yglb/master 
luci-theme-rosy: Fixed insufficient container container width
 2018-12-11 06:55:22 +01:00
Jo-Philipp Wich
62990e2338 luci-base: fix syntax error in map.htm 
Fixes #2366.
Fixes: 76e9c0305 ("luci-base: rework ui tabbing code")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-11 06:54:09 +01:00
Zheng Qian
917eb921d2 luci-app-opkg: update Simplified Chinese translation 
Signed-off-by: Zheng Qian <sotux82@gmail.com>
 2018-12-11 10:59:08 +08:00
Yanlan Shen
3fd74316ab luci-theme-rosy: Fixed insufficient container container width 
Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
 2018-12-11 10:43:45 +08:00
Jo-Philipp Wich
36f226548a
Merge pull request #2364 from tano-systems/split-status-page 
luci-mod-status: split status page into a series of partials
 2018-12-10 18:41:40 +01:00
Anton Kikin
77014af67e luci-mod-status: split status page into a series of partials 
Split status page into a series of partials as discussed in PR #2359.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
 2018-12-10 20:24:33 +03:00
Sergey Ponomarev
03ce59a8a1 Update CONTRIBUTING.md 
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
 2018-12-10 17:54:55 +02:00
Jo-Philipp Wich
08cee189ca
Merge pull request #2363 from sotux/master-luci-app-aria2 
luci-app-aria2: fix http/https protocol when opening aria2 webUI
 2018-12-10 13:49:27 +01:00
Jo-Philipp Wich
5d90e704ef luci-theme-{freifunk-generic,material,rosy}: fixup tab CSS 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:43:30 +01:00
Jo-Philipp Wich
165ba6f180 luci-app-radicale: refactor custom nsection template 
Refactor the named section template shipped with luci-app-radicale to work
with the latest LuCI tabbing changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
357096d15f luci-theme-openwrt: add required CSS rules for new tabbing code 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
1cdce0280a luci-theme-bootstrap: add required CSS rules for new tabbing code 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
76e9c0305e luci-base: rework ui tabbing code 
- Instantiate tab menus on the client side
 - Simplify server side markup generation
 - Show error indicators in cbi tabs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
747e10bae6 luci-theme-openwrt: style tweaks 
- Collapse table borders by default
 - Vertically align table cell content
 - Inherit font family and size for form widgets
 - Fix redundant horizontal padding for cell labels

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
51dbb2756a luci-theme-bootstrap: dynlist style tweak 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
a7dcfbe06b luci-base: luci.js: emit custom events for tooltip open/close actions 
The new `tooltip-open` and `tooltip-close` events allow other code to hook
into the tooltip div rendering, e.g. to populate it with custom markup.

Also ignore tooltip events originating from descendant elements while
we're at it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Jo-Philipp Wich
df9ba6981e luci-mod-status: switch iptables_dump action to luci.sys.process.exec 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-12-10 13:41:34 +01:00
Zheng Qian
4f11edadff luci-app-aria2: fix http/https protocol when opening aria2 webUI 
In the openWebUI function, the url is assumed as http protocol,
this will cause problem when we login luci-admin with https.

The variable localhostPath has already contained http/https
protocol, so we can use it directly and add the path of aria2
webUI.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
 2018-12-10 17:45:55 +08:00
Jo-Philipp Wich
1b26c91a08
Merge pull request #2334 from yglb/master 
luci-theme-rosy: Fix related bugs displayed on the page
 2018-12-07 00:12:18 +01:00
Jo-Philipp Wich
04e0657443
Merge pull request #2347 from shunjou/theme-material 
luci-theme-material: partial style overhaul
 2018-12-07 00:10:59 +01:00
Jo-Philipp Wich
84b6e20f04
Merge pull request #2294 from pmelange/luci-app-olsr-cosmetic 
luci-app-olsr: make cosmetic changes.
 2018-12-06 21:22:54 +01:00
pmelange
d2bda6c34b luci-app-olsr: reenable the "auto refresh" feature 
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
 2018-12-06 20:57:35 +01:00
pmelange
4974ddb1f1 luci-app-olsr change ccs style to use class "left" instead of "style=text-align: left" 
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
 2018-12-06 20:57:35 +01:00