Matthias Schiffer [Thu, 4 Jun 2015 19:03:24 +0000 (21:03 +0200)]
luci-lib-json: ignore null keys to allow encoding empty objects
There is currently no way to encode an empty object {}, as empty tables are
encoded as empty lists [].
With this patch, encode() will ignore table fields with the key json.null (which
doesn't make sense anyways). This allows adding a field with key json.null to
force encoding it as an object.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Manuel Munz [Sun, 31 May 2015 14:41:11 +0000 (16:41 +0200)]
contrib/community-profiles/augsburg: Increase leasetime and bandwidth limits
Manuel Munz [Sat, 30 May 2015 23:13:30 +0000 (01:13 +0200)]
applications/splash: remove set -x from splash.sh
Manuel Munz [Sat, 30 May 2015 21:01:24 +0000 (23:01 +0200)]
modules/freifunk: fix basics cbi model
Manuel Munz [Sat, 30 May 2015 20:53:11 +0000 (22:53 +0200)]
applications/olsr: change config file download on olsr overview page to use seperate v4 and v6 config files
Manuel Munz [Sat, 30 May 2015 20:02:05 +0000 (22:02 +0200)]
contrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config
Manuel Munz [Sat, 30 May 2015 19:04:50 +0000 (21:04 +0200)]
applications/olsr: redirect errors on jsoninfo connects with netcat to /dev/null to avoid spamming the log
Manuel Munz [Sat, 30 May 2015 18:48:57 +0000 (20:48 +0200)]
applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file
Manuel Munz [Sat, 30 May 2015 18:45:17 +0000 (20:45 +0200)]
meshwizard: use different port (9091) for ipv6 jsoninfo
Manuel Munz [Sat, 30 May 2015 15:01:02 +0000 (17:01 +0200)]
add changes that were missing in the last commit
Manuel Munz [Sat, 30 May 2015 14:57:30 +0000 (16:57 +0200)]
Merge branch 'master' of github.com:openwrt/luci
Manuel Munz [Sat, 30 May 2015 14:56:18 +0000 (16:56 +0200)]
contrib/meshwizard: fix interaction with uci in OpenWrt CC, see https://dev.openwrt.org/ticket/19539
Manuel Munz [Sat, 30 May 2015 12:22:24 +0000 (14:22 +0200)]
Merge pull request #398 from albialbi/patch-1
bssid und ssid scheme Anpassung für kathleen
albialbi [Sat, 30 May 2015 12:10:26 +0000 (14:10 +0200)]
bssid und ssid scheme Anpassung für kathleen
Jo-Philipp Wich [Tue, 26 May 2015 15:32:11 +0000 (17:32 +0200)]
luci-base: prevent parsing the form input after cbi emergency save
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Tue, 26 May 2015 15:14:24 +0000 (17:14 +0200)]
Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
Jo-Philipp Wich [Tue, 26 May 2015 15:11:41 +0000 (17:11 +0200)]
luci-base: fallback to a simple text editor if uci config cannot be loaded
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Tue, 26 May 2015 14:26:24 +0000 (16:26 +0200)]
luci-base: rename .gitignore to .placeholder
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Christian Schoenebeck [Mon, 25 May 2015 12:40:12 +0000 (14:40 +0200)]
Merge pull request #394 from chris5560/master
luci-app-ddns: fixed version check
Christian Schoenebeck [Sun, 24 May 2015 18:03:52 +0000 (20:03 +0200)]
luci-app-ddns: fixed version check
fixed version checking in function ipkg_ver_compare()
Reported issue #387 and openwrt/packages issue 1285
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Jonathan Bennett [Fri, 22 May 2015 17:48:06 +0000 (12:48 -0500)]
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
Jo-Philipp Wich [Thu, 21 May 2015 12:51:30 +0000 (14:51 +0200)]
Merge pull request #384 from nightcoffee/nightcoffee-patch-1
luci-base: Add cache control in index.html
Jo-Philipp Wich [Wed, 20 May 2015 18:26:59 +0000 (20:26 +0200)]
Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
Jonathan Bennett [Mon, 18 May 2015 03:33:30 +0000 (22:33 -0500)]
luci-app-fwknopd: Add qr code support
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
nightcoffee [Mon, 18 May 2015 12:05:02 +0000 (20:05 +0800)]
luci-base: Add cache control in index.html
Signed-off-by: Night Coffee <ydkf@qq.com>
Steven Barth [Sun, 17 May 2015 08:38:03 +0000 (10:38 +0200)]
IPv6 updates
Signed-off-by: Steven Barth <steven@midlink.org>
Christian Schoenebeck [Thu, 14 May 2015 07:02:40 +0000 (09:02 +0200)]
Merge pull request #382 from chris5560/master
luci-app-ddns: reflect changes on ddns-scripts
Christian Schoenebeck [Thu, 14 May 2015 07:01:33 +0000 (09:01 +0200)]
Merge pull request #380 from oneru/master
Add initial luci-app-fwknopd - a way to control the firewall knock da…
Jonathan Bennett [Sat, 9 May 2015 04:30:02 +0000 (23:30 -0500)]
Add initial luci-app-fwknopd - a way to control the firewall knock daemon from luci
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
Christian Schoenebeck [Tue, 12 May 2015 18:31:30 +0000 (20:31 +0200)]
luci-app-ddns: reflect changes on ddns-scripts
* reflect updated language file for zh-cn
* change default for retry_count to 0 compatible to ddns-scripts 2.4.2-1
* addition to retry_count help description
* modified dependency on ddns-scripts 2.4.2-1
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Christian Schoenebeck [Fri, 8 May 2015 18:44:13 +0000 (20:44 +0200)]
Merge pull request #376 from chris5560/master
luci-app-radicale: New app to support Radicale CalDAV/CardDAV server
Jo-Philipp Wich [Wed, 6 May 2015 13:59:40 +0000 (15:59 +0200)]
collections/luci: depend on luci-proto-ipv6 if IPV6 is enabled
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Wed, 6 May 2015 13:42:53 +0000 (15:42 +0200)]
Merge pull request #331 from poranje/proto=ipv6+aiccu+fixes
luci-proto-ipv6: fix aiccu requiretls
Jo-Philipp Wich [Tue, 5 May 2015 08:32:15 +0000 (10:32 +0200)]
luci.mk: don't builtin translations selected by CONFIG_ALL
Make sure that translation packages enabled through CONFIG_ALL
that depend on builtin packages are restricted to modules.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Christian Schoenebeck [Sun, 3 May 2015 16:05:32 +0000 (18:05 +0200)]
luci-app-radicale: New app to support Radicale CalDAV/CardDAV server
New Application
!!! Dependency not set because there are two packages "radicale-py2" and
"radicale-py3" (currently BROKEN) available !!!
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Paul Oranje [Sat, 2 May 2015 10:24:25 +0000 (12:24 +0200)]
luci-proto-ipv6: correct aiccu options defaults
- requiretls default set to disabled
- corrected syntax errors in default values of Flag options for nat,
verbose and requiretls.
Paul Oranje [Sat, 2 May 2015 08:44:17 +0000 (10:44 +0200)]
Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
Jo-Philipp Wich [Tue, 28 Apr 2015 13:56:15 +0000 (15:56 +0200)]
Merge pull request #374 from wongsyrone/patch-1
luci-app-ddns: fix Simplified Chinese translations
Syrone Wong [Tue, 28 Apr 2015 13:52:27 +0000 (21:52 +0800)]
luci-app-ddns: fix Simplified Chinese translations
fix typos and elegant zh_CN translations
Jo-Philipp Wich [Mon, 27 Apr 2015 13:09:17 +0000 (15:09 +0200)]
Merge pull request #358 from freifunk-leipzig/master
luci-mod-admin-full: change adress to an ipv6-enabled host
Jo-Philipp Wich [Mon, 27 Apr 2015 13:08:21 +0000 (15:08 +0200)]
Merge pull request #370 from 981213/pull_request
Fix some Simplified Chinese translations in luci.
Jo-Philipp Wich [Mon, 27 Apr 2015 13:06:42 +0000 (15:06 +0200)]
Merge pull request #371 from aidvu/fstab-swap
luci-mod-admin-full: mount points SWAP fix
Andrija Vucinic [Sat, 25 Apr 2015 21:35:33 +0000 (23:35 +0200)]
luci-mod-admin-full: mount points SWAP fix
SWAP section was showing an error. Fixed it to display the devices/size properly.
郭传鈜 [Fri, 24 Apr 2015 04:57:01 +0000 (12:57 +0800)]
luci-base:Add some Simplified Chinese translation for luci-base
郭传鈜 [Fri, 24 Apr 2015 04:55:39 +0000 (12:55 +0800)]
luci-app-ddns:Fix Simplified Chinese translation for luci-app-ddns
Christian Schoenebeck [Thu, 23 Apr 2015 18:22:05 +0000 (20:22 +0200)]
Merge pull request #369 from openwrt/revert-367-translate_pull_request
Revert "luci-app-ddns:Fix Simplified Chinese translation."
Christian Schoenebeck [Thu, 23 Apr 2015 18:18:19 +0000 (20:18 +0200)]
Revert "luci-app-ddns:Fix Simplified Chinese translation."
Christian Schoenebeck [Thu, 23 Apr 2015 18:16:04 +0000 (20:16 +0200)]
Merge pull request #367 from 981213/translate_pull_request
luci-app-ddns:Fix Simplified Chinese translation.
Many Thanks
Christian
郭传鈜 [Thu, 23 Apr 2015 05:10:19 +0000 (13:10 +0800)]
luci-app-ddns:Fix Simplified Chinese translation.
Christian Schoenebeck [Wed, 22 Apr 2015 19:12:12 +0000 (21:12 +0200)]
Merge pull request #364 from chris5560/master
fix wrong xhtml tags in po files
Christian Schoenebeck [Tue, 21 Apr 2015 19:26:00 +0000 (21:26 +0200)]
fix wrong xhtml tags in po files
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Jo-Philipp Wich [Mon, 20 Apr 2015 08:35:08 +0000 (10:35 +0200)]
Synchronize translations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Mon, 20 Apr 2015 08:17:23 +0000 (10:17 +0200)]
build: rework i18n-sync.sh to support new structure
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Mon, 20 Apr 2015 08:07:46 +0000 (10:07 +0200)]
luci-app-ahcp: remove leftover po templates
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Mon, 20 Apr 2015 08:06:27 +0000 (10:06 +0200)]
Update .gitignore
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Sun, 19 Apr 2015 11:12:53 +0000 (13:12 +0200)]
Merge pull request #361 from hnyman/timezone2015c
Timezone data: Update to 2015c
Hannu Nyman [Sun, 19 Apr 2015 07:48:03 +0000 (10:48 +0300)]
Timezone data: Update to 2015c
Timezone information is updated to 2015c, released on 14 Apr 2015.
I used build/zoneinfo2lua.pl to pull data from my Ubuntu 14.10.
Changes in 2015b and 2015c are rather small:
http://mm.icann.org/pipermail/tz-announce/2015-March/000029.html
http://mm.icann.org/pipermail/tz-announce/2015-April/000030.html
Mongolia will start observing DST again this year, from the last
Saturday in March at 02:00 to the last Saturday in September at 00:00.
Palestine will start DST on March 28, not March 27. Also,
correct the fall 2014 transition from September 26 to October 24.
Adjust future predictions accordingly.
Egypt's spring-forward transition is at 24:00 on April's last Thursday,
not 00:00 on April's last Friday. 2015's transition will therefore be on
Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fixes
apply to 2026, 2037, 2043, etc.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Fri, 17 Apr 2015 10:34:54 +0000 (12:34 +0200)]
luci-mod-admin-full: handle missing size for block devices
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
FreifunkUFO [Wed, 15 Apr 2015 01:27:35 +0000 (03:27 +0200)]
luci-mod-admin-full: switch to a ipv6 enabled host
change hostname to dev.openwrt.org.. that is available via ipv4 AND ipv6
Jo-Philipp Wich [Sun, 12 Apr 2015 18:20:01 +0000 (20:20 +0200)]
luci-mod-admin-full: simply fstab configuration
Simplify fstab setup by offering hints for uuid/label and device node options.
Fix rootfs handling logic by removing obsolete references to the "is_rootfs"
option and offering "/" and "/overlay" choices for the mountpoint instead.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Steven Barth [Fri, 10 Apr 2015 16:55:56 +0000 (18:55 +0200)]
Fix typo in last commit
Signed-off-by: Steven Barth <steven@midlink.org>
Steven Barth [Fri, 10 Apr 2015 16:04:56 +0000 (18:04 +0200)]
proto_hnet: fix homenet dependency
Signed-off-by: Steven Barth <steven@midlink.org>
Steven Barth [Fri, 10 Apr 2015 15:29:42 +0000 (17:29 +0200)]
proto_hnet: add missing categories
Signed-off-by: Steven Barth <steven@midlink.org>
Jo-Philipp Wich [Tue, 31 Mar 2015 14:07:29 +0000 (16:07 +0200)]
Merge pull request #355 from nmav/no-defaultroute
luci-proto-openconnect: Added option for default gateway
Nikos Mavrogiannopoulos [Sun, 29 Mar 2015 06:31:26 +0000 (08:31 +0200)]
luci-proto-openconnect: Added option for default gateway
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Christian Schoenebeck [Fri, 20 Mar 2015 08:09:21 +0000 (09:09 +0100)]
Merge pull request #347 from chris5560/master-app-ddns
luci-app-ddns: fix errors in global.lua
Christian Schoenebeck [Fri, 20 Mar 2015 08:06:11 +0000 (09:06 +0100)]
luci-app-ddns: fix errors in global.lua
fix dispatcher and validation errors in global.lua
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Jo-Philipp Wich [Wed, 18 Mar 2015 11:43:29 +0000 (12:43 +0100)]
luci-base: fix backslash escaping in luci.util.serialize_json()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Jo-Philipp Wich [Tue, 10 Mar 2015 17:56:41 +0000 (18:56 +0100)]
Merge pull request #336 from legendtang/fix
luci-base: fix wrong pattern of urlencode() (encode '+' properly) #182
Jo-Philipp Wich [Tue, 10 Mar 2015 17:55:46 +0000 (18:55 +0100)]
Merge pull request #304 from nmav/ocserv-crypt
luci-app-ocserv: uclibc's crypt() doesn't support sha2crypt
Jo-Philipp Wich [Tue, 10 Mar 2015 17:55:15 +0000 (18:55 +0100)]
Merge pull request #333 from legendtang/master
themes/bootstrap: add media queries to bootstrap-theme for better responsive UI on mobile devices
Jo-Philipp Wich [Tue, 10 Mar 2015 17:54:24 +0000 (18:54 +0100)]
Merge pull request #338 from chris5560/master-app-privoxy
luci-app-privoxy: cleanup and fixes for #298 #334 #335
Jo-Philipp Wich [Tue, 10 Mar 2015 17:53:37 +0000 (18:53 +0100)]
Merge pull request #339 from Seak/master
ifaces.lua:fix generating /etc/config/dhcp section
Jo-Philipp Wich [Tue, 10 Mar 2015 17:49:10 +0000 (18:49 +0100)]
Merge pull request #337 from chris5560/master-app-ddns
luci-app-ddns: patches for #298 #334 #335
Jo-Philipp Wich [Tue, 10 Mar 2015 17:48:15 +0000 (18:48 +0100)]
Merge pull request #340 from hnyman/png-close-logspam
luci-statistics: fix uhttpd log spam from extra png close
Manuel Munz [Wed, 4 Mar 2015 23:54:21 +0000 (00:54 +0100)]
Merge pull request #344 from melle/fix-dns-community-potsdam
Fixed default DNS settings for community Potsdam
Thomas Mellenthin [Wed, 4 Mar 2015 19:45:27 +0000 (20:45 +0100)]
Fixed default DNS settings for community Potsdam
Hannu Nyman [Mon, 2 Mar 2015 17:04:16 +0000 (19:04 +0200)]
luci-statistics: fix uhttpd log spam from extra png close
Fix log spam that uhttpd logging change has brought to surface.
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: /usr/lib/lua/luci/dispatcher.lua:433: Failed to execute call dispatcher target for entry '/admin/statistics/graph/conntrack'.
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: The called action terminated with an exception:
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: .../luci/controller/luci_statistics/luci_statistics.lua:153: attempt to use a closed file
Closing the png file explicitly on line 153 is unnecessary, as
ltn12's source.file method already closes the file after use.
https://github.com/openwrt/luci/blob/master/modules/luci-base/luasrc/ltn12.lua#L119
More info at https://dev.openwrt.org/ticket/19083#comment:2
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
江海客 [Mon, 2 Mar 2015 07:14:24 +0000 (15:14 +0800)]
/etc/config/dhcp
config dhcp null
Christian Schoenebeck [Sun, 1 Mar 2015 19:37:00 +0000 (20:37 +0100)]
luci-app-privoxy: cleanup and fixes for #298 #334 #335
* remove extra apperror.lua page
* so no nore need for extra directory inside model/cbi
* add option temporary_directory needed for external filters
* remove special handling of bootstrap theme #298 #334
* modified version handling suggested in #335
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Christian Schoenebeck [Sun, 1 Mar 2015 19:08:45 +0000 (20:08 +0100)]
luci-app-ddns: patches for #298 #334 #335
* remove usage of opkg via system call for version handling
thanks to Jo-Philipp Wich #335
* remove special handling of bootstrap theme #298 #334
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Legend Tang [Sat, 28 Feb 2015 19:03:08 +0000 (03:03 +0800)]
luci-base: fix wrong pattern of urlencode() (encode '+' properly) #182
Jo-Philipp Wich [Sat, 28 Feb 2015 18:16:54 +0000 (19:16 +0100)]
Merge pull request #334 from legendtang/fix
theme/bootstrap: add a mssing class style in form section (#298)
Jo-Philipp Wich [Sat, 28 Feb 2015 18:05:42 +0000 (19:05 +0100)]
luci-app-upnp: supress stderr when listing MINIUPNPD chain
Current OpenWrt trunk now relays uhttpd stderr to syslog, so don't spam
it with "iptables: No chain/target/match by that name." when miniupnpd
is not configured but its status is queried by an overview page applet.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Legend Tang [Sat, 28 Feb 2015 17:20:33 +0000 (01:20 +0800)]
theme/bootstrap: add a mssing class style in form section (#298)
NOTE: three <br /> in some luci-app's cbi-tab-descr section which help
to workaround must be removed.
Legend Tang [Sat, 28 Feb 2015 15:08:26 +0000 (23:08 +0800)]
add media queries for better responsive UI on mobile devices
This is for modern browsers only
Jo-Philipp Wich [Sat, 28 Feb 2015 12:25:57 +0000 (13:25 +0100)]
Merge pull request #325 from chris5560/master-app-ddns
luci-app-ddns: update to version 2.2.0-1
Manuel Munz [Wed, 25 Feb 2015 19:11:31 +0000 (20:11 +0100)]
contrib/community-profiles/demo: remove openwifimap
Manuel Munz [Wed, 25 Feb 2015 19:09:47 +0000 (20:09 +0100)]
contrib/community-profiles/augsburg: remove openwifimap
soma [Wed, 25 Feb 2015 19:00:33 +0000 (20:00 +0100)]
contrib/meshwizard: add madwifi iface options if needed
soma [Wed, 25 Feb 2015 18:59:26 +0000 (19:59 +0100)]
contrib/freifunk-common: fix wifi device and iface settings: mcast_rate set to 6000, remove hwmode, remove madwifi only options. introduce a new section to set madwifi iface options
Manuel Munz [Fri, 20 Feb 2015 13:28:11 +0000 (14:28 +0100)]
Merge pull request #328 from chris5560/master-pending-1
wifi.lua: add "Back to Overview" button
Manuel Munz [Fri, 20 Feb 2015 13:20:55 +0000 (14:20 +0100)]
applications/luci-splash: fix
fac02283137f6ff59363695bb07a3f9cec58e577 | ipt module was missing and the new functions didn't return anything
Manuel Munz [Thu, 19 Feb 2015 19:33:26 +0000 (20:33 +0100)]
applications/olsr-services: fix error on public services page
Manuel Munz [Thu, 19 Feb 2015 19:20:31 +0000 (20:20 +0100)]
themes/freifunk-generic: fix error with version string display in header on BB
Manuel Munz [Wed, 18 Feb 2015 23:08:04 +0000 (00:08 +0100)]
Merge pull request #330 from Maltis/patch-1
Delete profile_neuss
Maltis [Wed, 18 Feb 2015 22:40:19 +0000 (23:40 +0100)]
Delete profile_neuss
Paul Oranje [Wed, 18 Feb 2015 22:10:21 +0000 (23:10 +0100)]
luci-proto-ipv6: fix aiccu requiretls
Manuel Munz [Wed, 18 Feb 2015 21:58:32 +0000 (22:58 +0100)]
Merge pull request #329 from yayachiken/master
Removed outdated information for Freifunk Aachen
David Kolossa [Wed, 18 Feb 2015 21:45:25 +0000 (22:45 +0100)]
Removed outdated information for Freifunk Aachen
- Freifunk Aachen now uses Gluon
- In addition, the old IP space has already been reallocated for other
communities, so the information here is definitely outdated.
Signed-off-by: David Kolossa <david.kolossa@posteo.de>
projects / oweals / luci.git / log