zottel 
								
							 
						 
						
							
							
								
							
							
	7de5c7ebe1  
						 
						
							
							
								
								
								Changes to make contacts delete all content from the user when a user is deleted.  
							
							 
							
							... 
							
							
							
							NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.
Please check carefully. I tested locally on my server, but not with other
servers. 
							
						 
						
							2012-11-02 21:43:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b45327b856  
						 
						
							
							
								
								
								let's catch d* disabled at a higher level and not waste any resources on it.  
							
							 
							
							
							
						 
						
							2012-04-04 20:45:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							 
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	2aef98f71d  
						 
						
							
							
								
								
								cripple account when expired  
							
							 
							
							
							
						 
						
							2011-09-19 01:17:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5c0e135fe9  
						 
						
							
							
								
								
								diaspora protocol changes  
							
							 
							
							
							
						 
						
							2011-09-14 19:33:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	2aa23843e4  
						 
						
							
							
								
								
								D* queue  
							
							 
							
							
							
						 
						
							2011-08-24 01:21:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	56d64316f4  
						 
						
							
							
								
								
								diaspora photos ?  
							
							 
							
							
							
						 
						
							2011-08-23 18:17:35 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	395faae0b2  
						 
						
							
							
								
								
								double url encode diaspora communications  
							
							 
							
							
							
						 
						
							2011-08-19 02:24:30 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	673e114bbd  
						 
						
							
							
								
								
								D* like and start of relay code  
							
							 
							
							
							
						 
						
							2011-08-16 22:31:14 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	c7197b99f9  
						 
						
							
							
								
								
								refactor the diaspora contact logic  
							
							 
							
							
							
						 
						
							2011-08-15 23:19:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	44918e2736  
						 
						
							
							
								
								
								turn diaspora posts into x-www-form-urlencoded  
							
							 
							
							
							
						 
						
							2011-08-15 17:14:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5d6155a968  
						 
						
							
							
								
								
								fixes share from diaspora  
							
							 
							
							
							
						 
						
							2011-08-15 05:27:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	aefc6209a3  
						 
						
							
							
								
								
								improved diaspora discovery  
							
							 
							
							
							
						 
						
							2011-08-12 03:01:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	72873cd827  
						 
						
							
							
								
								
								diaspora function dispatcher  
							
							 
							
							
							
						 
						
							2011-08-10 05:10:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1bfe1283aa  
						 
						
							
							
								
								
								crypto stuff  
							
							 
							
							
							
						 
						
							2011-08-09 18:55:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	70017ebb8c  
						 
						
							
							
								
								
								diaspora encrypt+decrypt working !!  
							
							 
							
							
							
						 
						
							2011-08-09 02:53:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	48ffa880f0  
						 
						
							
							
								
								
								cleanup  
							
							 
							
							
							
						 
						
							2011-08-07 16:15:54 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5a5a7bfc4c  
						 
						
							
							
								
								
								fallback sha256 openssl_verify code for php releases prior to 5.3  
							
							 
							
							
							
						 
						
							2011-08-05 05:37:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6eec04b09c  
						 
						
							
							
								
								
								updates to Diaspora decrypt/verify from recent testing  
							
							 
							
							
							
						 
						
							2011-08-05 01:34:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	01703f3be6  
						 
						
							
							
								
								
								get_diaspora_key()  
							
							 
							
							
							
						 
						
							2011-07-30 00:51:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a61ec584d6  
						 
						
							
							
								
								
								basic diaspora decryption  
							
							 
							
							
							
						 
						
							2011-07-30 00:31:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1d7d4bf8c6  
						 
						
							
							
								
								
								wrong path for salmon verify  
							
							 
							
							
							
						 
						
							2011-07-20 23:14:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e2f22a1827  
						 
						
							
							
								
								
								diaspora salmon endpoint (decryption not yet provided)  
							
							 
							
							
							
						 
						
							2011-07-19 21:23:47 -07:00