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 
							
						 
					 
					
						
						
							
						
						7b648e6da8 
					 
					
						
						
							
							performance enhancements  
						
						
						
						
					 
					
						2011-10-04 18:53:56 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						07b09300a9 
					 
					
						
						
							
							improve feed import performance  
						
						
						
						
					 
					
						2011-10-04 03:06:34 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						2aef98f71d 
					 
					
						
						
							
							cripple account when expired  
						
						
						
						
					 
					
						2011-09-19 01:17:12 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						0883a614a2 
					 
					
						
						
							
							don't accept pubsub from diaspora  
						
						
						
						
					 
					
						2011-08-24 01:41:27 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						48ffa880f0 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2011-08-07 16:15:54 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						d5fdd4287d 
					 
					
						
						
							
							event sharing, cont.  
						
						
						
						
					 
					
						2011-06-13 19:06:49 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						5996e2cd4c 
					 
					
						
						
							
							if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend.  
						
						
						
						
					 
					
						2011-05-22 21:20:28 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						216f038456 
					 
					
						
						
							
							icon changes, feed security improvements  
						
						
						
						
					 
					
						2011-03-04 20:55:32 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						40777b132b 
					 
					
						
						
							
							log ignored pubsub deliveries  
						
						
						
						
					 
					
						2011-02-09 19:56:40 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						cce7380756 
					 
					
						
						
							
							more optimising when confronted with dead servers  
						
						
						
						
					 
					
						2010-11-25 18:50:28 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						7db4a0dd2e 
					 
					
						
						
							
							give orphans a second chance, linkify naked links  
						
						
						
						
					 
					
						2010-11-11 20:32:20 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						a8d6d72b7b 
					 
					
						
						
							
							use date ordering on public feeds  
						
						
						
						
					 
					
						2010-11-08 01:11:50 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						fbb0166690 
					 
					
						
						
							
							lint  
						
						
						
						
					 
					
						2010-11-07 21:07:47 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						4cba826a2f 
					 
					
						
						
							
							hub anomolies & swat0 compliance  
						
						
						
						
					 
					
						2010-11-04 20:47:44 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						b3856a797b 
					 
					
						
						
							
							show like/dislike when no comments yet, bit of lint  
						
						
						
						
					 
					
						2010-11-03 19:47:07 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						36a77c6db2 
					 
					
						
						
							
							build feeds rather than template them  
						
						
						
						
					 
					
						2010-11-01 17:56:36 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						2028e1695c 
					 
					
						
						
							
							rework the logging interface  
						
						
						
						
					 
					
						2010-10-26 22:09:13 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						0b2d85891e 
					 
					
						
						
							
							lrdd link on profile page (for salmon m/e), remove dfrn-template, qualify some contact lookups, some cleanup of app/boot  
						
						
						
						
					 
					
						2010-10-19 15:51:56 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						6d646e9df5 
					 
					
						
						
							
							don't allow ignored contacts to post through the hub, change default poll  
						
						... 
						
						
						
						for hub subscribers to once a day now that we can utilise multiple hubs. 
						
						
					 
					
						2010-10-15 04:58:13 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						a1d37b6cc4 
					 
					
						
						
							
							add recipient url to pubsub instrumentation  
						
						
						
						
					 
					
						2010-10-15 04:36:39 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						35a9b49ed0 
					 
					
						
						
							
							allow for multiple pubsub hubs so everything can still work when/if one goes flaky  
						
						... 
						
						
						
						(Google's hub has been particularly unreliable recently and the symptoms are that
you just stop receiving updates, and/or updates you send are silently dropped and
never delivered). Also add more instrumentation to help debug pubsub issues. 
						
						
					 
					
						2010-10-15 04:20:42 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						a0ecdd025e 
					 
					
						
						
							
							infrastructure for salmon  
						
						
						
						
					 
					
						2010-10-06 19:46:44 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						f5615068ca 
					 
					
						
						
							
							trialing pubsubhubbub - operational tweaks  
						
						
						
						
					 
					
						2010-10-01 02:28:06 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						0d2650b29b 
					 
					
						
						
							
							the rest of pubsubhubbub except for the UI that actually turns it on  
						
						
						
						
					 
					
						2010-09-30 21:38:45 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						632c557008 
					 
					
						
						
							
							pubsubhubbub db refinements  
						
						
						
						
					 
					
						2010-09-30 21:00:06 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						465ba71b58 
					 
					
						
						
							
							pubsubhubbub - discovery and notifier  
						
						
						
						
					 
					
						2010-09-30 20:24:03 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						abe6a3286e 
					 
					
						
						
							
							pubsubhubbub endpoint  
						
						
						
						
					 
					
						2010-09-30 19:41:22 -07:00