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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									tommy tomson
								
							 
						 | 
						
							
							
								
							
							
	bf4dd8ad17
						 | 
						
							
							
								
								
								add right_aside to theme diabook
							
							
							
							
							
						 | 
						
							2012-03-23 02:36:34 +01: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	5fb2b522f4
						 | 
						
							
							
								
								
								move <header> and <nav> tag into nav.tpl. add notification popup items template
							
							
							
							
							
						 | 
						
							2011-07-25 16:53:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	81e7535914
						 | 
						
							
							
								
								
								Add javascript var "baseurl"
							
							
							
							
							
							
							
							Add field_richtext template 
							
						 | 
						
							2011-06-30 16:42:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	f0b6400584
						 | 
						
							
							
								
								
								more lint
							
							
							
							
							
						 | 
						
							2010-10-31 16:38:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	65a420b227
						 | 
						
							
							
								
								
								theme cleanup
							
							
							
							
							
						 | 
						
							2010-09-18 21:11:18 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	2bae548b35
						 | 
						
							
							
								
								
								no profile after returning from visitor mode with a selected profile
							
							
							
							
							
							
							
							put bottom margin on non-profile pages as well 
							
						 | 
						
							2010-09-17 18:26:20 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	6348e70daa
						 | 
						
							
							
								
								
								Initial checkin
							
							
							
							
							
						 | 
						
							2010-07-01 16:48:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |