summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-12-17Merge pull request #462 from jplitza/jsonc-sinkJo-Philipp Wich
luci-lib-jsonc: Add ltn12-compatible sink factory
2015-12-17Merge pull request #577 from cshore/pull-request-safe-file-uploadJo-Philipp Wich
luci-base: Make default for FileUpload 'safe'
2015-12-17Merge pull request #578 from cshore/pull-request-validator-reworkJo-Philipp Wich
Pull request validator rework
2015-12-17Merge pull request #581 from Umeaboy/patch-2Jo-Philipp Wich
luci-app-wshaper: Edited Swedish translation
2015-12-17luci-app-wshaper: Edited Swedish translationKristoffer Grundström
Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>
2015-12-17Merge pull request #580 from Umeaboy/patch-3Jo-Philipp Wich
luci-app-ahcp: Edited Swedish translation
2015-12-17luci-app-ahcp: Edited Swedish translationKristoffer Grundström
Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>
2015-12-15validation: Add option ipv4only option to host and hostport datatypesDaniel Dickinson
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.
2015-12-15modules/luci-base: Fix ipaddrport validator to support ipv6Daniel Dickinson
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
2015-12-15luci-base: Make default for FileUpload 'safe'Daniel Dickinson
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>
2015-12-15Merge pull request #564 from cshore/pull-request-app-firewall-timedateJo-Philipp Wich
Pull request app firewall timedate
2015-12-15Merge pull request #562 from cshore/pull-request-upload-dirJo-Philipp Wich
modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…
2015-12-15CONTRIBUTING.md: clarify signed-off-by adviceHannu Nyman
Clarify the signed-off-by advice in CONTRIBUTING.md. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-14applications: firewall: Add time and date for rules and redirectsDaniel Dickinson
UCI config for the firewall has the option of specifying time and date limitations; add these options the UI.
2015-12-14luci-base: Add time and data datatypes for use with firewall appDaniel Dickinson
Adding LuCI configuation of the firewall time and data uci options is in progress and this adds the necessary datatypes for validating those fields.
2015-12-12modules/luci-base: Move LuCI FileUpload directory to /etc/luci-uploads and ↵Daniel Dickinson
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>
2015-12-09luci-app-olsr: use public interface of luci.model.network.wifinet (#569)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-12-09luci-base: rewrite luci.sys.net.conntrack()Jo-Philipp Wich
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>
2015-12-09Merge pull request #567 from inTagger/ip-addr-view-updateHannu Nyman
luci-mod-admin-full: update IPv4/IPv6 list views
2015-12-08luci-mod-admin-full: update IPv4/IPv6 list viewsAlexander Logger
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>
2015-12-06i18n: sync translationsHannu Nyman
Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-04Merge pull request #461 from marcel-sch/patch-1Jo-Philipp Wich
package/community-profiles: add freifunk cottbus profile
2015-12-03Merge pull request #559 from Arnie97/add-openvpn-protoJo-Philipp Wich
luci-app-openvpn: Add udp6 and tcp6 to proto
2015-12-03luci-app-openvpn: Add udp6 and tcp6 to protoArnie97
Signed-off-by: Yifeng Zhang <arnie97@gmail.com>
2015-12-02Merge pull request #565 from yousong/l2tp-serverJo-Philipp Wich
Allow host:port value for l2tp `server` option
2015-12-02luci-proto-ppp: l2tp: allow specifying port in "server" optionYousong Zhou
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-12-02luci-base: fix escaping lua string to js reprYousong Zhou
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-12-02luci-base: add hostport and ipaddrport validation typesJo-Philipp Wich
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>
2015-12-02Merge pull request #561 from cshore/pull-request-fstab-improvementsJo-Philipp Wich
Pull request fstab improvements
2015-12-02luci-base: Add function for shell single-quote parameter escapingDaniel Dickinson
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
2015-12-02luci-mod-admin-full: fstab: Add ability to redo the detection of block devicesDaniel Dickinson
Adds a button that does block detect and write the new configuration to /etc/config/fstab.
2015-12-02luci-mod-admin-full: fstab: Add ability to set global options like anonymous ↵Daniel Dickinson
mounts Previously the global configuration options were missing the the LuCI configuration, however these options are useful, so make them available to the UI.
2015-12-02luci-mod-admin-full: Don't show jail bind mountsDaniel Dickinson
The user is unlikely to care about the plethora of jail bind mounts when using jails, so don't display them in this app.
2015-12-02luci-mod-admin-full: fstab: Add ability to unmount non-system mountsDaniel Dickinson
Add an unmount button for non-system mounts which will unmount the corresponding file system.
2015-11-30luci-app-openvpn: add route_nopull (#560)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-26Merge pull request #534 from yousong/add-luci-proto-ppposshJo-Philipp Wich
Add luci proto pppossh
2015-11-26luci-mod-admin-full: limit SSID to 32 characters (#558)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21luci-mod-admin-full: fix script regression after ↵Jo-Philipp Wich
152ba9ab228ad4ea4c1748f29fe4ffa5f8f74ac6 Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21luci-base: use board.json to infer switch netdevJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21luci-base: switch to luci-lib-jsoncJo-Philipp Wich
Add dependency on luci-lib-jsonc and use it to reimplement luci.util.serialize_json(). Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-20luci-mod-admin-full: make mirror port settings depend on mirror enableJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-20Merge pull request #554 from bittorf/better_neigh.shHannu Nyman
freifunk-common: neigh.sh - show hostnames
2015-11-20freifunk-common: neigh.sh - show hostnamesBastian Bittorf
if nameservice-plugin is configured, we read in all locally known hostnames and show them in the output: root@stuttgarter-core:~# neigh.sh Local Remote vTime LQ NLQ Cost Host 10.230.105.241 10.230.105.246 138851 1.000000 1.000000 1024 stuttgarter-rhnk.olsr 10.230.105.241 10.230.105.247 135717 1.000000 1.000000 1024 stuttgarter-emma.olsr 10.230.105.241 10.230.105.244 138309 1.000000 1.000000 1024 stuttgarter-sued.olsr 10.230.105.241 10.230.105.245 136001 1.000000 1.000000 1024 stuttgarter-west.olsr 10.230.105.241 10.230.105.242 134818 1.000000 1.000000 1024 stuttgarter-nord.olsr 10.230.105.241 10.230.105.243 137187 1.000000 1.000000 1024 stuttgarter-ost.olsr 10.230.105.241 10.230.105.250 139984 1.000000 1.000000 1024 stuttgarter-hof2.olsr 10.230.105.241 10.230.105.251 138294 1.000000 1.000000 1024 stuttgarter-stra2.olsr Local Remote vTime LQ NLQ Cost Host 2001:bf7:820:901::1 2001:bf7:820:950::1 139703 1.000000 1.000000 1024 stuttgarter-rhnk.olsr 2001:bf7:820:901::1 2001:bf7:820:960::1 139541 1.000000 1.000000 1024 stuttgarter-emma.olsr 2001:bf7:820:901::1 2001:bf7:820:990::1 140415 1.000000 1.000000 1024 stuttgarter-hof2.olsr 2001:bf7:820:901::1 fde6:24f1:a388::1 141338 1.000000 1.000000 1024 the filenames for the olsrd hosts-file is taken from uci and falls back to sane defaults. Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
2015-11-19luci-mod-admin-full: revert accidential button type change in ↵Jo-Philipp Wich
20fdac1ac4a126ceebde13fb627a9f88bba0e2b3 Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-18update profilemarcel-sch
2015-11-18contrib/package/freifunk-policyrouting: remove rc.d symlinkManuel Munz
2015-11-17luci-mod-admin-full: allow empty mac in interface statusJo-Philipp Wich
Also adjust for changed IP address format emitted by iface_status call. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-17luci-mod-admin-full: use :ipaddrs() and :ip6addrs() helper for iface_statusJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-17luci-base: eliminate use of uci state vars in luci.model.networkJo-Philipp Wich
Also implement :ipaddrs() and :ip6addrs() helper for network instances. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-16luci-mod-admin-full: prevent submit with interface delete button (#549)Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>