Merge pull request #613 from tsl0922/tsl0922-patch-1

luci-theme-material: set default font-size to 13px

luci-mod-admin-full: avoid indexing iw.hwmodelist directly

Prevent a nil field access when hwmodelist is undefined.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: properly handle ubus connections for non-root (#570, #571)

Instead of relying on the connect-before-setuid hack, ship a proper
acl definition file whitelisting the procedures that LuCI requires
on its non-root pages.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-proto-ipv6: allow hostnames for dslite peer addresses (#621)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

community-profiles/cottbus: fix some invalid characters

a cleaner solution for disabling dyngw and dyngw_plain in freifunk-policyrouting init

Merge pull request #619 from FreifunkHalle/updateProfileHalle

update community profile halle

change community profile halle

Merge pull request #616 from chris5560/master

luci-app-ddns: removing unneeded assert

luci-app-ddns: removing unneeded assert

- remove unneeded assert() in tools/ddns.lua
- correct PKG_VERSION to the correct value from controller/ddns.lua

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

Merge pull request #608 from sairon/relative-luci-mk-paths

Use relative paths to luci.mk

luci-theme-material: set default font-size to 13px

Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/font-size#Rems

Signed-off-by: Shuanglei Tao <tsl0922@gmail.com>

luci-app-radicale: use relative path to luci.mk

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>

luci-app-privoxy: use relative path to luci.mk

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>

luci-app-ddns: use relative path to luci.mk

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>

i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #607 from 981213/fix-translate

Add some Simplified Chinese translations

Add some Simplified Chinese translations

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

Merge pull request #606 from SvenRoederer/update_community-berlin

Update community berlin-profiles

community-profiles: update berlin profile & remove berlin_pberg

these patches are used by the berlin-freifunk-community since 2014
- change ssid
  (https://github.com/freifunk-berlin/firmware/commit/563c955a19ea0db0bcbe6da1be0f50dd971961a3)
- remove obsolete olsr defaults
  (https://github.com/freifunk-berlin/firmware/commit/4558f8c88a99807388b3b1e315b440693b778a1d)
- use intern-chXX.freifunk.net as ssid scheme for adhoc
  (https://github.com/freifunk-berlin/firmware/commit/6ce8f590822bd31c37f247a8f006a8f2c5567b55)
- add mcast_rate
  (https://github.com/freifunk-berlin/firmware/commit/e90753ed0485d9c59a3af55efc8156e391ca848a)
  (https://github.com/freifunk-berlin/firmware/commit/01856773720b4755ee83080ba400b8489cf97416)
- add wifi_device and *_iface for 5GHz
  (https://github.com/freifunk-berlin/firmware/commit/5823e89a3d2d13bb47a2c9c7d33541588b9e64ab)
- remove owm_api and mapserver key from community profile
  (https://github.com/freifunk-berlin/firmware/commit/d4ee2e1bce4f04882af8cf28e62b97795959c31f)
- add two ipv6 nameservers
  (https://github.com/freifunk-berlin/firmware/commit/83df6ab77164a391f4536e32bc549a577d06af89)
- change default dhcp leasetime to 5 minutes
  (https://github.com/freifunk-berlin/firmware/commit/b38af129e0d4d4f5b6d1b1c23c57e6bec312de5f)
- remove non existent freifunk community profiles (Berlin)
  (https://github.com/freifunk-berlin/firmware/commit/6c49443bdef9905e71ad77b729d4cc95c5d66062)

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>

luci-mod-admin-full: interface status page / clarify address display

Copy the changes made by f8d0ba00b2ff27dc9e2f10712bc343ae655fbdf9
also to the interface details pages in order to clarify display of
multiple addresses.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #590 from Umeaboy/patch-9

luci-app-radicale: Added and edited Swedish translation

Merge pull request #587 from Umeaboy/patch-7

luci-app-privoxy: Added and edited Swedish translation

Merge pull request #594 from Umeaboy/patch-13

luci-app-statistics: Edited Swedish translation

Merge pull request #604 from Umeaboy/patch-23

luci-app-shadowsocks-libev: Edited Swedish translation

Merge pull request #600 from Umeaboy/patch-19

luci-app-vnstat: Edited Swedish translation

Merge pull request #601 from Umeaboy/patch-20

luci-app-voice-diag: Edited Swedish translation

Merge pull request #602 from Umeaboy/patch-21

luci-app-watchcat: Edited Swedish translation

Merge pull request #603 from Umeaboy/patch-22

luci-app-wol: Edited Swedish translation

Merge pull request #605 from Umeaboy/patch-24

luci-app-p910nd: Edited Swedish translation

Merge pull request #597 from Umeaboy/patch-16

luci-app-transmission: Edited Swedish translation

Merge pull request #596 from Umeaboy/patch-15

luci-app-tinyproxy: Edited Swedish translation

Merge pull request #598 from Umeaboy/patch-17

luci-app-upnp: Edited Swedish translation

Merge pull request #599 from Umeaboy/patch-18

luci-app-ushare: Edited Swedish translation

Merge pull request #592 from Umeaboy/patch-11

luci-app-samba: Edited Swedish translation

Merge pull request #591 from Umeaboy/patch-10

luci-app-radvd: Edited Swedish translation

Merge pull request #588 from Umeaboy/patch-5

luci-app-pbx-voicemail: Edited Swedish translation

Merge pull request #589 from Umeaboy/patch-8

luci-app-qos: Edited Swedish translation

Merge pull request #586 from Umeaboy/patch-6

luci-app-polipo: Edited Swedish translation

Merge pull request #585 from Umeaboy/patch-4

luci-app-p2pblock: Edited Swedish translation

Merge pull request #584 from Umeaboy/patch-3

luci-app-olsr: Edited Swedish translation

Merge pull request #583 from Umeaboy/patch-2

luci-app-ntpc: Edited Swedish translation

Merge pull request #582 from Umeaboy/patch-1

luci-app-mmc-over-gpio: Edited Swedish translation

luci-app-p910nd: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-shadowsocks-libev: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-wol: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-watchcat: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-voice-diag: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-vnstat: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-ushare: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-upnp: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-transmission: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-tinyproxy: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-statistics: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-samba: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-radvd: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-radicale: Added and edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-qos: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-privoxy: Added and edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-polipo: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-pbx-voicemail: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-p2pblock: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-olsr: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-ntpc: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

luci-app-mmc-over-gpio: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

Merge pull request #464 from remakeelectric/pulls/list-operations

get/set list operations and documentation

Merge pull request #579 from cshore/pull-request-protocol-vpnc

protocols: vpnc: Add vpnc as a network protocol

Merge pull request #437 from fkooman/issue-436

introduce tls_version_min and tls_version_max, add key_direction and …

Merge pull request #462 from jplitza/jsonc-sink

luci-lib-jsonc: Add ltn12-compatible sink factory

Merge pull request #577 from cshore/pull-request-safe-file-upload

luci-base: Make default for FileUpload 'safe'

Merge pull request #578 from cshore/pull-request-validator-rework

Pull request validator rework

Merge pull request #581 from Umeaboy/patch-2

luci-app-wshaper: Edited Swedish translation

luci-app-wshaper: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

Merge pull request #580 from Umeaboy/patch-3

luci-app-ahcp: Edited Swedish translation

luci-app-ahcp: Edited Swedish translation

Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>

protocols: vpnc: Add vpnc as a network protocol

validation: Add option ipv4only option to host and hostport datatypes

Some applications only support ipv4 so add ipv4only option
to host and hostport datatypes so that for thos applications
that when an IP address is specified only and ipv4 ip address
gets accepted.

modules/luci-base: Fix ipaddrport validator to support ipv6

The previous versiono of ipaddrport validator only worked for ipv4
due to disallowing colons (:) in ip address which obvious fails for
ipv6.  We now instead allow either ipv4 address or an ipv6 address of
the form [<ipv6address>]:port

luci-base: Make default for FileUpload 'safe'

Some files and pointers to files are not safe to remove without a replacement
file and config pointing to the file.  For instance for uhttpd application in
the works, removing the certificate or key config or files without having the
replacements in places renders the WeUI inaccessible.

The only other place where FileUpload is currently used is for wifi certificates
for which the 'safe' handling is also preferred.  Therefore make the default for
the FileUpload widget the safe handling and add a property self.unsafeupload that
allows for the old unsafe handling should it prove useful in some case.

Also allow to specify a file already on router instead of uploading a file.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>

Merge pull request #564 from cshore/pull-request-app-firewall-timedate

Pull request app firewall timedate

Merge pull request #562 from cshore/pull-request-upload-dir

modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…

CONTRIBUTING.md: clarify signed-off-by advice

Clarify the signed-off-by advice in CONTRIBUTING.md.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

applications: firewall: Add time and date for rules and redirects

UCI config for the firewall has the option of specifying time and date
limitations; add these options the UI.

luci-base: Add time and data datatypes for use with firewall app

Adding LuCI configuation of the firewall time and data uci options
is in progress and this adds the necessary datatypes for validating
those fields.

modules/luci-base: Move LuCI FileUpload directory to /etc/luci-uploads and save across sysupgrade

/lib/uci/upload is a rather odd place for configuration files

Also the files were not saved across sysupgrade, which is somewhat
counter-productive for configuration files.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>

luci-app-olsr: use public interface of luci.model.network.wifinet (#569)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

luci-base: rewrite luci.sys.net.conntrack()

The new function is twice as fast as the old implementation and properly
summarizes outgoing and incoming byte and packet counters.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #567 from inTagger/ip-addr-view-update

luci-mod-admin-full: update IPv4/IPv6 list views

luci-mod-admin-full: update IPv4/IPv6 list views

For better view of 'Interface Overview' IPv4/IPv6 addresses for
interfaces should be displayed as lists, but not as comma separated
strings.

Signed-off-by: Alexander Logger <intagger@gmail.com>

i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #461 from marcel-sch/patch-1

package/community-profiles: add freifunk cottbus profile

Merge pull request #559 from Arnie97/add-openvpn-proto

luci-app-openvpn: Add udp6 and tcp6 to proto

luci-app-openvpn: Add udp6 and tcp6 to proto

Signed-off-by: Yifeng Zhang <arnie97@gmail.com>

Merge pull request #565 from yousong/l2tp-server

Allow host:port value for l2tp `server` option

luci-proto-ppp: l2tp: allow specifying port in "server" option

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

luci-base: fix escaping lua string to js repr

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

luci-base: add hostport and ipaddrport validation types

Add two new types 'hostport' and 'ipaddrport' to validate strings in the form
'sub.example.org:1234' and '0.0.0.0:80'. The 'hostport' accepts hostnames or
IP addresses followed by a colon and a port number while the 'ipaddrport' type
accepts numeric IP addresses only, followed by a colon and a port.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Merge pull request #561 from cshore/pull-request-fstab-improvements

Pull request fstab improvements

luci-base: Add function for shell single-quote parameter escaping

When using os.execute or luci.sys.call the shell is called with the
command line which means that standard shell interpretation of strings
occurs.  To allow to use these commands more easily we add functions
for properly escaping single-quoted strings used on the command line

luci-mod-admin-full: fstab: Add ability to redo the detection of block devices

Adds a button that does block detect and write the new configuration
to /etc/config/fstab.