Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x ...

Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css

2011-02-28 15:39:43 -08:00

..

js

first pass at Mapstraction plugin

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

locale

Localisation updates from http://translatewiki.net.

2011-02-03 01:31:31 +01:00

OpenLayers

Add stripped and minified local copy of OpenLayers 2.10, about 1/5 the size of the full version.

2010-12-08 14:28:55 -08: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

Makefile

Create a bundled & minified JS file for Mapstraction's common case (using OpenLayers); this'll avoid waiting on additional script loads for mxn.core.js and mxn.openlayers.core.js, and removes the need to load usermap.js separately as well.

2010-12-08 14:52:26 -08: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 1.0.x

2011-02-28 15:39:43 -08:00

usermap-mxn-openlayers.min.js

Create a bundled & minified JS file for Mapstraction's common case (using OpenLayers); this'll avoid waiting on additional script loads for mxn.core.js and mxn.openlayers.core.js, and removes the need to load usermap.js separately as well.

2010-12-08 14:52:26 -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