fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b202e02fbf  
						 
						
							
							
								
								
								Revert "Updated modules to allow for partial overrides without errors"  
							
							... 
							
							
							
							This reverts commit db949bb802 
							
						 
						
							2016-02-07 15:11:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	db949bb802  
						 
						
							
							
								
								
								Updated modules to allow for partial overrides without errors  
							
							... 
							
							
							
							Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions. 
							
						 
						
							2016-02-05 21:52:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	96a245409b  
						 
						
							
							
								
								
								allow changing the lockview content with a plugin  
							
							
							
						 
						
							2012-10-09 09:45:54 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	421c72d10f  
						 
						
							
							
								
								
								remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters  
							
							
							
						 
						
							2012-09-29 17:56:50 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	a3edbf7e5d  
						 
						
							
							
								
								
								create third privacy state - public post but not searchable or publicly visible  
							
							
							
						 
						
							2012-06-28 17:43:29 -07: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 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b5c3fb1545  
						 
						
							
							
								
								
								remove an erroneously pasted line  
							
							
							
						 
						
							2011-02-03 19:42:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	c15c550a06  
						 
						
							
							
								
								
								Fix tabs  
							
							
							
						 
						
							2011-02-03 17:25:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9b3131861f  
						 
						
							
							
								
								
								Extend lockview to show info on items, photos and events  
							
							
							
						 
						
							2011-02-03 17:20:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a42b9ea3de  
						 
						
							
							
								
								
								display the fact that a conversation is private without disclosing the details of who can/cannot see it.  
							
							
							
						 
						
							2010-12-07 20:47:53 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	dda5195418  
						 
						
							
							
								
								
								show members of locked conversations  
							
							
							
						 
						
							2010-09-29 22:11:26 -07:00