Tobias Hößl 
							
						 
					 
					
						
						
							
						
						720c8324c7 
					 
					
						
						
							
							Some Bugfixes, and variable checks  
						
						
						
						
					 
					
						2012-04-17 11:33:50 +00:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						75a62db9c5 
					 
					
						
						
							
							show tags (pub_keywords) in advanced profile  
						
						
						
						
					 
					
						2012-02-11 01:24:29 -08: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 
							
						 
					 
					
						
						
							
						
						e9eb15373f 
					 
					
						
						
							
							Remove full profile html from php and add new template 'profile_advanced.tpl'  
						
						
						
						
					 
					
						2011-10-10 16:48:38 +02:00 
						 
				 
			
				
					
						
							
							
								Devlon Duthie 
							
						 
					 
					
						
						
							
						
						cb1c6dd1e3 
					 
					
						
						
							
							really commiting files this time, still getting the hang of git.  
						
						... 
						
						
						
						some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks 
						
						
					 
					
						2011-09-25 13:20:19 -05:00 
						 
				 
			
				
					
						
							
							
								Fabio Comuni 
							
						 
					 
					
						
						
							
						
						969cc6996a 
					 
					
						
						
							
							Fix a typo, updated IT strings  
						
						
						
						
					 
					
						2011-04-08 12:35:42 +02:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						e35a5bac55 
					 
					
						
						
							
							the rest of the english html templates except for htconfig  
						
						
						
						
					 
					
						2011-04-07 23:10:43 -07:00