summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-06-14Merge pull request #409 from oneru/fwknop-qrChristian Schoenebeck
Luci-app-fwknopd:add a couple config options to the interface
2015-06-12Merge pull request #410 from maz-1/masterChristian Schoenebeck
add chinese translations to luci-app-privoxy
2015-06-11add chinese translations for luci-app-privoxymaz-1
2015-06-10Luci-app-fwknopd:add a couple config options to the interfaceJonathan Bennett
Minor tweaks to uci-defaults refresh translation files Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
2015-06-10Merge pull request #402 from NeoRaider/json-empty-objectJo-Philipp Wich
luci-lib-json: ignore null keys to allow encoding empty objects
2015-06-10Merge pull request #389 from hnyman/timezone2015dJo-Philipp Wich
Timezone information is updated to 2015d, released on 24 Apr 2015.
2015-06-07Merge pull request #403 from hnyman/fix-qos-l7Jo-Philipp Wich
luci-app-qos: remove l7 options
2015-06-06luci-app-qos: remove l7 optionsHannu Nyman
Cleanup luci-app-qos, as it still contains references to l7 functionality that has been removed both from kernel and from qos-scripts. Qos config page has a non-functional "Service" option and every visit to qos config page generates currently an error as no l7 files can be found. daemon.err uhttpd[2285]: find: /etc/l7-protocols/: No such file or directory Patch removes "Service" option and the l7 file search. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-06-04luci-lib-json: ignore null keys to allow encoding empty objectsMatthias Schiffer
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>
2015-06-04Merge pull request #401 from chris5560/masterChristian Schoenebeck
luci-app-privoxy: fixed function ipkg_ver_compare()
2015-06-04luci-app-privoxy: fixed function ipkg_ver_compare()Christian Schoenebeck
fixed function ipkg_ver_compare() Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-06-04Merge pull request #400 from chris5560/masterChristian Schoenebeck
luci-app-radicale: fixed function ipkg_ver_compare
2015-06-04luci-app-radicale: fixed function ipkg_ver_compareChristian Schoenebeck
fixed function ipkg_ver_compare() Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-05-31contrib/community-profiles/augsburg: Increase leasetime and bandwidth limitsManuel Munz
2015-05-31applications/splash: remove set -x from splash.shManuel Munz
2015-05-30modules/freifunk: fix basics cbi modelManuel Munz
2015-05-30applications/olsr: change config file download on olsr overview page to use ↵Manuel Munz
seperate v4 and v6 config files
2015-05-30contrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin configManuel Munz
2015-05-30applications/olsr: redirect errors on jsoninfo connects with netcat to ↵Manuel Munz
/dev/null to avoid spamming the log
2015-05-30applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config fileManuel Munz
2015-05-30meshwizard: use different port (9091) for ipv6 jsoninfoManuel Munz
2015-05-30add changes that were missing in the last commitManuel Munz
2015-05-30Merge branch 'master' of github.com:openwrt/luciManuel Munz
2015-05-30contrib/meshwizard: fix interaction with uci in OpenWrt CC, see ↵Manuel Munz
https://dev.openwrt.org/ticket/19539
2015-05-30Merge pull request #398 from albialbi/patch-1Manuel Munz
bssid und ssid scheme Anpassung für kathleen
2015-05-30bssid und ssid scheme Anpassung für kathleenalbialbi
2015-05-26luci-base: prevent parsing the form input after cbi emergency saveJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26Merge pull request #388 from oneru/fwknop-qrJo-Philipp Wich
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
2015-05-26luci-base: fallback to a simple text editor if uci config cannot be loadedJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26luci-base: rename .gitignore to .placeholderJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-25Merge pull request #394 from chris5560/masterChristian Schoenebeck
luci-app-ddns: fixed version check
2015-05-24luci-app-ddns: fixed version checkChristian Schoenebeck
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>
2015-05-23Timezone information is updated to 2015d, released on 24 Apr 2015.Hannu Nyman
I used build/zoneinfo2lua.pl to pull data from my Ubuntu 15.04. Changes in 2015d are rather small: http://mm.icann.org/pipermail/tz-announce/2015-April/000031.html Changes affecting future time stamps Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. Change affecting time zone abbreviations The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. This affects only America/Adak since 1983, as America/Honolulu was already using the new style. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-05-22Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the ↵Jonathan Bennett
fwknopd binary Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-21Merge pull request #384 from nightcoffee/nightcoffee-patch-1Jo-Philipp Wich
luci-base: Add cache control in index.html
2015-05-20Merge pull request #385 from oneru/fwknop-qrJo-Philipp Wich
luci-app-fwknopd: Add qr code support
2015-05-20luci-app-fwknopd: Add qr code supportJonathan Bennett
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-18luci-base: Add cache control in index.html nightcoffee
Signed-off-by: Night Coffee <ydkf@qq.com>
2015-05-17IPv6 updatesSteven Barth
Signed-off-by: Steven Barth <steven@midlink.org>
2015-05-14Merge pull request #382 from chris5560/masterChristian Schoenebeck
luci-app-ddns: reflect changes on ddns-scripts
2015-05-14Merge pull request #380 from oneru/masterChristian Schoenebeck
Add initial luci-app-fwknopd - a way to control the firewall knock da…
2015-05-12Add initial luci-app-fwknopd - a way to control the firewall knock daemon ↵Jonathan Bennett
from luci Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-12luci-app-ddns: reflect changes on ddns-scriptsChristian Schoenebeck
* 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>
2015-05-08Merge pull request #376 from chris5560/masterChristian Schoenebeck
luci-app-radicale: New app to support Radicale CalDAV/CardDAV server
2015-05-06collections/luci: depend on luci-proto-ipv6 if IPV6 is enabledJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-06Merge pull request #331 from poranje/proto=ipv6+aiccu+fixesJo-Philipp Wich
luci-proto-ipv6: fix aiccu requiretls
2015-05-05luci.mk: don't builtin translations selected by CONFIG_ALLJo-Philipp Wich
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>
2015-05-03luci-app-radicale: New app to support Radicale CalDAV/CardDAV serverChristian Schoenebeck
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>
2015-05-02luci-proto-ipv6: correct aiccu options defaultsPaul Oranje
- requiretls default set to disabled - corrected syntax errors in default values of Flag options for nat, verbose and requiretls.
2015-05-02Merge branch 'master' of https://github.com/openwrt/luci into ↵Paul Oranje
proto=ipv6+aiccu+fixes