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
								
							 
						 | 
						
							
							
								
							
							
	daa036e34c
						 | 
						
							
							
								
								
								@-completion bug
							
							
							
							
							
						 | 
						
							2012-03-26 21:48:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	792abc3a24
						 | 
						
							
							
								
								
								necessare fields not loaded from DB
							
							
							
							
							
						 | 
						
							2012-02-26 20:40:41 +00: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
								
							 
						 | 
						
							
							
								
							
							
	99fc4309be
						 | 
						
							
							
								
								
								slightly better group icon
							
							
							
							
							
						 | 
						
							2012-01-10 21:09:38 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	7fbfbdae07
						 | 
						
							
							
								
								
								audio/video bb tags showing up on Diaspora
							
							
							
							
							
						 | 
						
							2011-12-20 17:01:41 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2d22a58324
						 | 
						
							
							
								
								
								@ tag completion enhancements, show url on hover and respect custom attags
							
							
							
							
							
						 | 
						
							2011-10-26 15:14:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	155a09cfdf
						 | 
						
							
							
								
								
								filter by contact type
							
							
							
							
							
						 | 
						
							2011-10-25 15:49:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	bcb672e7ff
						 | 
						
							
							
								
								
								autocomplete contacts nickname while writting in a comment box.
							
							
							
							
							
						 | 
						
							2011-10-25 15:01:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	7e2284043f
						 | 
						
							
							
								
								
								show profile url in ACL hovertips, add fork identifier to json siteinfo
							
							
							
							
							
						 | 
						
							2011-09-27 05:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	9debbfde1e
						 | 
						
							
							
								
								
								fix group image name
							
							
							
							
							
						 | 
						
							2011-07-19 16:25:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	9fa0956966
						 | 
						
							
							
								
								
								New jot acl selector
							
							
							
							
							
						 | 
						
							2011-07-19 16:17:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |