aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
commit5ad79e3f044a3ac5647909bff77d0954fbf96c0f (patch)
tree756e352064e872f233e9cf167a1cc36189162bdc
parente3b0b5ed52a2ad4f3cdd0c8cd1911a5345e50586 (diff)
parent7a1b345bc2b4ef6d7f9e1c37a3e3ab689ebc6fb0 (diff)
downloadvolse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.gz
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.bz2
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--doc/to_do_code.bb1
-rwxr-xr-xinclude/diaspora.php7
-rw-r--r--version.inc2
3 files changed, 8 insertions, 2 deletions
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]
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