Brion Vibber 9df856e667 Merge branch '0.9.x' into merge ...

Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php

2010-12-07 10:50:05 -08:00

..

js

first pass at Mapstraction plugin

2009-11-17 23:23:13 -05:00

locale

Localisation updates from http://translatewiki.net.

2010-11-30 21:35:25 +01:00

allmap.php

Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.

2010-11-03 13:10:42 -07:00

map.php

Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.

2010-11-29 14:15:25 -08:00

MapstractionPlugin.php

Merge branch '0.9.x' into merge

2010-12-07 10:50:05 -08:00

usermap.js

Mapstraction plugin fix: set icon dimensions (24x24 px); Google Maps provider otherwise defaults to stretching them to a funny shape instead of showing square avatars.

2010-06-01 18:41:17 +00:00

usermap.php

Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.

2010-11-03 13:10:42 -07:00