oweals/luci.git
10 years agoCommit from LuCI Translation Portal by user jow.: 852 of 852 messages translated...
Translation System [Sun, 27 Apr 2014 19:58:59 +0000 (19:58 +0000)]
Commit from LuCI Translation Portal by user jow.: 852 of 852 messages translated (0 fuzzy).

10 years agoCommit from LuCI Translation Portal by user jow.: 31 of 31 messages translated (0...
Translation System [Sun, 27 Apr 2014 19:58:57 +0000 (19:58 +0000)]
Commit from LuCI Translation Portal by user jow.: 31 of 31 messages translated (0 fuzzy).

10 years agoapplications/meshwizard: Fox error when iwinfo.freqlist is empty
Manuel Munz [Sun, 27 Apr 2014 13:45:53 +0000 (13:45 +0000)]
applications/meshwizard: Fox error when iwinfo.freqlist is empty

10 years agocontrib: prefer libustream-polarssl for luci-ssl (#677)
Jo-Philipp Wich [Thu, 24 Apr 2014 21:42:58 +0000 (21:42 +0000)]
contrib: prefer libustream-polarssl for luci-ssl (#677)

10 years agoapplications/luci-firewall: cope with both tables and strings when processing zone...
Jo-Philipp Wich [Thu, 24 Apr 2014 21:42:55 +0000 (21:42 +0000)]
applications/luci-firewall: cope with both tables and strings when processing zone name or network in rule detail page (#675)

10 years agolibs/sys: make sure to always return a table from arptable() when no callback is...
Jo-Philipp Wich [Thu, 24 Apr 2014 21:42:48 +0000 (21:42 +0000)]
libs/sys: make sure to always return a table from arptable() when no callback is passed (#671)

10 years agomodules/freifunk: don't drop priveleges for OLSR status page, we need root to talk...
Jo-Philipp Wich [Wed, 23 Apr 2014 12:15:40 +0000 (12:15 +0000)]
modules/freifunk: don't drop priveleges for OLSR status page, we need root to talk to ubus

10 years agoRevert "modules/freifunk: don't drop priveleges for OLSR status page, we need root...
Jo-Philipp Wich [Wed, 23 Apr 2014 12:15:02 +0000 (12:15 +0000)]
Revert "modules/freifunk: don't drop priveleges for OLSR status page, we need root to talk to ubus"

This reverts commit 57481b0e94b1d4be944c623ffa8334cbd4d53cbb, it contains some accidentally commited changes.

10 years agomodules/freifunk: don't drop priveleges for OLSR status page, we need root to talk...
Jo-Philipp Wich [Wed, 23 Apr 2014 12:14:07 +0000 (12:14 +0000)]
modules/freifunk: don't drop priveleges for OLSR status page, we need root to talk to ubus

10 years agodisable ip6 for weil profile
Matthias Uferer [Sat, 19 Apr 2014 15:14:46 +0000 (15:14 +0000)]
disable ip6 for weil profile

10 years agosuffix added
Matthias Uferer [Sat, 19 Apr 2014 14:45:43 +0000 (14:45 +0000)]
suffix added

10 years agochange weil profile (less packages, wifi ch 10)
Matthias Uferer [Sat, 19 Apr 2014 14:42:19 +0000 (14:42 +0000)]
change weil profile (less packages, wifi ch 10)

10 years agoProfile Weil-am-Rhein added
Matthias Uferer [Sat, 19 Apr 2014 14:17:22 +0000 (14:17 +0000)]
Profile Weil-am-Rhein added

10 years agocontrib/community-profiles: Add demo profile for testing/plying round
Manuel Munz [Sat, 19 Apr 2014 08:58:50 +0000 (08:58 +0000)]
contrib/community-profiles: Add demo profile for testing/plying round

10 years agocopy l59 to demo
Matthias Uferer [Fri, 18 Apr 2014 22:44:57 +0000 (22:44 +0000)]
copy l59 to demo

10 years agochange ssid
Matthias Uferer [Fri, 18 Apr 2014 22:37:36 +0000 (22:37 +0000)]
change ssid

10 years agocontrib: add Build/Prepare/Default hook to Makefile to allow quilt-patching LuCI...
Jo-Philipp Wich [Sat, 29 Mar 2014 13:50:07 +0000 (13:50 +0000)]
contrib: add Build/Prepare/Default hook to Makefile to allow quilt-patching LuCI (!OpenWrt !#15182)

10 years agolibs/sgi-uhttpd: fix binding to properly work with current uhttpd2 implementation
Jo-Philipp Wich [Fri, 28 Mar 2014 16:59:08 +0000 (16:59 +0000)]
libs/sgi-uhttpd: fix binding to properly work with current uhttpd2 implementation

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
10 years agolibs/sgi-uhttpd: do not assume env.CONTENT_LENGTH to be a number
Jo-Philipp Wich [Fri, 28 Mar 2014 16:37:03 +0000 (16:37 +0000)]
libs/sgi-uhttpd: do not assume env.CONTENT_LENGTH to be a number

env.CONTENT_LENGTH as passed by uhttpd might be a string, so explicitely
convert it using tonumber().

Issue has been reported by Catalin Patulea <cat@vv.carleton.ca>

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
10 years agocontrib: disable mips16 for LuCI build (OpenWrt ticket 15224)
Jo-Philipp Wich [Tue, 11 Mar 2014 16:14:27 +0000 (16:14 +0000)]
contrib: disable mips16 for LuCI build (OpenWrt ticket 15224)

10 years agopostinstall script possibility added for meshkit wizard at /etc/rc.local.meshkitposti...
Matthias Uferer [Sun, 2 Mar 2014 15:50:20 +0000 (15:50 +0000)]
postinstall script possibility added for meshkit wizard at /etc/rc.local.meshkitpostinstall

10 years agoimrovements, mcastrate, bssid, country-setting DE
Matthias Uferer [Sun, 2 Mar 2014 15:44:38 +0000 (15:44 +0000)]
imrovements, mcastrate, bssid, country-setting DE

10 years agoimprovements for leipzig
Matthias Uferer [Sun, 2 Mar 2014 15:40:27 +0000 (15:40 +0000)]
improvements for leipzig

10 years agogeocoord Erfurt
Matthias Uferer [Thu, 20 Feb 2014 13:35:19 +0000 (13:35 +0000)]
geocoord Erfurt

10 years agoFreifunk Erfurt neuer Start
Matthias Uferer [Thu, 20 Feb 2014 12:22:07 +0000 (12:22 +0000)]
Freifunk Erfurt neuer Start

10 years agotrunk: Merge fix from luci-0.11
Jo-Philipp Wich [Thu, 13 Feb 2014 12:06:47 +0000 (12:06 +0000)]
trunk: Merge fix from luci-0.11

10 years agohttpclient: fix parsing of IPv6 URLs (#662)
Jo-Philipp Wich [Wed, 5 Feb 2014 13:44:07 +0000 (13:44 +0000)]
httpclient: fix parsing of IPv6 URLs (#662)

10 years agobuild: fix clean targets in Makefiles (#667)
Jo-Philipp Wich [Wed, 5 Feb 2014 13:35:34 +0000 (13:35 +0000)]
build: fix clean targets in Makefiles (#667)

10 years agoRemove stale IPv6 menu entry
Steven Barth [Sat, 18 Jan 2014 19:55:51 +0000 (19:55 +0000)]
Remove stale IPv6 menu entry

10 years agocommunity-profiles: remove jena
Manuel Munz [Sat, 18 Jan 2014 10:44:20 +0000 (10:44 +0000)]
community-profiles: remove jena

10 years agoAdapt IPv6 interface to new architecture
Steven Barth [Fri, 17 Jan 2014 15:46:56 +0000 (15:46 +0000)]
Adapt IPv6 interface to new architecture

10 years agoprofile for kyritz (near gadow)
Matthias Uferer [Fri, 3 Jan 2014 14:15:14 +0000 (14:15 +0000)]
profile for kyritz (near gadow)

10 years agotypo for freifunk-gadow
Matthias Uferer [Fri, 3 Jan 2014 13:27:45 +0000 (13:27 +0000)]
typo for freifunk-gadow

10 years agoapplications/olsr: Validate input for lqmult, #654
Manuel Munz [Sun, 29 Dec 2013 11:55:18 +0000 (11:55 +0000)]
applications/olsr: Validate input for lqmult, #654

10 years agofreifunk altmark new config
Matthias Uferer [Fri, 13 Dec 2013 14:29:22 +0000 (14:29 +0000)]
freifunk altmark new config

10 years agowifi netmask for projekt l59 is 8
Matthias Uferer [Fri, 13 Dec 2013 13:44:25 +0000 (13:44 +0000)]
wifi netmask for projekt l59 is 8

10 years agodisable dhcp at wifi-adhoc for leipzig, l59 and gadow
Matthias Uferer [Fri, 13 Dec 2013 13:40:46 +0000 (13:40 +0000)]
disable dhcp at wifi-adhoc for leipzig, l59 and gadow

10 years agomodules/admin-full: replace another instance of legacy wifi calls with network reloads
Jo-Philipp Wich [Sun, 8 Dec 2013 20:30:51 +0000 (20:30 +0000)]
modules/admin-full: replace another instance of legacy wifi calls with network reloads

10 years agomodules/admin-full: use ubus call network reload after enabling, disabling or deletin...
Jo-Philipp Wich [Sun, 8 Dec 2013 16:46:55 +0000 (16:46 +0000)]
modules/admin-full: use ubus call network reload after enabling, disabling or deleting wifi networks

10 years agoapplications/luci-statistics: fix xhtml entity error introduced with r9926
Jo-Philipp Wich [Tue, 3 Dec 2013 23:58:15 +0000 (23:58 +0000)]
applications/luci-statistics: fix xhtml entity error introduced with r9926

10 years agothemes/bootstrap: fix css issue with input fileds within zonebadges (#556)
Jo-Philipp Wich [Tue, 3 Dec 2013 15:51:54 +0000 (15:51 +0000)]
themes/bootstrap: fix css issue with input fileds within zonebadges (#556)

10 years agolibs/core: further network model compatibility fixes
Jo-Philipp Wich [Tue, 3 Dec 2013 15:23:09 +0000 (15:23 +0000)]
libs/core: further network model compatibility fixes

10 years agolibs/core: make luci.model.network compatible with new wireless netifd integration
Jo-Philipp Wich [Tue, 3 Dec 2013 15:04:34 +0000 (15:04 +0000)]
libs/core: make luci.model.network compatible with new wireless netifd integration

10 years agolibs/json: add proper support for decoding unicode escapes
Jo-Philipp Wich [Tue, 3 Dec 2013 15:04:32 +0000 (15:04 +0000)]
libs/json: add proper support for decoding unicode escapes

11 years agoapplications/luci-splash: fix another crash in luci-splash when there were empty...
Manuel Munz [Mon, 11 Nov 2013 20:12:40 +0000 (20:12 +0000)]
applications/luci-splash: fix another crash in luci-splash when there were empty whitelist/blacklist sections

11 years agoapplications/luci-splash: Fix another condidtion which led to a deadlock
Manuel Munz [Sun, 3 Nov 2013 14:01:17 +0000 (14:01 +0000)]
applications/luci-splash: Fix another condidtion which led to a deadlock

11 years agoapplications/luci-splash: Only add leases to the stats section if they are still...
Manuel Munz [Sun, 27 Oct 2013 09:59:19 +0000 (09:59 +0000)]
applications/luci-splash: Only add leases to the stats section if they are still online (i.e. mac known in arp table). Thanks michiwend.

11 years agoapplications/luci-splash: remove unneeded tc exec
Manuel Munz [Sun, 20 Oct 2013 11:59:53 +0000 (11:59 +0000)]
applications/luci-splash: remove unneeded tc exec

11 years agocontrib/meshwizard: Do not enable DHCP on adhoc by default when VAPs are used.
Manuel Munz [Sat, 19 Oct 2013 14:23:28 +0000 (14:23 +0000)]
contrib/meshwizard: Do not enable DHCP on adhoc by default when VAPs are used.

11 years agocontrib/community-profiles/augsburg: Enable DHCP on adhoc when VAP is used, default...
Manuel Munz [Sat, 19 Oct 2013 14:14:49 +0000 (14:14 +0000)]
contrib/community-profiles/augsburg: Enable DHCP on adhoc when VAP is used, default will become to not start a DHCP server in this case then soon.

11 years agowifi changes for gadow/zootzen
Matthias Uferer [Fri, 18 Oct 2013 11:38:59 +0000 (11:38 +0000)]
wifi changes for gadow/zootzen

11 years agowlan changings for leipzig
Matthias Uferer [Fri, 18 Oct 2013 11:38:17 +0000 (11:38 +0000)]
wlan changings for leipzig

11 years agoapplications/luci-statistics: fix img url
Patrick Grimm [Fri, 18 Oct 2013 10:42:15 +0000 (10:42 +0000)]
applications/luci-statistics: fix img url

11 years agoapplications/luci-splash: improve traffic limiting per client for ipv6
Manuel Munz [Thu, 17 Oct 2013 23:11:17 +0000 (23:11 +0000)]
applications/luci-splash: improve traffic limiting per client for ipv6

11 years agoapplications/luci-splash: Make luci-splash more silent in normal mode in case of...
Manuel Munz [Thu, 17 Oct 2013 00:22:55 +0000 (00:22 +0000)]
applications/luci-splash: Make luci-splash more silent in normal mode in case of tc/iptables errors

11 years agoapplications/luci-splash: Do not allow to lease whitelisted clients
Manuel Munz [Thu, 17 Oct 2013 00:01:06 +0000 (00:01 +0000)]
applications/luci-splash: Do not allow to lease whitelisted clients

11 years agoapplications/luci-splash: Fix a crash when removing whitelisted clients which could...
Manuel Munz [Wed, 16 Oct 2013 23:51:43 +0000 (23:51 +0000)]
applications/luci-splash: Fix a crash when removing whitelisted clients which could caused deadlocks

11 years agoapplications/luci-splash: Add a filter for arguments, only allow valid mac and ip...
Manuel Munz [Wed, 16 Oct 2013 19:48:23 +0000 (19:48 +0000)]
applications/luci-splash: Add a filter for arguments, only allow valid mac and ip addresses

11 years agopackage/freifunk-common: neigh.sh: fix for missing .. as well as aligned headers
Patrick Grimm [Mon, 14 Oct 2013 17:29:40 +0000 (17:29 +0000)]
package/freifunk-common: neigh.sh: fix for missing .. as well as aligned headers

11 years agoapplications/luci-olsr-services add olsr ipv6 services
Patrick Grimm [Mon, 14 Oct 2013 10:27:21 +0000 (10:27 +0000)]
applications/luci-olsr-services add olsr ipv6 services

11 years agopackage/freifunk-common: neigh.sh use olsr-jsoninfo
Patrick Grimm [Mon, 14 Oct 2013 10:27:09 +0000 (10:27 +0000)]
package/freifunk-common: neigh.sh use olsr-jsoninfo

11 years agoapplications/luci-splash: Fix two problems with whitelisting clients
Manuel Munz [Sun, 13 Oct 2013 22:40:09 +0000 (22:40 +0000)]
applications/luci-splash: Fix two problems with whitelisting clients

11 years agomodules/admin-full: add DSL status to index page (#620)
Jo-Philipp Wich [Wed, 9 Oct 2013 11:17:55 +0000 (11:17 +0000)]
modules/admin-full: add DSL status to index page (#620)

11 years agocontrib/freifunk-gwcheck: Only run the check when olsrd_dyngw_plain plugin is enabled...
Manuel Munz [Sat, 5 Oct 2013 18:15:35 +0000 (18:15 +0000)]
contrib/freifunk-gwcheck: Only run the check when olsrd_dyngw_plain plugin is enabled and also uses the main routing table

11 years agocontrib/freifunk-policyrouting: Only disable olsrd_dyngw_plain plugin if it uses...
Manuel Munz [Sat, 5 Oct 2013 18:13:23 +0000 (18:13 +0000)]
contrib/freifunk-policyrouting: Only disable olsrd_dyngw_plain plugin if it uses the main routing table

11 years agoapplications/luci-splash: Update stats when a lease is added or removed
Manuel Munz [Tue, 1 Oct 2013 20:22:08 +0000 (20:22 +0000)]
applications/luci-splash: Update stats when a lease is added or removed

11 years agocontrib/community-profiles: Add Hooge
Manuel Munz [Mon, 30 Sep 2013 20:02:35 +0000 (20:02 +0000)]
contrib/community-profiles: Add Hooge

11 years agoapplications/luci-splash: Write summary stats (counter of leased, white-/blacklisted...
Manuel Munz [Sat, 28 Sep 2013 12:40:29 +0000 (12:40 +0000)]
applications/luci-splash: Write summary stats (counter of leased, white-/blacklisted) into the leases state file

11 years agoapplications/luci-splash: Show black-/whitelisted clients in luci-splash list output...
Manuel Munz [Sat, 28 Sep 2013 12:06:13 +0000 (12:06 +0000)]
applications/luci-splash: Show black-/whitelisted clients in luci-splash list output again

11 years agocontrib/community-profiles: Fix whitespaces in halle profile
Manuel Munz [Tue, 24 Sep 2013 09:14:18 +0000 (09:14 +0000)]
contrib/community-profiles: Fix whitespaces in halle profile

11 years agocontrib/meshwizard: Add services file in olsr nameservice configuration
Manuel Munz [Fri, 20 Sep 2013 18:37:18 +0000 (18:37 +0000)]
contrib/meshwizard: Add services file in olsr nameservice configuration

11 years agothemes/freifunk-generic: Fix invalid html
Manuel Munz [Thu, 19 Sep 2013 17:19:17 +0000 (17:19 +0000)]
themes/freifunk-generic: Fix invalid html

11 years agoappllications/olsr: Fix invalid html, #607
Manuel Munz [Thu, 19 Sep 2013 17:18:28 +0000 (17:18 +0000)]
appllications/olsr: Fix invalid html, #607

11 years agoapplications/olsr: Fix invalid json output
Manuel Munz [Thu, 19 Sep 2013 16:49:28 +0000 (16:49 +0000)]
applications/olsr: Fix invalid json output

11 years agocontrib/community-profiles: Fix Halle profile, #597
Manuel Munz [Thu, 19 Sep 2013 16:34:09 +0000 (16:34 +0000)]
contrib/community-profiles: Fix Halle profile, #597

11 years agoapplications/luci-ddns: Add more datatype checks and defaults
Manuel Munz [Mon, 16 Sep 2013 19:51:25 +0000 (19:51 +0000)]
applications/luci-ddns: Add more datatype checks and defaults

11 years agokorrigiertes widget fuer leipzig (iframe instead of rss)
Matthias Uferer [Thu, 5 Sep 2013 13:39:25 +0000 (13:39 +0000)]
korrigiertes widget fuer leipzig (iframe instead of rss)

11 years agocontrib/community_profiles: Use the correct BSSID for channel 10 in Berlin
Manuel Munz [Wed, 4 Sep 2013 08:09:20 +0000 (08:09 +0000)]
contrib/community_profiles: Use the correct BSSID for channel 10 in Berlin

11 years agocore/sysauth: Redirect to https on login page if possible, #317
Manuel Munz [Tue, 3 Sep 2013 17:40:55 +0000 (17:40 +0000)]
core/sysauth: Redirect to https on login page if possible, #317

11 years agoapplications/firewall: fix display of enabled/disabled rules, #594
Manuel Munz [Mon, 2 Sep 2013 09:48:01 +0000 (09:48 +0000)]
applications/firewall: fix display of enabled/disabled rules, #594

11 years agosystem/applyreboot: Use the correct protocol, #603
Manuel Munz [Sun, 1 Sep 2013 16:39:55 +0000 (16:39 +0000)]
system/applyreboot: Use the correct protocol, #603

11 years agoCommit from LuCI Translation Portal by user soma.: 127 of 127 messages translated...
Translation System [Sun, 1 Sep 2013 15:56:45 +0000 (15:56 +0000)]
Commit from LuCI Translation Portal by user soma.: 127 of 127 messages translated (0 fuzzy).

11 years agocontrib/meshwizard: Use Freifunk instead of FF-AP as prefix for the VAP interface
Manuel Munz [Mon, 19 Aug 2013 16:15:28 +0000 (16:15 +0000)]
contrib/meshwizard: Use Freifunk instead of FF-AP as prefix for the VAP interface

11 years agoapplications/luci-splash: Add known leases when restarting splash
Manuel Munz [Mon, 19 Aug 2013 12:17:58 +0000 (12:17 +0000)]
applications/luci-splash: Add known leases when restarting splash

11 years agoCommit from LuCI Translation Portal by user soma.: 81 of 81 messages translated ...
Translation System [Mon, 19 Aug 2013 11:53:17 +0000 (11:53 +0000)]
Commit from LuCI Translation Portal by user soma.: 81 of 81 messages translated (0 fuzzy).

11 years agoapplications/luci-splash: Update translations
Manuel Munz [Mon, 19 Aug 2013 11:50:38 +0000 (11:50 +0000)]
applications/luci-splash: Update translations

11 years agoCommit from LuCI Translation Portal by user soma.: 80 of 80 messages translated ...
Translation System [Mon, 19 Aug 2013 11:48:33 +0000 (11:48 +0000)]
Commit from LuCI Translation Portal by user soma.: 80 of 80 messages translated (0 fuzzy).

11 years agoapplications/luci-splash: Add another missing translation
Manuel Munz [Mon, 19 Aug 2013 11:48:07 +0000 (11:48 +0000)]
applications/luci-splash: Add another missing translation

11 years agoapplications/luci-splash: Fix a translation problem with 2 strings
Manuel Munz [Mon, 19 Aug 2013 11:33:14 +0000 (11:33 +0000)]
applications/luci-splash: Fix a translation problem with 2 strings

11 years agoCommit from LuCI Translation Portal by user soma.: 80 of 80 messages translated ...
Translation System [Sun, 18 Aug 2013 20:46:17 +0000 (20:46 +0000)]
Commit from LuCI Translation Portal by user soma.: 80 of 80 messages translated (0 fuzzy).

11 years agopo: update luci-splash translations
Manuel Munz [Sun, 18 Aug 2013 20:42:49 +0000 (20:42 +0000)]
po: update luci-splash translations

11 years agoapplications/luci-splash: Per default redirect to the page the user requested after...
Manuel Munz [Sun, 18 Aug 2013 20:41:30 +0000 (20:41 +0000)]
applications/luci-splash: Per default redirect to the page the user requested after he accepted the splash. This can be overwritten with redirect_url in the general section in luci_splash config, #595

11 years agoapplications/luci-splash: Always allow clients to connect to the community homepage...
Manuel Munz [Sun, 18 Aug 2013 20:37:35 +0000 (20:37 +0000)]
applications/luci-splash: Always allow clients to connect to the community homepage, make description of allowed hosts/subnets more clear, #595

11 years agocontrib/community-profiles: Allow 50KB/s Downloadrate per default in luci-splash
Manuel Munz [Sun, 18 Aug 2013 11:30:00 +0000 (11:30 +0000)]
contrib/community-profiles: Allow 50KB/s Downloadrate per default in luci-splash

11 years agoapplications/luci-splash: Set http_keepalive to zero. This fixes a problem where...
Manuel Munz [Sat, 17 Aug 2013 20:12:19 +0000 (20:12 +0000)]
applications/luci-splash: Set http_keepalive to zero. This fixes a problem where the user was not properly redirected after accepting the splash in some cases and when an uhttpd was used that supports http keepalive

11 years agoapplications/luci-splash: Fix clients upload and download limiting
Manuel Munz [Sat, 17 Aug 2013 19:42:45 +0000 (19:42 +0000)]
applications/luci-splash: Fix clients upload and download limiting

11 years agofreifunk-gwcheck: make it more readeable and make compat with smaler ip version witho...
Patrick Grimm [Sat, 17 Aug 2013 18:33:07 +0000 (18:33 +0000)]
freifunk-gwcheck: make it more readeable and make compat with smaler ip version without short forms

11 years agoluci-olsr: fix ipv6 nil in device var
Patrick Grimm [Sun, 11 Aug 2013 21:07:25 +0000 (21:07 +0000)]
luci-olsr: fix ipv6 nil in device var

11 years agoapplications/luci-splash: do not delete the nodes luci_splash_mark_in rule when its...
Manuel Munz [Sun, 11 Aug 2013 16:45:39 +0000 (16:45 +0000)]
applications/luci-splash: do not delete the nodes luci_splash_mark_in rule when its ip is unknown while syncing, instead use iptables comments there and delete that rule when the lease has been removed.

11 years agoapplications/luci-splash: Use a seperate config file for leases, #590
Manuel Munz [Sun, 11 Aug 2013 16:42:53 +0000 (16:42 +0000)]
applications/luci-splash: Use a seperate config file for leases, #590