Brion Vibber 
							
						 
					 
					
						
						
							
						
						d8a3a88ec8 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	classes/Memcached_DataObject.php 
						
						
					 
					
						2010-12-17 17:13:21 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						fb65d5901d 
					 
					
						
						
							
							Update sorting for conversation views: adds notice_conversation_created_id_idx index on notice, replacing more limited notice_conversation_idx  
						
						
						
						
					 
					
						2010-12-17 16:08:37 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						71151b3bc0 
					 
					
						
						
							
							Update sorting for User::repeatedByMe() -- currently unused. Likely not ideally indexed yet.  
						
						
						
						
					 
					
						2010-12-17 15:28:55 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b80151275a 
					 
					
						
						
							
							Update sorting on api/statuses/retweets_of_me; was and remains poorly indexed, but will use updated sorting method.  
						
						
						
						
					 
					
						2010-12-17 15:25:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1b90ed564a 
					 
					
						
						
							
							Update sorting on api/statuses/retweets: adds notice_repeat_of_created_id_idx index to replace notice_repeatof_idx  
						
						
						
						
					 
					
						2010-12-17 15:13:09 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						04aa8bd70f 
					 
					
						
						
							
							work around borkage in statuses/repeats -- tries to check an offset var that's not there. use the limit var which is there instead  
						
						
						
						
					 
					
						2010-12-17 15:05:45 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						66474586af 
					 
					
						
						
							
							Update sorting for group inbox timelines; adds group_inbox_group_id_created_notice_id_idx index to group_inbox table  
						
						
						
						
					 
					
						2010-12-17 14:51:37 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3ddfa4de93 
					 
					
						
						
							
							Update sorting on reply/mentions timeline: added reply_profile_id_modified_notice_id_idx index to reply table  
						
						
						
						
					 
					
						2010-12-17 14:43:45 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						00a5a5342a 
					 
					
						
						
							
							Update sorting for tag-filtered public timeline: needs notice_tag_tag_created_notice_id_idx index added to notice_tag  
						
						
						
						
					 
					
						2010-12-17 14:37:46 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						33daace6cb 
					 
					
						
						
							
							add fixme for since_id/max_id on fave streaming (?)  
						
						
						
						
					 
					
						2010-12-17 14:32:06 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4adf551f9f 
					 
					
						
						
							
							Update sorting for user tagged timelines (indexing was bad before and remains bad -- we need some DB changes to make this one nice)  
						
						
						
						
					 
					
						2010-12-17 13:45:40 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4cd3a0756b 
					 
					
						
						
							
							Update notice sorting for profile streams; extract more common code to Notice::addSinceId() and Notice::addMaxId()  
						
						
						
						
					 
					
						2010-12-17 13:20:38 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9e8bbff8ac 
					 
					
						
						
							
							Notice::whereSinceId() and Notice::whereMaxId() encapsulate logic for building where clauses for since_id/max_id parameters. Can override the field names from 'id' and 'created'.  
						
						
						
						
					 
					
						2010-12-17 13:03:18 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5de86f0ccc 
					 
					
						
						
							
							Initial switch of public timeline stream to use timestamps for internal sorting  
						
						
						
						
					 
					
						2010-12-17 12:38:38 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						7c84c35587 
					 
					
						
						
							
							Notice::getAsTimestamp() static function to look up the timestamp for a given notice, even if it's been deleted. To be used for converting since_id/max_id processing to use timestamp sorting internally.  
						
						
						
						
					 
					
						2010-12-17 12:09:02 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0535a3d15c 
					 
					
						
						
							
							Event hook for SQLProfile  
						
						
						
						
					 
					
						2010-12-17 11:46:11 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						bf20258f4b 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-12-15 11:59:31 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						027c73a4a1 
					 
					
						
						
							
							Merge branch 'activityatompub' into 0.9.x  
						
						
						
						
					 
					
						2010-12-13 14:35:42 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a93f0fea61 
					 
					
						
						
							
							membership stream method and return membership from join() in Group_member class  
						
						
						
						
					 
					
						2010-12-13 13:50:39 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5bbd77b761 
					 
					
						
						
							
							group_member includes self link, edit link  
						
						
						
						
					 
					
						2010-12-13 12:40:44 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						bb55784e90 
					 
					
						
						
							
							Move getConnectedApps() from Profile to User, where it belongs  
						
						
						
						
					 
					
						2010-12-12 17:37:42 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7c37aa802b 
					 
					
						
						
							
							a stream function for Fave class  
						
						
						
						
					 
					
						2010-12-12 12:22:04 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8dea5144a9 
					 
					
						
						
							
							Merge branch '0.9.x' into activityatompub  
						
						
						
						
					 
					
						2010-12-11 11:03:02 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						af4ee1d490 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-12-11 11:01:05 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d0ea138888 
					 
					
						
						
							
							cache stream of subscriptions  
						
						
						
						
					 
					
						2010-12-11 11:00:04 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7285bbc93b 
					 
					
						
						
							
							Subscription stream functions  
						
						... 
						
						
						
						Made two new functions, Subscription::bySubscriber() and
Subscription::bySubscribed(), to get streams of Subscription objects.
Converted Profile::getSubscribers() and Profile::getSubscriptions() to
use these functions. 
						
						
					 
					
						2010-12-11 10:24:46 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						37c447be46 
					 
					
						
						
							
							Show a single favorite for AtomPub  
						
						
						
						
					 
					
						2010-12-10 18:50:50 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ab7a06542c 
					 
					
						
						
							
							Workaround for locally-handled sessions breaking on PHP 5.3 with APC enabled.  
						
						... 
						
						
						
						Big thanks to the folks at http://pecl.php.net/bugs/bug.php?id=16745  for the secret juju!
