Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	77962aa79d  
						 
						
							
							
								
								
								Fix bugs in the retraction code  
							
							 
							
							... 
							
							
							
							Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log
		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault
	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete
		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work 
							
						 
						
							2012-06-03 14:53:30 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	c0af6dbb1a  
						 
						
							
							
								
								
								Implement relaying of relayable_retractions  
							
							 
							
							... 
							
							
							
							Also: some whitespace cleanup, fix Diaspora parent DB query 
							
						 
						
							2012-06-03 14:53:29 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	959b264c44  
						 
						
							
							
								
								
								quattro: admin panel styling and 1st buttons for addon/theme overview  
							
							 
							
							
							
						 
						
							2012-06-03 22:32:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2741ce67f8  
						 
						
							
							
								
								
								privacy settings: make submit button translateable  
							
							 
							
							
							
						 
						
							2012-06-03 17:38:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	283524d990  
						 
						
							
							
								
								
								DE: update to the strings  
							
							 
							
							
							
						 
						
							2012-06-03 17:33:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6fbeafc843  
						 
						
							
							
								
								
								prv messages: make submit translateable  
							
							 
							
							
							
						 
						
							2012-06-03 17:16:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d27c6de84e  
						 
						
							
							
								
								
								add hometown to profiles  
							
							 
							
							
							
						 
						
							2012-06-02 20:58:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	608d424b0b  
						 
						
							
							
								
								
								"howlong" added to marital status.  
							
							 
							
							
							
						 
						
							2012-06-02 02:30:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	1180919c89  
						 
						
							
							
								
								
								some zero theming on settings page  
							
							 
							
							
							
						 
						
							2012-05-30 16:30:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	bdcb8d27dd  
						 
						
							
							
								
								
								transition to beta for private forums  
							
							 
							
							
							
						 
						
							2012-05-30 15:52:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	88a0d6a1d5  
						 
						
							
							
								
								
								private group tests, cont.  
							
							 
							
							
							
						 
						
							2012-05-29 22:57:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b6fe837a64  
						 
						
							
							
								
								
								hide private group if desired  
							
							 
							
							
							
						 
						
							2012-05-29 18:43:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon 
								
							 
						 
						
							
							
								
							
							
	43c185ce04  
						 
						
							
							
								
								
								Merge pull request  #316  from annando/master  
							
							 
							
							... 
							
							
							
							Speed improvements 
							
						 
						
							2012-05-29 13:13:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	dd666e93d8  
						 
						
							
							
								
								
								fix toolbar. more size dynamicism  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-29 16:09:02 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	68757f2504  
						 
						
							
							
								
								
								Merge remote branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2012-05-29 16:09:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2eafa9a475  
						 
						
							
							
								
								
								ability to only expire contacts, not self  
							
							 
							
							
							
						 
						
							2012-05-29 01:14:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2dc7e53435  
						 
						
							
							
								
								
								more theme cleanup  
							
							 
							
							
							
						 
						
							2012-05-28 19:17:06 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	cb259098dd  
						 
						
							
							
								
								
								fixed font-size/line-height stuffs  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-28 19:25:10 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	6962989e52  
						 
						
							
							
								
								
								slackr - tone down the shadows a smidgin  
							
							 
							
							
							
						 
						
							2012-05-27 23:02:25 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a71e3134bf  
						 
						
							
							
								
								
								Merge remote branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2012-05-25 16:19:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d1345e5054  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-05-25 00:43:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	abb9fecf09  
						 
						
							
							
								
								
								rev update  
							
							 
							
							
							
						 
						
							2012-05-25 00:42:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	07535692dc  
						 
						
							
							
								
								
								DE update to strings and templates  
							
							 
							
							
							
						 
						
							2012-05-25 06:04:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon 
								
							 
						 
						
							
							
								
							
							
	5bc0cfa067  
						 
						
							
							
								
								
								Merge pull request  #313  from fabrixxm/master  
							
							 
							
							... 
							
							
							
							install wizard: fix php executable path 
							
						 
						
							2012-05-24 16:30:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	2a32917e3a  
						 
						
							
							
								
								
								update dark a bit. i messed up some buttons  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-24 19:28:12 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									root 
								
							 
						 
						
							
							
								
							
							
	60df67b9e3  
						 
						
							
							
								
								
								fix small js error when user not logged in  
							
							 
							
							
							
						 
						
							2012-05-24 04:29:33 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									root 
								
							 
						 
						
							
							
								
							
							
	a5b8339a75  
						 
						
							
							
								
								
								install wizard: fix php executable path  
							
							 
							
							... 
							
							
							
							- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect 
							
						 
						
							2012-05-24 04:21:33 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f0ddcb979b  
						 
						
							
							
								
								
								slackr: improve interactivity  
							
							 
							
							
							
						 
						
							2012-05-23 23:29:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	6c78d42050  
						 
						
							
							
								
								
								slackr: hide calendar when posting  
							
							 
							
							
							
						 
						
							2012-05-23 18:20:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5d06e0060d  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-05-23 16:58:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	60723702f1  
						 
						
							
							
								
								
								more theme stuff  
							
							 
							
							
							
						 
						
							2012-05-23 16:58:31 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	16f9d7fd35  
						 
						
							
							
								
								
								clean up and more fixing  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-23 19:22:07 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	19bf0aa283  
						 
						
							
							
								
								
								slackr - better highlighting of current selections  
							
							 
							
							
							
						 
						
							2012-05-23 16:16:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5b7865f8f9  
						 
						
							
							
								
								
								slackr - knock the sharp edges off the events calendar  
							
							 
							
							
							
						 
						
							2012-05-23 15:55:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon 
								
							 
						 
						
							
							
								
							
							
	5acd0a1c32  
						 
						
							
							
								
								
								Merge pull request  #309  from fabrixxm/master  
							
							 
							
							... 
							
							
							
							Update install wizard 
							
						 
						
							2012-05-23 15:10:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	5198260e3a  
						 
						
							
							
								
								
								clean up and make nice the dispy photo edit stuff  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-23 18:06:49 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	789063da39  
						 
						
							
							
								
								
								add a placeholder attribute on search-text; dispy fixes  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-23 15:58:22 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									root 
								
							 
						 
						
							
							
								
							
							
	325343a492  
						 
						
							
							
								
								
								Update install wizard  
							
							 
							
							... 
							
							
							
							- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section 
							
						 
						
							2012-05-23 07:38:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	61dba985c1  
						 
						
							
							
								
								
								photo rotation  
							
							 
							
							
							
						 
						
							2012-05-23 01:01:04 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8ffb65ceef  
						 
						
							
							
								
								
								event calendar theming  
							
							 
							
							
							
						 
						
							2012-05-22 22:34:35 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	86a38cca24  
						 
						
							
							
								
								
								import quattro event reminder  
							
							 
							
							
							
						 
						
							2012-05-22 22:06:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	af495879af  
						 
						
							
							
								
								
								mark bubbles unsupported  
							
							 
							
							
							
						 
						
							2012-05-22 21:54:19 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3ac7c4e859  
						 
						
							
							
								
								
								keep FB out of private notes  
							
							 
							
							
							
						 
						
							2012-05-22 21:20:31 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	0da20ec9ef  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-05-22 18:06:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	e70573f34c  
						 
						
							
							
								
								
								if identity (uid) changes - reload any other open browser windows on next ping.  
							
							 
							
							
							
						 
						
							2012-05-22 16:01:07 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	b962559570  
						 
						
							
							
								
								
								Oops - but lets commit the right revision, sorry.  There's a spare line in the last one.  
							
							 
							
							
							
						 
						
							2012-05-22 19:19:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	18983bb932  
						 
						
							
							
								
								
								Fix darkzero/ns BB icon background colours.  
							
							 
							
							
							
						 
						
							2012-05-22 19:14:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f29f861d25  
						 
						
							
							
								
								
								add queue totals to admin summary page  
							
							 
							
							
							
						 
						
							2012-05-22 03:44:03 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	be64437b14  
						 
						
							
							
								
								
								DE: update to the strings and some mail templates  
							
							 
							
							
							
						 
						
							2012-05-22 12:17:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	d466c9ab08  
						 
						
							
							
								
								
								fix (min-)search-text text  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-21 21:38:53 -04:00