From 78cb87343cefd56ddb9f0ad46c04fb57dafcc2a0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 20 Nov 2014 02:54:55 -0800
Subject: friendica commenters are currently shown using "Diaspora" app. Try
 and fix this where we can.

---
 include/diaspora.php | 7 ++++++-
 version.inc          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index b4f20528d..e494aac0f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1395,7 +1395,12 @@ function diaspora_comment($importer,$xml,$msg) {
 
 	$datarray['body'] = $body;
 
-	$datarray['app']  = 'Diaspora';
+	if(strstr($person['xchan_network'],'friendica'))
+		$app = 'Friendica';
+	else
+		$app = 'Diaspora';
+
+	$datarray['app']  = $app;
 	
 	if(! $parent_author_signature) {
 		$key = get_config('system','pubkey');
diff --git a/version.inc b/version.inc
index 97d0c5a13..dceda9119 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-19.864
+2014-11-20.865
-- 
cgit v1.2.3


From 7a1b345bc2b4ef6d7f9e1c37a3e3ab689ebc6fb0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 20 Nov 2014 03:12:06 -0800
Subject: to-do update

---
 doc/to_do_code.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 1ca1efecd..0dd0b8e24 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -4,6 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 
 [li]Documentation - see Red Documentation Project To-Do List[/li]
 [li]Include TOS link in registration/verification email[/li]
+[li]Create bug tracker module[/li]
 [li]Finish the anti-spam bayesian engine[/li]
 [li]implement an email permission denied bounce message from the sys channel[/li]
 [li]finish Wordpress connector - import wordpress comments back to redmatrix[/li]
-- 
cgit v1.2.3