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
								
							 
						 | 
						
							
							
								
							
							
	a76a497d92
						 | 
						
							
							
								
								
								implement "moderate" flag on items
							
							
							
							
							
						 | 
						
							2012-01-23 20:56:11 -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
								
							 
						 | 
						
							
							
								
							
							
	f64e2d63b9
						 | 
						
							
							
								
								
								New common tab template. Update css
							
							
							
							
							
						 | 
						
							2011-10-10 15:28:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	57d631b47a
						 | 
						
							
							
								
								
								supply default value for update
							
							
							
							
							
						 | 
						
							2011-09-11 22:57:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0e441fe196
						 | 
						
							
							
								
								
								bug #147 comments not working on private notes page
							
							
							
							
							
						 | 
						
							2011-09-11 15:09:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	5de7d0f12f
						 | 
						
							
							
								
								
								add profile tabs to "photos", "events" and "notes". in dispy, show active tab.
							
							
							
							
							
						 | 
						
							2011-06-23 11:30:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	fb92dbf5d6
						 | 
						
							
							
								
								
								link events + personal notes to profile tabs
							
							
							
							
							
						 | 
						
							2011-06-13 20:32:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	681885a120
						 | 
						
							
							
								
								
								"notes" app
							
							
							
							
							
						 | 
						
							2011-05-20 01:15:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |