Zach Copley 9dc888894b Merge branch 'master' into 0.9.x ... * master: (67 commits) Ticket 2038: fix bad bug tracker link Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D Log database errors when saving notice_inbox entries Drop the username from the log id for now; seems to trigger an error loop in some circumstances request id on logs... pid + random id per web request + username + method + url Add OpenID ini info back into statusnet.ini as a stopgap until we can Some changes to the OpenID DataObjects to make them emit the exact same OpenID plugin should set 'user_openid.display' as unique key Remove relationship: user_openid.user_id -> user.id. I don't think this Have OpenID plugin DataObjects emit their own .ini info Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them" Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die. Fix regression in remote subscription; added hasRole() shadow method on Remote_profile. Fix fatal error on OMB subscription for first-timers Remove annoying log msg Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up. Catch uncaught exception Fixed bug where reply-sync bit wasn't getting saved Forgot to render the nav menu when on FB Connect login tab Facebook plugin no longer takes over Login and Connect settings nav menus ... Conflicts: db/08to09_pg.sql db/statusnet_pg.sql locale/pt_BR/LC_MESSAGES/statusnet.mo plugins/Mapstraction/MapstractionPlugin.php		2009-11-30 10:28:58 -08:00
..
08to09_pg.sql	Merge branch 'master' into 0.9.x	2009-11-30 10:28:58 -08:00
08to09.sql	Revert "Added 'login' command that gives you a link that can be used to login to the website"	2009-11-20 02:50:43 -08:00
074to080_pg.sql	Revert "changed file.url column type from varcahr(255) to varchar(2047)"	2009-08-11 14:41:48 +12:00
074to080.sql	Revert "changed file.url column type from varcahr(255) to varchar(2047)"	2009-08-11 14:41:48 +12:00
foreign_services.sql	- Reworked login / logout workflow	2009-05-21 05:43:11 +00:00
innodb.sql	a little sql script to drop full-text index and use innodb for profile and notice	2009-06-23 09:16:41 -07:00
location_namespace.sql	add a couple of location namespaces	2009-10-21 22:43:40 -04:00
notice_source.sql	Add MuSTArD to notice sources	2009-11-18 12:43:52 -08:00
site.sql	updates to Status_network	2009-06-15 08:54:52 -07:00
sms_carrier.sql	Add ChinaMobile as an email to SMS carrier	2009-09-13 00:16:50 -04:00
statusnet_pg.sql	Merge branch 'master' into 0.9.x	2009-11-30 10:28:58 -08:00
statusnet.sql	Revert "Added 'login' command that gives you a link that can be used to login to the website"	2009-11-20 02:50:43 -08:00