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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Johnston
								
							 
						 | 
						
							
							
								
							
							
	da0eb2d4c9
						 | 
						
							
							
								
								
								correct some filer dialog weirdness caused by introduction of categories
							
							
							
							
							
						 | 
						
							2012-04-04 23:08:16 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	53f799f2bc
						 | 
						
							
							
								
								
								handle escaped file chars in display and search
							
							
							
							
							
						 | 
						
							2012-03-31 15:25:17 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	bcc5801608
						 | 
						
							
							
								
								
								rename "file as" to "save to folder"
							
							
							
							
							
						 | 
						
							2012-03-30 02:42:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	0a2675d8b6
						 | 
						
							
							
								
								
								filer: replace "file as" prompt with combobox opened in fancybox
							
							
							
							
							
						 | 
						
							2012-03-28 10:49:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	be48fff157
						 | 
						
							
							
								
								
								file as widget and basic filing implementation for duepuntozero,slackr
							
							
							
							
							
							
							
							much more work needed - this is just for test/evaluation currently 
							
						 | 
						
							2012-03-13 18:13:03 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |