project/luci.git
5 years agoMerge pull request #414 from maz-1/mjpg-update
Jo-Philipp Wich [Tue, 16 Jun 2015 07:56:30 +0000 (09:56 +0200)]
Merge pull request #414 from maz-1/mjpg-update

add chinese translations for luci-app-mjpg-streamer

5 years agoMerge pull request #409 from oneru/fwknop-qr
Christian Schoenebeck [Sun, 14 Jun 2015 10:22:48 +0000 (12:22 +0200)]
Merge pull request #409 from oneru/fwknop-qr

Luci-app-fwknopd:add a couple config options to the interface

5 years agoMerge pull request #1 from maz-1/allcommits 411/head 414/head
maz-1 [Sat, 13 Jun 2015 02:46:23 +0000 (10:46 +0800)]
Merge pull request #1 from maz-1/allcommits

add chinese translations for luci-app-mjpg-streamer

5 years agoMerge pull request #410 from maz-1/master
Christian Schoenebeck [Fri, 12 Jun 2015 16:56:18 +0000 (18:56 +0200)]
Merge pull request #410 from maz-1/master

add chinese translations to luci-app-privoxy

5 years agoadd chinese translations for luci-app-mjpg-streamer
maz-1 [Thu, 11 Jun 2015 08:35:21 +0000 (10:35 +0200)]
add chinese translations for luci-app-mjpg-streamer

5 years agoadd chinese translations for luci-app-privoxy 410/head
maz-1 [Thu, 11 Jun 2015 08:29:55 +0000 (10:29 +0200)]
add chinese translations for luci-app-privoxy

5 years agoLuci-app-fwknopd:add a couple config options to the interface 409/head
Jonathan Bennett [Wed, 10 Jun 2015 14:31:53 +0000 (09:31 -0500)]
Luci-app-fwknopd:add a couple config options to the interface
Minor tweaks to uci-defaults
refresh translation files
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
5 years agoMerge pull request #402 from NeoRaider/json-empty-object 405/head 406/head 407/head 408/head
Jo-Philipp Wich [Wed, 10 Jun 2015 08:20:49 +0000 (10:20 +0200)]
Merge pull request #402 from NeoRaider/json-empty-object

luci-lib-json: ignore null keys to allow encoding empty objects

5 years agoMerge pull request #389 from hnyman/timezone2015d
Jo-Philipp Wich [Wed, 10 Jun 2015 08:19:19 +0000 (10:19 +0200)]
Merge pull request #389 from hnyman/timezone2015d

Timezone information is updated to 2015d, released on 24 Apr 2015.

5 years agoMerge pull request #403 from hnyman/fix-qos-l7
Jo-Philipp Wich [Sun, 7 Jun 2015 15:13:48 +0000 (17:13 +0200)]
Merge pull request #403 from hnyman/fix-qos-l7

luci-app-qos: remove l7 options

5 years agoluci-app-qos: remove l7 options 403/head
Hannu Nyman [Sat, 6 Jun 2015 07:41:23 +0000 (10:41 +0300)]
luci-app-qos: remove l7 options

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>
5 years agoluci-lib-json: ignore null keys to allow encoding empty objects 402/head
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>
5 years agoMerge pull request #401 from chris5560/master
Christian Schoenebeck [Thu, 4 Jun 2015 19:00:37 +0000 (21:00 +0200)]
Merge pull request #401 from chris5560/master

luci-app-privoxy: fixed function ipkg_ver_compare()

5 years agoluci-app-privoxy: fixed function ipkg_ver_compare() 401/head
Christian Schoenebeck [Thu, 4 Jun 2015 18:59:21 +0000 (20:59 +0200)]
luci-app-privoxy: fixed function ipkg_ver_compare()

fixed function ipkg_ver_compare()

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
5 years agoMerge pull request #400 from chris5560/master
Christian Schoenebeck [Thu, 4 Jun 2015 18:51:30 +0000 (20:51 +0200)]
Merge pull request #400 from chris5560/master

luci-app-radicale: fixed function ipkg_ver_compare

5 years agoluci-app-radicale: fixed function ipkg_ver_compare 400/head
Christian Schoenebeck [Thu, 4 Jun 2015 18:50:08 +0000 (20:50 +0200)]
luci-app-radicale: fixed function ipkg_ver_compare

fixed function ipkg_ver_compare()

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
5 years agocontrib/community-profiles/augsburg: Increase leasetime and bandwidth limits
Manuel Munz [Sun, 31 May 2015 14:41:11 +0000 (16:41 +0200)]
contrib/community-profiles/augsburg: Increase leasetime and bandwidth limits

5 years agoapplications/splash: remove set -x from splash.sh
Manuel Munz [Sat, 30 May 2015 23:13:30 +0000 (01:13 +0200)]
applications/splash: remove set -x from splash.sh

5 years agomodules/freifunk: fix basics cbi model
Manuel Munz [Sat, 30 May 2015 21:01:24 +0000 (23:01 +0200)]
modules/freifunk: fix basics cbi model

5 years agoapplications/olsr: change config file download on olsr overview page to use seperate...
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

5 years agocontrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config
Manuel Munz [Sat, 30 May 2015 20:02:05 +0000 (22:02 +0200)]
contrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config

5 years agoapplications/olsr: redirect errors on jsoninfo connects with netcat to /dev/null...
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

5 years agoapplications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file
Manuel Munz [Sat, 30 May 2015 18:48:57 +0000 (20:48 +0200)]
applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file

5 years agomeshwizard: use different port (9091) for ipv6 jsoninfo
Manuel Munz [Sat, 30 May 2015 18:45:17 +0000 (20:45 +0200)]
meshwizard: use different port (9091) for ipv6 jsoninfo

5 years agoadd changes that were missing in the last commit
Manuel Munz [Sat, 30 May 2015 15:01:02 +0000 (17:01 +0200)]
add changes that were missing in the last commit

5 years agoMerge branch 'master' of github.com:openwrt/luci
Manuel Munz [Sat, 30 May 2015 14:57:30 +0000 (16:57 +0200)]
Merge branch 'master' of github.com:openwrt/luci

5 years agocontrib/meshwizard: fix interaction with uci in OpenWrt CC, see https://dev.openwrt...
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

5 years agoMerge pull request #398 from albialbi/patch-1
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

5 years agobssid und ssid scheme Anpassung für kathleen 398/head
albialbi [Sat, 30 May 2015 12:10:26 +0000 (14:10 +0200)]
bssid und ssid scheme Anpassung für kathleen

5 years agoluci-base: prevent parsing the form input after cbi emergency save
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>
5 years agoMerge pull request #388 from oneru/fwknop-qr
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…

5 years agoluci-base: fallback to a simple text editor if uci config cannot be loaded
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>
5 years agoluci-base: rename .gitignore to .placeholder
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>
5 years agoMerge pull request #394 from chris5560/master
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

5 years agoluci-app-ddns: fixed version check 394/head
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>
5 years agoTimezone information is updated to 2015d, released on 24 Apr 2015. 389/head
Hannu Nyman [Sat, 23 May 2015 14:34:13 +0000 (17:34 +0300)]
Timezone information is updated to 2015d, released on 24 Apr 2015.

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>
5 years agoLuci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary 388/head
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>
5 years agoMerge pull request #384 from nightcoffee/nightcoffee-patch-1
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

5 years agoMerge pull request #385 from oneru/fwknop-qr
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

5 years agoluci-app-fwknopd: Add qr code support 385/head
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>
5 years agoluci-base: Add cache control in index.html 384/head
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>
5 years agoIPv6 updates
Steven Barth [Sun, 17 May 2015 08:38:03 +0000 (10:38 +0200)]
IPv6 updates

Signed-off-by: Steven Barth <steven@midlink.org>
6 years agoMerge pull request #382 from chris5560/master
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

6 years agoMerge pull request #380 from oneru/master
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…

6 years agoAdd initial luci-app-fwknopd - a way to control the firewall knock daemon from luci 380/head
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>
6 years agoluci-app-ddns: reflect changes on ddns-scripts 382/head
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>
6 years agoMerge pull request #376 from chris5560/master
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

6 years agocollections/luci: depend on luci-proto-ipv6 if IPV6 is enabled
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>
6 years agoMerge pull request #331 from poranje/proto=ipv6+aiccu+fixes
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

6 years agoluci.mk: don't builtin translations selected by CONFIG_ALL
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>
6 years agoluci-app-radicale: New app to support Radicale CalDAV/CardDAV server 376/head
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>
6 years agoluci-proto-ipv6: correct aiccu options defaults 331/head
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.

6 years agoMerge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
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

6 years agoMerge pull request #374 from wongsyrone/patch-1
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

6 years agoluci-app-ddns: fix Simplified Chinese translations 374/head
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

6 years agoMerge pull request #358 from freifunk-leipzig/master
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

