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
								
							 
						 | 
						
							
							
								
							
							
	9b6e91086b
						 | 
						
							
							
								
								
								make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
							
							
							
							
							
						 | 
						
							2012-04-05 02:15:03 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	3aab1c7140
						 | 
						
							
							
								
								
								typo
							
							
							
							
							
						 | 
						
							2011-12-18 00:22:44 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b0718c4f05
						 | 
						
							
							
								
								
								typo
							
							
							
							
							
						 | 
						
							2011-12-18 00:21:01 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	978717a247
						 | 
						
							
							
								
								
								add webfinger to poco, if present
							
							
							
							
							
						 | 
						
							2011-12-18 00:14:34 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	c8d5274cee
						 | 
						
							
							
								
								
								data structures to support hidden friends
							
							
							
							
							
						 | 
						
							2011-12-05 02:16:59 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f4e1135f79
						 | 
						
							
							
								
								
								poco addition to provide a "suggestme" for new members
							
							
							
							
							
						 | 
						
							2011-11-28 15:11:59 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d4644d7339
						 | 
						
							
							
								
								
								name change continued, social graph tools and stuctures, fix for spanish province name
							
							
							
							
							
						 | 
						
							2011-10-31 20:39:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ea0ab6fbac
						 | 
						
							
							
								
								
								poco should now be spec compliant
							
							
							
							
							
						 | 
						
							2011-10-27 04:38:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	abe96155b4
						 | 
						
							
							
								
								
								hmmm - why won't poco xml work
							
							
							
							
							
						 | 
						
							2011-10-27 01:54:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	31502207bd
						 | 
						
							
							
								
								
								more poco spec compliance
							
							
							
							
							
						 | 
						
							2011-10-27 00:57:19 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	faa078b83f
						 | 
						
							
							
								
								
								basic portable contacts http://portablecontacts.net/draft-spec.html no filter/sort, or xml at the moment
							
							
							
							
							
						 | 
						
							2011-10-26 20:09:03 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |