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
..
facebookadminpanel.php	FacebookSSO -> FacebookBridge	2010-11-16 02:33:17 +00:00
facebookdeauthorize.php	Facebook: Gracefully handle disconnection	2010-11-17 21:53:56 +00:00
facebookfinishlogin.php	Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms)	2011-01-20 15:55:36 -08:00
facebooklogin.php	FacebookBridge use Plugin::path()	2011-02-03 12:22:39 -05:00
facebooksettings.php	Make new menu the default menu	2011-01-23 12:35:35 -05:00