gnu-social

History

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

doc-src

fix broken link in OpenID documentation

2010-02-22 07:08:57 -05:00

extlib

OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default.

2010-05-18 13:28:41 -07:00

locale

Localisation updates from http://translatewiki.net .

2011-02-14 19:43:16 +01:00

finishaddopenid.php

Normalize execution guards in OpenID plugin files; avoids annoying fatal errors when .php files get spidered.