6 years agoMerge pull request #370 from 981213/pull_request
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.

6 years agoMerge pull request #371 from aidvu/fstab-swap
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

6 years agoluci-mod-admin-full: mount points SWAP fix 371/head
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.

6 years agoluci-base:Add some Simplified Chinese translation for luci-base 370/head
郭传鈜 [Fri, 24 Apr 2015 04:57:01 +0000 (12:57 +0800)]
luci-base:Add some Simplified Chinese translation for luci-base

6 years agoluci-app-ddns:Fix Simplified Chinese translation for luci-app-ddns
郭传鈜 [Fri, 24 Apr 2015 04:55:39 +0000 (12:55 +0800)]
luci-app-ddns:Fix Simplified Chinese translation for luci-app-ddns

6 years agoMerge pull request #369 from openwrt/revert-367-translate_pull_request
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."

6 years agoRevert "luci-app-ddns:Fix Simplified Chinese translation." 369/head
Christian Schoenebeck [Thu, 23 Apr 2015 18:18:19 +0000 (20:18 +0200)]
Revert "luci-app-ddns:Fix Simplified Chinese translation."

6 years agoMerge pull request #367 from 981213/translate_pull_request
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

6 years agoluci-app-ddns:Fix Simplified Chinese translation. 367/head
郭传鈜 [Thu, 23 Apr 2015 05:10:19 +0000 (13:10 +0800)]
luci-app-ddns:Fix Simplified Chinese translation.

6 years agoMerge pull request #364 from chris5560/master
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

6 years agofix wrong xhtml tags in po files 364/head
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>
6 years agoSynchronize translations
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>
6 years agobuild: rework i18n-sync.sh to support new structure
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>
6 years agoluci-app-ahcp: remove leftover po templates
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>
6 years agoUpdate .gitignore
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>
6 years agoMerge pull request #361 from hnyman/timezone2015c
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

6 years agoTimezone data: Update to 2015c 361/head
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>
6 years agoluci-mod-admin-full: handle missing size for block devices
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>
6 years agoluci-mod-admin-full: switch to a ipv6 enabled host 358/head
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

6 years agoluci-mod-admin-full: simply fstab configuration 357/head
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>
6 years agoFix typo in last commit
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>
6 years agoproto_hnet: fix homenet dependency
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>
6 years agoproto_hnet: add missing categories
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>
6 years agoMerge pull request #355 from nmav/no-defaultroute
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

6 years agoluci-proto-openconnect: Added option for default gateway 355/head
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>
6 years agoMerge pull request #347 from chris5560/master-app-ddns
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

6 years agoluci-app-ddns: fix errors in global.lua 347/head
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>
6 years agoluci-base: fix backslash escaping in luci.util.serialize_json()
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>
6 years agoMerge pull request #336 from legendtang/fix
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

6 years agoMerge pull request #304 from nmav/ocserv-crypt
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

6 years agoMerge pull request #333 from legendtang/master
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

6 years agoMerge pull request #338 from chris5560/master-app-privoxy
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

6 years agoMerge pull request #339 from Seak/master
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

6 years agoMerge pull request #337 from chris5560/master-app-ddns
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

6 years agoMerge pull request #340 from hnyman/png-close-logspam
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

6 years agoMerge pull request #344 from melle/fix-dns-community-potsdam
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

6 years agoFixed default DNS settings for community Potsdam 344/head
Thomas Mellenthin [Wed, 4 Mar 2015 19:45:27 +0000 (20:45 +0100)]
Fixed default DNS settings for community Potsdam

6 years agoluci-statistics: fix uhttpd log spam from extra png close 340/head
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>
6 years ago/etc/config/dhcp 339/head
江海客 [Mon, 2 Mar 2015 07:14:24 +0000 (15:14 +0800)]
/etc/config/dhcp

config dhcp null

6 years agoluci-app-privoxy: cleanup and fixes for #298 #334 #335 338/head
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>
6 years agoluci-app-ddns: patches for #298 #334 #335 337/head
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>
6 years agoluci-base: fix wrong pattern of urlencode() (encode '+' properly) #182 336/head
Legend Tang [Sat, 28 Feb 2015 19:03:08 +0000 (03:03 +0800)]
luci-base: fix wrong pattern of urlencode() (encode '+' properly) #182

6 years agoMerge pull request #334 from legendtang/fix
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)

6 years agoluci-app-upnp: supress stderr when listing MINIUPNPD chain
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>