Commit graph

7507 commits

Author SHA1 Message Date
Manuel Munz
cc39eaa681 applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file 2015-05-30 20:48:57 +02:00
Manuel Munz
595c637c3b meshwizard: use different port (9091) for ipv6 jsoninfo 2015-05-30 20:45:17 +02:00
Manuel Munz
d447b7e9f2 add changes that were missing in the last commit 2015-05-30 17:01:02 +02:00
Manuel Munz
0eef467871 Merge branch 'master' of github.com:openwrt/luci 2015-05-30 16:57:30 +02:00
Manuel Munz
458c3c1366 contrib/meshwizard: fix interaction with uci in OpenWrt CC, see https://dev.openwrt.org/ticket/19539 2015-05-30 16:56:18 +02:00
Manuel Munz
9b5beaee7c Merge pull request #398 from albialbi/patch-1
bssid und ssid scheme Anpassung für kathleen
2015-05-30 14:22:24 +02:00
albialbi
420cdd4377 bssid und ssid scheme Anpassung für kathleen 2015-05-30 14:10:26 +02:00
Jo-Philipp Wich
1dada8cc44 luci-base: prevent parsing the form input after cbi emergency save
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:32:11 +02:00
Jo-Philipp Wich
d6d0926aee Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
2015-05-26 17:14:24 +02:00
Jo-Philipp Wich
fe14cd5a66 luci-base: fallback to a simple text editor if uci config cannot be loaded
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:12:42 +02:00
Jo-Philipp Wich
03610cee3a luci-base: rename .gitignore to .placeholder
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 16:27:05 +02:00
Christian Schoenebeck
5014e05f37 Merge pull request #394 from chris5560/master
luci-app-ddns: fixed version check
2015-05-25 14:40:12 +02:00
Christian Schoenebeck
740ce09fb9 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>
2015-05-24 20:03:52 +02:00
Jonathan Bennett
30b8097f65 Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-22 12:48:06 -05:00
Jo-Philipp Wich
64b728a2df Merge pull request #384 from nightcoffee/nightcoffee-patch-1
luci-base: Add cache control in index.html
2015-05-21 14:51:30 +02:00
Jo-Philipp Wich
ec48d2d01f Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
2015-05-20 20:26:59 +02:00
Jonathan Bennett
4ccb221f6d luci-app-fwknopd: Add qr code support
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-20 13:02:11 -05:00
nightcoffee
08a38a0493 luci-base: Add cache control in index.html
Signed-off-by: Night Coffee <ydkf@qq.com>
2015-05-18 20:05:02 +08:00
Steven Barth
f67d39e69a IPv6 updates
Signed-off-by: Steven Barth <steven@midlink.org>
2015-05-17 17:06:43 +02:00
Christian Schoenebeck
754ca290e5 Merge pull request #382 from chris5560/master
luci-app-ddns: reflect changes on ddns-scripts
2015-05-14 09:02:40 +02:00
Christian Schoenebeck
4cabf997e5 Merge pull request #380 from oneru/master
Add initial luci-app-fwknopd - a way to control the firewall knock da…
2015-05-14 09:01:33 +02:00
Jonathan Bennett
fd130d0ce7 Add initial luci-app-fwknopd - a way to control the firewall knock daemon from luci
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-12 21:10:00 -05:00
Christian Schoenebeck
d3b6c375ce 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>
2015-05-12 20:31:30 +02:00
Christian Schoenebeck
cc99288242 Merge pull request #376 from chris5560/master
luci-app-radicale: New app to support Radicale CalDAV/CardDAV server
2015-05-08 20:44:13 +02:00
Jo-Philipp Wich
a7083780de collections/luci: depend on luci-proto-ipv6 if IPV6 is enabled
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-06 16:00:33 +02:00
Jo-Philipp Wich
6fb24acb38 Merge pull request #331 from poranje/proto=ipv6+aiccu+fixes
luci-proto-ipv6: fix aiccu requiretls
2015-05-06 15:42:53 +02:00
Jo-Philipp Wich
c38b4cdffa 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>
2015-05-05 10:32:15 +02:00
Christian Schoenebeck
e6804f0a93 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>
2015-05-03 18:05:32 +02:00
Paul Oranje
1c054af0d7 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.
2015-05-02 12:24:25 +02:00
Paul Oranje
ae8e971eef Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes 2015-05-02 10:44:17 +02:00
Jo-Philipp Wich
36879e9e86 Merge pull request #374 from wongsyrone/patch-1
luci-app-ddns: fix Simplified Chinese translations
2015-04-28 15:56:15 +02:00
Syrone Wong
775182ce28 luci-app-ddns: fix Simplified Chinese translations
fix typos and elegant zh_CN translations
2015-04-28 21:52:27 +08:00
Jo-Philipp Wich
58a42eaf9b Merge pull request #358 from freifunk-leipzig/master
luci-mod-admin-full: change adress to an ipv6-enabled host
2015-04-27 15:09:17 +02:00
Jo-Philipp Wich
70ffeb36db Merge pull request #370 from 981213/pull_request
Fix some Simplified Chinese translations in luci.
2015-04-27 15:08:21 +02:00
Jo-Philipp Wich
2243a3f937 Merge pull request #371 from aidvu/fstab-swap
luci-mod-admin-full: mount points SWAP fix
2015-04-27 15:06:42 +02:00
Andrija Vucinic
64b052bbd8 luci-mod-admin-full: mount points SWAP fix
SWAP section was showing an error. Fixed it to display the devices/size properly.
2015-04-25 23:35:33 +02:00
郭传鈜
c39edc189f luci-base:Add some Simplified Chinese translation for luci-base 2015-04-24 13:34:28 +08:00
郭传鈜
26b1b6d65d luci-app-ddns:Fix Simplified Chinese translation for luci-app-ddns 2015-04-24 13:34:23 +08:00
Christian Schoenebeck
f322842265 Merge pull request #369 from openwrt/revert-367-translate_pull_request
Revert "luci-app-ddns:Fix Simplified Chinese translation."
2015-04-23 20:22:05 +02:00
Christian Schoenebeck
42dffa5636 Revert "luci-app-ddns:Fix Simplified Chinese translation." 2015-04-23 20:18:19 +02:00
Christian Schoenebeck
52bf535ddd Merge pull request #367 from 981213/translate_pull_request
luci-app-ddns:Fix Simplified Chinese translation.
Many Thanks
Christian
2015-04-23 20:16:04 +02:00
郭传鈜
3d5c630ff3 luci-app-ddns:Fix Simplified Chinese translation. 2015-04-23 13:10:19 +08:00
Christian Schoenebeck
f275592bd4 Merge pull request #364 from chris5560/master
fix wrong xhtml tags in po files
2015-04-22 21:12:12 +02:00
Christian Schoenebeck
2fdd19524d fix wrong xhtml tags in po files
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-04-21 21:26:00 +02:00
Jo-Philipp Wich
6a13d73c29 Synchronize translations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:35:08 +02:00
Jo-Philipp Wich
5fd8761583 build: rework i18n-sync.sh to support new structure
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:17:23 +02:00
Jo-Philipp Wich
661c33ba91 luci-app-ahcp: remove leftover po templates
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:08:23 +02:00
Jo-Philipp Wich
29004d9552 Update .gitignore
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:08:23 +02:00
Jo-Philipp Wich
493662e7fb Merge pull request #361 from hnyman/timezone2015c
Timezone data: Update to 2015c
2015-04-19 13:12:53 +02:00
Hannu Nyman
4d18e09e05 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>
2015-04-19 10:48:03 +03:00