Classes were being torn down before session save handlers got called at the end of the request, which exploded with complaints about being unable to find various classes.
Registering a shutdown function lets us explicitly close out the session before everything gets torn down. 
						
						
					 
					
						2010-12-10 22:08:36 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						11a0bde459 
					 
					
						
						
							
							AtomPub for single subscription  
						
						
						
						
					 
					
						2010-12-09 13:11:02 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						94ff04e190 
					 
					
						
						
							
							Don't cache user-specific information for Notice atom entries  
						
						
						
						
					 
					
						2010-12-08 13:59:12 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b8b5b87c4c 
					 
					
						
						
							
							Don't cache user-specific information for Notice atom entries  
						
						
						
						
					 
					
						2010-12-08 07:25:55 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9df856e667 
					 
					
						
						
							
							Merge branch '0.9.x' into merge  
						
						... 
						
						
						
						Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 
					
						2010-12-07 10:50:05 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1fb506c27d 
					 
					
						
						
							
							use codeKey() in activity caching  
						
						
						
						
					 
					
						2010-12-06 17:28:22 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8564fc51c5 
					 
					
						
						
							
							cache generated activity info  
						
						
						
						
					 
					
						2010-12-06 16:38:02 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2617c40e04 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	classes/User.php 
						
						
					 
					
						2010-12-06 12:44:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						76f3dc32e0 
					 
					
						
						
							
							Added User::singleUserNickname() as (temporary?) fallback for single-user lookup as a workaround for site setup of 1user sites. We found that an external tool attempting to spin up StatusNet and then register the user would fail because StatusNet's router setup dies on being unable to find its single-user account, since the nickname is needed in setting up routing entries. This tweak will let it survive, using the configured setting as a fallback if it can't actually find the user account.  
						
						
						
						
					 
					
						2010-12-06 12:39:09 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b28266b3d6 
					 
					
						
						
							
							Convert Notice::asAtomEntry() to use Notice::asActivity() and Activity::asString()  
						
						... 
						
						
						
						We had two ways to generate an activity entry from a notice; one through
Notice::asAtomEntry() and one through Notice::asActivity() and
Activity::asString(). The code paths had already diverged somewhat. I
took the conditions that were in Notice::asAtomEntry() and made sure
they were replicated in the other two functions. Then, I rewrote
Notice::asAtomEntry() to use the other two functions instead.
This change passes the ActivityGenerationTests unit tests, but there
may be some other stuff that's not getting covered. 
						
						
					 
					
						2010-12-05 16:15:05 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						043f0ad152 
					 
					
						
						
							
							URL shortening fix for direct messages: if we're going to shorten the text, shorten the rendered text too.  
						
						
						
						
					 
					
						2010-12-02 13:59:51 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						aa96c3c1d9 
					 
					
						
						
							
							Fix for tickets  #2917 ,  #2262 : user URL shortening options not being applied in non-web channels  
						
						... 
						
						
						
						common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919 : there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance. 
						
						
					 
					
						2010-12-02 13:41:56 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6e249b4ab5 
					 
					
						
						
							
							doc comments on User::allowed_nickname  
						
						
						
						
					 
					
						2010-11-29 11:57:27 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						826a695077 
					 
					
						
						
							
							Ticket  #2797 : replace addslashes() with explicit escape calls on the DB objects  
						
						
						
						
					 
					
						2010-11-19 15:06:26 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						407663fb40 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-11-19 12:44:43 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4b01dd8b2e 
					 
					
						
						
							
							Ticket  #2441 : fix deletion of avatars when a profile is deleted.  
						
						... 
						
						
						
						Code was doing a batch call to $avatar->delete() which fails to properly engage the file deletion code. Calling the existing profile->delete_avatars() function deletes them individually, which makes it all work nice again. 
						
						
					 
					
						2010-11-19 12:40:18 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						197b56778a 
					 
					
						
						
							
							Add $config['attachments']['process_links'] to allow disabling processing of mentioned URL links for attachment info (oEmbed lookups) and dereferencing of redirects that we didn't have shortened ourselves.  
						
						... 
						
						
						
						This option may be useful for intranet sites that don't have direct access to the internet, as they may be unable to successfully fetch those resources. 
						
						
					 
					
						2010-11-17 13:03:59 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e4eb3b3dfd 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-11-15 17:36:48 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0d0e51292d 
					 
					
						
						
							
							some User -> Profile cleanup to help in adapting the profile page action to show stuff for remote users. Subscriptions, groups, roles, etc are all on profiles now so go ahead and use em.  
						
						
						
						
					 
					
						2010-11-15 15:32:57 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5c00848b74 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-11-15 12:38:53 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1c90d09ec8 
					 
					
						
						
							
							Workaround for yfrog.com photo attachments: fudge File_redirection::lookupWhere()'s HTTP handling -- when we get a 204 on a HEAD, double-check it by re-running as a GET. yfrog.com returns a 204 incorrectly for this case.  
						
						
						
						
					 
					
						2010-11-15 11:01:00 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e1ffbfed04 
					 
					
						
						
							
							doc comments on File::processNew  
						
						
						
						
					 
					
						2010-11-15 11:00:42 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8a21b13ee9 
					 
					
						
						
							
							Merge remote branch 'gitorious/0.9.x' into 0.9.x  
						
						
						
						
					 
					
						2010-11-15 11:57:31 -05:00