luci-0.11: merge outstanding trunk changes
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 18 Dec 2012 13:58:22 +0000 (13:58 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 18 Dec 2012 13:58:22 +0000 (13:58 +0000)
commit839dcdc01299869bc714990c19d8e244f18318b5
treefa375ce3c8a90ac71de0f443b806c97094bdb66a
parent31d76dbb64da3bcba3132d6246422ae50b376e5c
luci-0.11: merge outstanding trunk changes
390 files changed:
Makefile
applications/luci-ahcp/luasrc/controller/ahcp.lua
applications/luci-asterisk/luasrc/controller/asterisk.lua
applications/luci-commands/Makefile [new file with mode: 0644]
applications/luci-commands/luasrc/controller/commands.lua [new file with mode: 0644]
applications/luci-commands/luasrc/model/cbi/commands.lua [new file with mode: 0644]
applications/luci-commands/luasrc/view/commands.htm [new file with mode: 0644]
applications/luci-coovachilli/luasrc/controller/coovachilli.lua
applications/luci-ddns/luasrc/controller/ddns.lua
applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
applications/luci-diag-core/luasrc/controller/luci_diag.lua
applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
applications/luci-firewall/luasrc/controller/firewall.lua
applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
applications/luci-hd-idle/luasrc/controller/hd_idle.lua
applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua
applications/luci-minidlna/luasrc/controller/minidlna.lua
applications/luci-minidlna/luasrc/view/minidlna_status.htm
applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
applications/luci-multiwan/luasrc/controller/multiwan.lua
applications/luci-ntpc/luasrc/controller/ntpc.lua
applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
applications/luci-olsr/luasrc/controller/olsr.lua
applications/luci-olsr/luasrc/tools/olsr.lua
applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
applications/luci-openvpn/luasrc/controller/openvpn.lua
applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua
applications/luci-p910nd/luasrc/controller/p910nd.lua
applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
applications/luci-polipo/luasrc/controller/polipo.lua
applications/luci-qos/luasrc/controller/qos.lua
applications/luci-qos/luasrc/model/cbi/qos/qos.lua
applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
applications/luci-radvd/luasrc/controller/radvd.lua
applications/luci-samba/luasrc/controller/samba.lua
applications/luci-splash/luasrc/controller/splash/splash.lua
applications/luci-splash/luasrc/model/cbi/splash/splash.lua
applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
applications/luci-splash/luasrc/view/admin_status/splash.htm
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua [new file with mode: 0644]
applications/luci-statistics/luasrc/statistics/i18n.lua
applications/luci-statistics/luasrc/statistics/rrdtool.lua
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua [new file with mode: 0644]
applications/luci-statistics/root/etc/config/luci_statistics
applications/luci-statistics/root/usr/bin/stat-genconfig
applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
applications/luci-transmission/luasrc/controller/transmission.lua
applications/luci-upnp/luasrc/controller/upnp.lua
applications/luci-upnp/luasrc/view/upnp_status.htm
applications/luci-ushare/luasrc/controller/ushare.lua
applications/luci-vnstat/luasrc/controller/vnstat.lua
applications/luci-voice-core/luasrc/controller/luci_voice.lua
applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
applications/luci-wol/luasrc/controller/wol.lua
build/i18n-init.sh
contrib/package/community-profiles/files/etc/config/profile_hamburg [deleted file]
contrib/package/freifunk-p2pblock/Makefile
contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
contrib/package/luci/Makefile
i18n/polish/root/etc/uci-defaults/luci-i18n-polish
libs/core/luasrc/model/firewall.lua
libs/core/luasrc/model/network.lua
libs/core/luasrc/util.lua
libs/ipkg/luasrc/model/ipkg.lua
libs/lmo/Makefile [deleted file]
libs/lmo/src/lmo.h [deleted file]
libs/lmo/src/lmo_core.c [deleted file]
libs/lmo/src/lmo_hash.c [deleted file]
libs/lmo/src/lmo_lookup.c [deleted file]
libs/lmo/src/lmo_lualib.c [deleted file]
libs/lmo/src/lmo_lualib.h [deleted file]
libs/lmo/src/lmo_po2lmo.c [deleted file]
libs/lmo/standalone.mk [deleted file]
libs/web/Makefile
libs/web/htdocs/luci-static/resources/cbi.js
libs/web/luasrc/cbi.lua
libs/web/luasrc/http.lua
libs/web/luasrc/i18n.lua
libs/web/luasrc/template.lua
libs/web/luasrc/view/cbi/apply_xhr.htm
libs/web/luasrc/view/cbi/footer.htm
libs/web/src/po2lmo.c [new file with mode: 0644]
libs/web/src/template_lmo.c [new file with mode: 0644]
libs/web/src/template_lmo.h [new file with mode: 0644]
libs/web/src/template_lualib.c
libs/web/src/template_lualib.h
libs/web/src/template_parser.c
libs/web/src/template_parser.h
libs/web/src/template_utils.c
libs/web/src/template_utils.h
libs/web/standalone.mk [new file with mode: 0644]
modules/admin-core/luasrc/controller/admin/servicectl.lua
modules/admin-core/luasrc/tools/status.lua
modules/admin-full/luasrc/controller/admin/network.lua
modules/admin-full/luasrc/controller/admin/status.lua
modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
modules/admin-full/luasrc/view/admin_network/diagnostics.htm
modules/admin-full/luasrc/view/admin_network/switch_status.htm
modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
modules/admin-full/luasrc/view/admin_status/connections.htm
modules/admin-full/luasrc/view/admin_status/index.htm
modules/admin-full/luasrc/view/admin_status/load.htm
modules/admin-full/luasrc/view/admin_status/wireless.htm
modules/admin-full/luasrc/view/admin_system/packages.htm
modules/admin-full/src/luci-bwc.c
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
modules/freifunk/luasrc/model/cbi/freifunk/profile.lua
modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
modules/freifunk/luasrc/view/freifunk-map/frame.htm
modules/freifunk/luasrc/view/freifunk-map/map.htm
modules/freifunk/luasrc/view/freifunk/adminindex.htm
po/ca/base.po
po/ca/commands.po [new file with mode: 0644]
po/ca/ddns.po
po/ca/diag_devinfo.po
po/ca/freifunk.po
po/ca/meshwizard.po
po/ca/statistics.po
po/cs/base.po
po/cs/commands.po [new file with mode: 0644]
po/cs/ddns.po
po/cs/diag_devinfo.po
po/cs/freifunk.po
po/cs/meshwizard.po
po/cs/statistics.po
po/de/base.po
po/de/commands.po [new file with mode: 0644]
po/de/ddns.po
po/de/diag_devinfo.po
po/de/freifunk-policyrouting.po
po/de/freifunk.po
po/de/meshwizard.po
po/de/mmc_over_gpio.po
po/de/olsr.po
po/de/openvpn.po
po/de/splash.po
po/de/statistics.po
po/de/tinyproxy.po
po/de/upnp.po
po/el/base.po
po/el/commands.po [new file with mode: 0644]
po/el/ddns.po
po/el/diag_devinfo.po
po/el/freifunk.po
po/el/meshwizard.po
po/el/statistics.po
po/en/base.po
po/en/commands.po [new file with mode: 0644]
po/en/ddns.po
po/en/diag_devinfo.po
po/en/freifunk.po
po/en/meshwizard.po
po/en/statistics.po
po/es/ahcp.po
po/es/base.po
po/es/commands.po [new file with mode: 0644]
po/es/ddns.po
po/es/diag_devinfo.po
po/es/freifunk.po
po/es/meshwizard.po
po/es/minidlna.po
po/es/ntpc.po
po/es/olsr.po
po/es/p2pblock.po
po/es/pbx.po
po/es/polipo.po
po/es/radvd.po
po/es/statistics.po
po/es/tinyproxy.po
po/fr/ahcp.po
po/fr/base.po
po/fr/commands.po [new file with mode: 0644]
po/fr/coovachilli.po
po/fr/ddns.po
po/fr/diag_core.po
po/fr/diag_devinfo.po
po/fr/freifunk.po
po/fr/hd_idle.po
po/fr/meshwizard.po
po/fr/mmc_over_gpio.po
po/fr/multiwan.po
po/fr/ntpc.po
po/fr/qos.po
po/fr/statistics.po
po/fr/tinyproxy.po
po/fr/upnp.po
po/fr/voice_core.po
po/he/base.po
po/he/commands.po [new file with mode: 0644]
po/he/ddns.po
po/he/diag_devinfo.po
po/he/freifunk.po
po/he/meshwizard.po
po/he/statistics.po
po/hu/base.po
po/hu/commands.po [new file with mode: 0644]
po/hu/ddns.po
po/hu/diag_devinfo.po
po/hu/freifunk.po
po/hu/meshwizard.po
po/hu/qos.po
po/hu/statistics.po
po/it/base.po
po/it/commands.po [new file with mode: 0644]
po/it/ddns.po
po/it/diag_devinfo.po
po/it/freifunk.po
po/it/meshwizard.po
po/it/minidlna.po
po/it/pbx.po
po/it/statistics.po
po/it/tinyproxy.po
po/ja/base.po
po/ja/commands.po [new file with mode: 0644]
po/ja/ddns.po
po/ja/diag_devinfo.po
po/ja/firewall.po
po/ja/freifunk.po
po/ja/hd_idle.po
po/ja/meshwizard.po
po/ja/ntpc.po
po/ja/olsr.po
po/ja/statistics.po
po/ja/watchcat.po
po/ms/base.po
po/ms/commands.po [new file with mode: 0644]
po/ms/ddns.po
po/ms/diag_devinfo.po
po/ms/freifunk.po
po/ms/meshwizard.po
po/ms/statistics.po
po/no/base.po
po/no/commands.po [new file with mode: 0644]
po/no/ddns.po
po/no/diag_devinfo.po
po/no/freifunk.po
po/no/meshwizard.po
po/no/statistics.po
po/pl/base.po
po/pl/commands.po [new file with mode: 0644]
po/pl/ddns.po
po/pl/diag_devinfo.po
po/pl/ffwizard.po
po/pl/freifunk.po
po/pl/meshwizard.po
po/pl/minidlna.po
po/pl/multiwan.po
po/pl/olsr.po
po/pl/pbx.po
po/pl/splash.po
po/pl/statistics.po
po/pl/tinyproxy.po
po/pl/transmission.po
po/pt/base.po
po/pt/commands.po [new file with mode: 0644]
po/pt/ddns.po
po/pt/diag_devinfo.po
po/pt/freifunk.po
po/pt/meshwizard.po
po/pt/statistics.po
po/pt_BR/base.po
po/pt_BR/commands.po [new file with mode: 0644]
po/pt_BR/ddns.po
po/pt_BR/diag_devinfo.po
po/pt_BR/freifunk.po
po/pt_BR/meshwizard.po
po/pt_BR/multiwan.po
po/pt_BR/olsr.po
po/pt_BR/pbx.po
po/pt_BR/statistics.po
po/pt_BR/transmission.po
po/ro/base.po
po/ro/commands.po [new file with mode: 0644]
po/ro/coovachilli.po
po/ro/ddns.po
po/ro/diag_devinfo.po
po/ro/freifunk.po
po/ro/meshwizard.po
po/ro/ntpc.po
po/ro/statistics.po
po/ru/ahcp.po
po/ru/base.po
po/ru/commands.po [new file with mode: 0644]
po/ru/coovachilli.po
po/ru/ddns.po
po/ru/diag_core.po
po/ru/diag_devinfo.po
po/ru/ffwizard.po
po/ru/freifunk-policyrouting.po
po/ru/freifunk.po
po/ru/hd_idle.po
po/ru/meshwizard.po
po/ru/minidlna.po
po/ru/mmc_over_gpio.po
po/ru/multiwan.po
po/ru/ntpc.po
po/ru/olsr.po
po/ru/openvpn.po
po/ru/p2pblock.po
po/ru/p910nd.po
po/ru/pbx-voicemail.po
po/ru/polipo.po
po/ru/qos.po
po/ru/radvd.po
po/ru/samba.po
po/ru/splash.po
po/ru/statistics.po
po/ru/tinyproxy.po
po/ru/transmission.po
po/ru/upnp.po
po/ru/ushare.po
po/ru/uvc_streamer.po
po/ru/vnstat.po
po/ru/voice_core.po
po/ru/voice_diag.po
po/ru/watchcat.po
po/ru/wol.po
po/ru/wshaper.po
po/templates/base.pot
po/templates/commands.pot [new file with mode: 0644]
po/templates/ddns.pot
po/templates/diag_devinfo.pot
po/templates/freifunk.pot
po/templates/meshwizard.pot
po/templates/olsr.pot
po/templates/statistics.pot
po/tr/base.po
po/tr/commands.po [new file with mode: 0644]
po/tr/ddns.po
po/tr/diag_devinfo.po
po/tr/freifunk.po
po/tr/meshwizard.po
po/tr/statistics.po
po/uk/base.po
po/uk/commands.po [new file with mode: 0644]
po/uk/ddns.po
po/uk/diag_devinfo.po
po/uk/freifunk.po
po/uk/meshwizard.po
po/uk/statistics.po
po/vi/base.po
po/vi/commands.po [new file with mode: 0644]
po/vi/ddns.po
po/vi/diag_devinfo.po
po/vi/freifunk.po
po/vi/meshwizard.po
po/vi/statistics.po
po/zh_CN/base.po
po/zh_CN/commands.po [new file with mode: 0644]
po/zh_CN/ddns.po
po/zh_CN/diag_devinfo.po
po/zh_CN/firewall.po
po/zh_CN/freifunk.po
po/zh_CN/meshwizard.po
po/zh_CN/minidlna.po
po/zh_CN/ntpc.po
po/zh_CN/p910nd.po
po/zh_CN/splash.po
po/zh_CN/statistics.po
po/zh_CN/tinyproxy.po
po/zh_CN/ushare.po
po/zh_CN/uvc_streamer.po
po/zh_CN/watchcat.po
po/zh_CN/wol.po
protocols/ppp/luasrc/model/network/proto_ppp.lua
themes/base/htdocs/luci-static/resources/Dropdowns.js [deleted file]
themes/base/htdocs/luci-static/resources/VarType.js [deleted file]
themes/base/htdocs/luci-static/resources/XHTML1.js [deleted file]
themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
themes/openwrt/luasrc/view/themes/openwrt.org/header.htm