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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						4f9c072d66 
					 
					
						
						
							
							requeue deliveries on 503 errors which have 'retry-after' headers  
						
						
						
						
					 
					
						2011-09-27 19:27:47 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						21c03fb522 
					 
					
						
						
							
							diaspora2bb, salmon fix argument error  
						
						
						
						
					 
					
						2011-08-25 16:37:27 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						8f6ae2b660 
					 
					
						
						
							
							missing salmon key? report it.  
						
						
						
						
					 
					
						2011-08-24 20:40:08 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						1bfe1283aa 
					 
					
						
						
							
							crypto stuff  
						
						
						
						
					 
					
						2011-08-09 18:55:46 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						48ffa880f0 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2011-08-07 16:15:54 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						2abcf76ec1 
					 
					
						
						
							
							salmon protocol changes magicsig draft-experimental, fixes to hostxrd  
						
						
						
						
					 
					
						2011-08-04 22:37:45 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						8b31ff15f5 
					 
					
						
						
							
							breaking up boot file (part of zot refactor)  
						
						
						
						
					 
					
						2011-08-01 16:51:01 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						1d7d4bf8c6 
					 
					
						
						
							
							wrong path for salmon verify  
						
						
						
						
					 
					
						2011-07-20 23:14:43 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						0b221e8945 
					 
					
						
						
							
							bug  #96  move libraries to library - better alignment of like rotator  
						
						
						
						
					 
					
						2011-06-28 21:11:52 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						55112cfdd0 
					 
					
						
						
							
							item source  
						
						
						
						
					 
					
						2011-06-20 19:08:40 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						b2e92e0af3 
					 
					
						
						
							
							deprecate load_view_file  
						
						
						
						
					 
					
						2011-05-11 04:37:13 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						c052d68828 
					 
					
						
						
							
							don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.  
						
						
						
						
					 
					
						2011-05-10 16:12:50 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						05d3eb59ec 
					 
					
						
						
							
							status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower.  
						
						
						
						
					 
					
						2011-02-26 01:53:18 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						8acc76a3c6 
					 
					
						
						
							
							provide ability to survive transport mangling when travelling through html networks  
						
						
						
						
					 
					
						2011-02-01 05:10:04 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						1278305de9 
					 
					
						
						
							
							salmon error handling issue  
						
						
						
						
					 
					
						2010-11-22 19:58:35 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						2528c40269 
					 
					
						
						
							
							return code is no longer a string  
						
						
						
						
					 
					
						2010-11-21 23:07:25 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						de6c777d3f 
					 
					
						
						
							
							infrastructure for queueing, redelivery  
						
						
						
						
					 
					
						2010-11-21 23:00:01 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						72fd6eec4b 
					 
					
						
						
							
							make sure to use local avatar if we have one  
						
						
						
						
					 
					
						2010-11-21 17:36:01 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						b376f21533 
					 
					
						
						
							
							notify folks who have been tagged in a post  
						
						
						
						
					 
					
						2010-10-31 20:36:59 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						2028e1695c 
					 
					
						
						
							
							rework the logging interface  
						
						
						
						
					 
					
						2010-10-26 22:09:13 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						eb5e6aae72 
					 
					
						
						
							
							a few more fsw tweaks  
						
						
						
						
					 
					
						2010-10-26 19:01:16 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						d453560be9 
					 
					
						
						
							
							more robust (though wasteful) salmon, try both encodings  
						
						
						
						
					 
					
						2010-10-26 15:56:19 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						c16f314ec3 
					 
					
						
						
							
							two-way subscriptions working with federated social accounts  
						
						
						
						
					 
					
						2010-10-25 21:52:30 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						b41218ca30 
					 
					
						
						
							
							workflow for federated/non-dfrn followers  
						
						
						
						
					 
					
						2010-10-24 20:39:24 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						d850badf2b 
					 
					
						
						
							
							pull out follow, unfollow and as:actor for handling  
						
						
						
						
					 
					
						2010-10-21 21:48:22 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						a8a88d2532 
					 
					
						
						
							
							clean up the salmon consumer bits  
						
						
						
						
					 
					
						2010-10-21 15:32:09 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						5edee3c4d1 
					 
					
						
						
							
							magic-envelope verification, status.net appears to do it wrong.  
						
						... 
						
						
						
						Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects. 
						
						
					 
					
						2010-10-21 04:53:43 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						013d2604f8 
					 
					
						
						
							
							inline salmon magic keys  
						
						
						
						
					 
					
						2010-10-12 04:07:03 -07:00