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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	df14d7abc4
						 | 
						
							
							
								
								
								allow crepair to change name - as long as it isn't blank
							
							
							
							
							
						 | 
						
							2012-01-12 18:54:35 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	15f2ce5459
						 | 
						
							
							
								
								
								contact edit updates
							
							
							
							
							
						 | 
						
							2011-11-09 19:30:14 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ecd714ae54
						 | 
						
							
							
								
								
								provide ability to repair contact photo
							
							
							
							
							
						 | 
						
							2011-10-05 20:01:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	7e8100d2cd
						 | 
						
							
							
								
								
								custom attags
							
							
							
							
							
						 | 
						
							2011-09-04 22:40:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	e1107b55c6
						 | 
						
							
							
								
								
								add info() function. Works like notice() but show messages in a div with class info-message.
							
							
							
							
							
							
							
							update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes 
							
						 | 
						
							2011-05-23 11:39:57 +02: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
								
							 
						 | 
						
							
							
								
							
							
	974077c06c
						 | 
						
							
							
								
								
								contact "repair/relocate URL" tool
							
							
							
							
							
						 | 
						
							2011-04-13 20:14:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |