friendica 
								
							 
						 
						
							
							
								
							
							
	26c53580d1  
						 
						
							
							
								
								
								implement contact archival  
							
							 
							
							
							
						 
						
							2012-04-27 17:17:58 -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 
								
							 
						 
						
							
							
								
							
							
	5d0d9f8772  
						 
						
							
							
								
								
								make contact ssl_policy change a function since it is used in a few places  
							
							 
							
							
							
						 
						
							2012-04-02 23:07:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f4721955db  
						 
						
							
							
								
								
								more ssl policy fixes and prevent delivery to soapbox when using  local delivery  
							
							 
							
							
							
						 
						
							2012-04-02 21:01:19 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	cca524495c  
						 
						
							
							
								
								
								community discovery cont., cleanup of DB debugging  
							
							 
							
							
							
						 
						
							2012-03-18 22:12:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6e7a190e91  
						 
						
							
							
								
								
								Mail: Subject are now with working "Re:"  
							
							 
							
							
							
						 
						
							2012-03-12 00:22:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2ed6b3531e  
						 
						
							
							
								
								
								Removing test exports  
							
							 
							
							
							
						 
						
							2012-03-11 23:29:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	395a9530dc  
						 
						
							
							
								
								
								still getting parent relays on remote systems  
							
							 
							
							
							
						 
						
							2012-03-07 18:23:55 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael 
								
							 
						 
						
							
							
								
							
							
	437e18d7a7  
						 
						
							
							
								
								
								Merge remote branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2012-02-26 21:47:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f5c5da742d  
						 
						
							
							
								
								
								attribution issue - don't take author name from contact if available from item.  
							
							 
							
							
							
						 
						
							2012-02-24 20:03:13 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael 
								
							 
						 
						
							
							
								
							
							
	a74b0746b1  
						 
						
							
							
								
								
								multipart messages complete, message-id conversion done.  
							
							 
							
							
							
						 
						
							2012-02-25 01:10:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael 
								
							 
						 
						
							
							
								
							
							
	0ba45eb745  
						 
						
							
							
								
								
								Sending mail as multipart/alternative (html and plain text) (very basic by now)  
							
							 
							
							
							
						 
						
							2012-02-24 08:50:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael 
								
							 
						 
						
							
							
								
							
							
	f6320f3319  
						 
						
							
							
								
								
								Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.  
							
							 
							
							
							
						 
						
							2012-02-24 07:11:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2abbd81ce1  
						 
						
							
							
								
								
								a few fixes for offsite community members  
							
							 
							
							
							
						 
						
							2012-02-16 18:29:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d054426101  
						 
						
							
							
								
								
								encode email headers on message deliveries  
							
							 
							
							
							
						 
						
							2012-02-15 15:28:32 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	86c0eac27d  
						 
						
							
							
								
								
								transport for email contacts phase II  
							
							 
							
							
							
						 
						
							2012-01-31 20:03:46 -08: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	949d3f0ff1  
						 
						
							
							
								
								
								preparation for 3rd generation email contacts  
							
							 
							
							
							
						 
						
							2011-12-23 01:38:06 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	be8e9d3616  
						 
						
							
							
								
								
								d* pm  
							
							 
							
							
							
						 
						
							2011-12-06 00:16:13 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b795ce4fe7  
						 
						
							
							
								
								
								little stuff - name change, live updates, new network types  
							
							 
							
							
							
						 
						
							2011-11-23 23:17:26 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	72dd6457b0  
						 
						
							
							
								
								
								first forum test  
							
							 
							
							
							
						 
						
							2011-11-19 03:06:15 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	327105a4ea  
						 
						
							
							
								
								
								try and fix diaspora multiple items queued issue  
							
							 
							
							
							
						 
						
							2011-11-06 16:48:13 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f4518c646a  
						 
						
							
							
								
								
								fixes to diaspora profiles, batch mode duplicates, social graph table name  
							
							 
							
							
							
						 
						
							2011-11-01 00:50:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0ada550a02  
						 
						
							
							
								
								
								queue indexes  
							
							 
							
							
							
						 
						
							2011-10-22 01:29:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6e76c86ad2  
						 
						
							
							
								
								
								queue api + queue limits  
							
							 
							
							
							
						 
						
							2011-10-21 03:33:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5dcc10a5d9  
						 
						
							
							
								
								
								working on long-term solution to relay issue  
							
							 
							
							
							
						 
						
							2011-10-15 03:26:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	4eae1e5d8a  
						 
						
							
							
								
								
								don't propagate deletions for other people's stuff  
							
							 
							
							
							
						 
						
							2011-10-13 15:32:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	557a7d0cec  
						 
						
							
							
								
								
								stuff  
							
							 
							
							... 
							
							
							
							- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos. 
							
						 
						
							2011-10-11 18:24:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	2802c142cb  
						 
						
							
							
								
								
								local_deliver testing  
							
							 
							
							
							
						 
						
							2011-10-06 19:10:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7d6a67f903  
						 
						
							
							
								
								
								mostly cosmetic changes to make DB tables accurately reflect the conversation members  
							
							 
							
							
							
						 
						
							2011-10-05 19:16:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6c521017f5  
						 
						
							
							
								
								
								document backward compat issue  
							
							 
							
							
							
						 
						
							2011-10-04 22:03:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	ab50521971  
						 
						
							
							
								
								
								yikes  
							
							 
							
							
							
						 
						
							2011-10-04 22:00:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7b648e6da8  
						 
						
							
							
								
								
								performance enhancements  
							
							 
							
							
							
						 
						
							2011-10-04 18:53:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7c1968907d  
						 
						
							
							
								
								
								attack of the zombie orphans  
							
							 
							
							
							
						 
						
							2011-10-02 05:32:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	52557b011d  
						 
						
							
							
								
								
								possible sql errors  
							
							 
							
							
							
						 
						
							2011-09-29 21:56:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	d6b446d63f  
						 
						
							
							
								
								
								starting the big delivery shakeup  
							
							 
							
							
							
						 
						
							2011-09-22 04:11:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	260d652168  
						 
						
							
							
								
								
								scrape_url - use feed url if no name can be found  
							
							 
							
							
							
						 
						
							2011-09-04 05:07:25 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9ff1a3444e  
						 
						
							
							
								
								
								add timezone convert module, several other minor or in progress fixes  
							
							 
							
							
							
						 
						
							2011-09-04 00:48:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7e79b140f0  
						 
						
							
							
								
								
								don't deliver on first pass if already queued  
							
							 
							
							
							
						 
						
							2011-08-29 17:52:31 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	177e0e15d7  
						 
						
							
							
								
								
								allow zero delivery interval on dedicated servers  
							
							 
							
							
							
						 
						
							2011-08-29 00:59:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	bfc708e07b  
						 
						
							
							
								
								
								logging on notifier  
							
							 
							
							
							
						 
						
							2011-08-28 23:05:06 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	846c4cea7c  
						 
						
							
							
								
								
								implement delivery queue in case notifier gets killed  
							
							 
							
							
							
						 
						
							2011-08-28 21:41:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f29f228463  
						 
						
							
							
								
								
								bring Diaspora message signing back to the source author - whether they like it or not.  
							
							 
							
							
							
						 
						
							2011-08-28 19:22:27 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	506853adcd  
						 
						
							
							
								
								
								break up delivery into per-person processes  
							
							 
							
							
							
						 
						
							2011-08-26 07:29:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1861dc1fae  
						 
						
							
							
								
								
								don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error  
							
							 
							
							
							
						 
						
							2011-08-26 01:32:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a4739aef91  
						 
						
							
							
								
								
								more logging diaspora pubdeliver  
							
							 
							
							
							
						 
						
							2011-08-25 20:35:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a775474dff  
						 
						
							
							
								
								
								cleaned up the conditions on when to and when not to relay.  
							
							 
							
							
							
						 
						
							2011-08-24 04:42:28 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	b57a01dc14  
						 
						
							
							
								
								
								that was ugly - let's do better  
							
							 
							
							
							
						 
						
							2011-08-23 19:42:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	838d89a110  
						 
						
							
							
								
								
								fix for public posts to D*  
							
							 
							
							
							
						 
						
							2011-08-23 19:40:50 -07:00