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
..
accesstoken.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
all.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
allrss.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
apiaccountratelimitstatus.php	Merge branch '0.9.x' into finish-account-api	2009-11-10 15:25:43 -08:00
apiaccountupdatedeliverydevice.php	Added some notes in the comments	2009-11-10 15:23:33 -08:00
apiaccountupdateprofile.php	Make /api/account/update_profile_background_image.format work even	2009-11-09 23:56:02 -08:00
apiaccountupdateprofilebackgroundimage.php	Make /api/account/update_profile_background_image.format work even	2009-11-09 23:56:02 -08:00
apiaccountupdateprofilecolors.php	Make /api/account/update_profile_background_image.format work even	2009-11-09 23:56:02 -08:00
apiaccountupdateprofileimage.php	Make /api/account/update_profile_background_image.format work even	2009-11-09 23:56:02 -08:00
apiaccountverifycredentials.php	Added in credits.	2009-10-12 16:36:00 -07:00
apiblockcreate.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apiblockdestroy.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apidirectmessage.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apidirectmessagenew.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apifavoritecreate.php	Fix syntax errors	2009-10-13 14:48:19 -07:00
apifavoritedestroy.php	Added in credits.	2009-10-12 16:36:00 -07:00
apifriendshipscreate.php	Added in credits.	2009-10-12 16:36:00 -07:00
apifriendshipsdestroy.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
apifriendshipsexists.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apifriendshipsshow.php	Added in credits.	2009-10-12 16:36:00 -07:00
apigroupcreate.php	Consolidate group creation into static function in User_group	2009-11-18 15:54:24 -05:00
apigroupismember.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apigroupjoin.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apigroupleave.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apigrouplist.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apigrouplistall.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apigroupmembership.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apigroupshow.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apihelptest.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apistatusesdestroy.php	Added in credits.	2009-10-12 16:36:00 -07:00
apistatusesshow.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apistatusesupdate.php	Notice: Undefined variable: source in actions/apistatusesupdate.php on line 88	2009-11-18 09:29:55 -08:00
apistatusnetconfig.php	Added in credits.	2009-10-12 16:36:00 -07:00
apistatusnetversion.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apisubscriptions.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apitimelinefavorites.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apitimelinefriends.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apitimelinegroup.php	Consistant error for groups that dont exist in API	2009-11-16 15:00:36 -05:00
apitimelinementions.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apitimelinepublic.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apitimelinetag.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
apitimelineuser.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
apiuserfollowers.php	Added in credits.	2009-10-12 16:36:00 -07:00
apiuserfriends.php	Added in credits.	2009-10-12 16:36:00 -07:00
apiusershow.php	Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression)	2009-11-04 22:03:41 -08:00
attachment_ajax.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
attachment_thumbnail.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
attachment.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
avatarbynickname.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
avatarsettings.php	Better workaround for PHP returning empty $_POST and $_FILES when	2009-11-06 17:21:08 -08:00
block.php	make block action use ProfileFormAction superclass	2009-11-16 16:14:49 +01:00
blockedfromgroup.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
bookmarklet.php	Don't include site in gettext	2009-10-29 13:24:06 +01:00
confirmaddress.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
conversation.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
deletenotice.php	fix constant for deleteothersnotice	2009-11-07 22:26:03 -05:00
deleteuser.php	DeleteUserAction	2009-11-16 17:04:40 +01:00
designadminpanel.php	Moved most path and server settings to a new paths admin panel	2009-11-19 11:55:07 -08:00
disfavor.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
doc.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
editgroup.php	remove inboxes option	2009-10-13 17:38:27 -04:00
emailsettings.php	Updated form markup for email settings	2009-11-19 11:27:49 +00:00
favor.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
favorited.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
favoritesrss.php	Output If-Modified-Since header for all RSS 1.0 feeds (again)	2009-09-24 15:10:55 -07:00
featured.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
file.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
finishremotesubscribe.php	Fix fatal error on OMB subscription for first-timers	2009-11-25 12:11:41 -08:00
foaf.php	tobyink's location RDF patch	2009-11-19 12:00:25 -05:00
foafgroup.php	FOAF for Groups.	2009-09-30 13:59:18 -04:00
getfile.php	Revert "Revert "Actually commit the file this time""	2009-10-31 14:43:13 -04:00
groupblock.php	Merge remote branch 'statusnet/0.9.x' into 0.9.x	2009-11-10 06:44:53 -08:00
groupbyid.php	remove inboxes option	2009-10-13 17:38:27 -04:00
groupdesignsettings.php	remove inboxes option	2009-10-13 17:38:27 -04:00
grouplogo.php	remove inboxes option	2009-10-13 17:38:27 -04:00
groupmembers.php	add more events to profile list	2009-10-15 06:01:26 -04:00
grouprss.php	remove inboxes option	2009-10-13 17:38:27 -04:00
groups.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
groupsearch.php	Merge remote branch 'statusnet/0.8.x' into 0.9.x	2009-10-11 13:39:10 -04:00
groupunblock.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
imsettings.php	Revert "More specifics on 'address'"	2009-11-08 23:26:16 +01:00
inbox.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
invite.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
joingroup.php	remove inboxes option	2009-10-13 17:38:27 -04:00
leavegroup.php	remove inboxes option	2009-10-13 17:38:27 -04:00
login.php	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
logout.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
makeadmin.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
microsummary.php	Harmonise UI message "No such user."	2009-11-08 23:10:44 +01:00
newgroup.php	Consolidate group creation into static function in User_group	2009-11-18 15:54:24 -05:00
newmessage.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
newnotice.php	Add location form elements to the noticeform, and save their values on submission	2009-11-19 15:17:57 -05:00
noticesearch.php	Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x	2009-11-11 19:58:43 +01:00
noticesearchrss.php	Fix bug 1997: notice search rss utter failure	2009-11-20 14:54:59 -08:00
nudge.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
oembed.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
opensearch.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
othersettings.php	initialize these variables before use to prevent warnings	2009-11-11 17:09:00 -05:00
outbox.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
passwordsettings.php	Capitalise "same as password above"	2009-11-21 16:53:25 +01:00
pathsadminpanel.php	Removed unnecessary className	2009-11-25 12:23:58 +00:00
peoplesearch.php	Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.	2009-11-10 13:44:40 -08:00
peopletag.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
postnotice.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
profilesettings.php	Check profile->update() result against false exactly; we may legitimately get 0 back if no rows were changed. DB objects normally would return true, but the comparisons aren't 100% reliable when we've got numbers which could be ints or strings or floats.	2009-11-18 17:36:55 -08:00
public.php	Fix feed links which were broken when the API was restructured	2009-10-29 19:09:42 -04:00
publicrss.php	Output If-Modified-Since header for all RSS 1.0 feeds (again)	2009-09-24 15:10:55 -07:00
publictagcloud.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
publicxrds.php	Moved the public XRDS from the OpenID plugin to core	2009-10-29 16:27:22 -04:00
recoverpassword.php	Several updates to UI messages	2009-11-08 22:45:18 +01:00
register.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
remotesubscribe.php	Fix typo in UI string	2009-11-28 20:52:46 +01:00
replies.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
repliesrss.php	Output If-Modified-Since header for all RSS 1.0 feeds (again)	2009-09-24 15:10:55 -07:00
requesttoken.php	Response for request token doesn't contain omb_version	2009-09-13 00:01:23 -04:00
sandbox.php	add sandbox and silence actions	2009-11-16 16:08:06 +01:00
showfavorites.php	Fix feed links which were broken when the API was restructured	2009-10-29 19:09:42 -04:00
showgroup.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
showmessage.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
shownotice.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
showstream.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
silence.php	add sandbox and silence actions	2009-11-16 16:08:06 +01:00
siteadminpanel.php	UI text fixes and tweaks.	2009-11-20 16:03:27 +01:00
smssettings.php	Revert "More precise field label"	2009-11-08 23:35:12 +01:00
subedit.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscribe.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscribers.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
subscriptions.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
sup.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
tag.php	Fix feed links which were broken when the API was restructured	2009-10-29 19:09:42 -04:00
tagother.php	Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"	2009-11-08 23:22:13 +01:00
tagrss.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
twitapisearchatom.php	Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.	2009-11-10 13:44:40 -08:00
twitapisearchjson.php	Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.	2009-11-10 13:44:40 -08:00
twitapitrends.php	Revert "Remove more contractions"	2009-11-09 20:01:46 +01:00
unblock.php	make block actions use profileformaction superclass	2009-11-16 14:40:04 +01:00
unsandbox.php	add sandbox and silence actions	2009-11-16 16:08:06 +01:00
unsilence.php	add sandbox and silence actions	2009-11-16 16:08:06 +01:00
unsubscribe.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
updateprofile.php	Add missing parenthesis.	2009-09-19 21:40:48 +02:00
useradminpanel.php	Left a form_data class of a <ul> in the user admin panel	2009-11-19 15:24:34 -08:00
userauthorization.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
userbyid.php	Bug 1655/bug 1905: fix for Internet Explorer receiving FOAF output when clicking user links.	2009-11-16 17:25:38 -08:00
userdesignsettings.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
usergroups.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
userrss.php	Left a couple debugging statements in (removed)	2009-09-24 15:28:25 -07:00
xrds.php	A further change to the XRDS is required if 0.9.x is to be able to remote sub to a 0.8.x account, with the OpenID plugin enabled.	2009-11-12 20:57:09 +00:00