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
								
							 
						 | 
						
							
							
								
							
							
	60c57704c6
						 | 
						
							
							
								
								
								better handling of reshares containing embeds
							
							
							
							
							
						 | 
						
							2012-04-04 02:02:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f96aff5518
						 | 
						
							
							
								
								
								more recycle fixes for plaintext
							
							
							
							
							
						 | 
						
							2012-03-15 03:47:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	9cd1c35c22
						 | 
						
							
							
								
								
								fix recycle symbol when using plaintext editor
							
							
							
							
							
						 | 
						
							2012-03-15 03:44:41 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	7431bd9509
						 | 
						
							
							
								
								
								fix html reshares when editplain in use
							
							
							
							
							
						 | 
						
							2012-03-06 15:28:27 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	969a25eab2
						 | 
						
							
							
								
								
								add titles to shared items if available
							
							
							
							
							
						 | 
						
							2011-06-01 06:41:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	58508201a5
						 | 
						
							
							
								
								
								bug #37, ampersand + everything following in url is stripped when using link icon to share link
							
							
							
							
							
						 | 
						
							2011-04-10 03:36:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	bf865f0210
						 | 
						
							
							
								
								
								bug #34, line breaks double in retweet/share
							
							
							
							
							
						 | 
						
							2011-04-10 03:00:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	3f432a7b82
						 | 
						
							
							
								
								
								share,retweet,relay,forward, whatever
							
							
							
							
							
						 | 
						
							2011-03-16 19:36:59 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |