From f6be815c31fc5985d30f99a712d8f266edef8c83 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 22 Feb 2014 22:54:09 +0100
Subject: [PATCH 1/5] more tweaks

---
 view/theme/redbasic/css/narrow_navbar.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index b05f46797..cd128f35b 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -7,10 +7,9 @@ margin: 2px 0px 1px 10px;
 border-radius: 0px;
 }
 .navbar-left{height: 30px;}
-.container-fluid {min-height:30px;}
 .collapse .navbar-collapse {min-height:30px;}
 #nav-search-text {margin:5px;}
-header #banner {margin-top:5px;}
+header #banner {margin:5px;}
 nav .dropdown-menu {
 top: 30px;}
 nav .badge {

From 0850a5d63d712f8449c173944db041aa22d27f2c Mon Sep 17 00:00:00 2001
From: cvogeley <christian.vogeley@hotmail.de>
Date: Thu, 27 Feb 2014 09:39:07 +0100
Subject: [PATCH 2/5] Typo

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/poller.php b/include/poller.php
index 1c6f68eab..77452cafa 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -76,7 +76,7 @@ function poller_run($argv, $argc){
 				intval($rr['id'])
 			);
 			if($x) {
-				proc_run('php','include/notifer.php','wall-new',$rr['id']);
+				proc_run('php','include/notifier.php','wall-new',$rr['id']);
 			}
 		}
 	}

From 27197e5b50b14731debc43db2fd2b17ec4b5d7d5 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 9 Mar 2014 04:08:12 +0100
Subject: [PATCH 3/5] allow again zrl and zmg in api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the problem was that the values weren’t returned and so the android
client received a null value
---
 mod/wall_upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 2939cf0d1..3e7013ba1 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -49,7 +49,7 @@ function wall_upload_post(&$a) {
 	// and these tags probably aren't useful with other client apps. 
 
 	if($using_api)
-		return(str_replace(array('zrl','zmg'),array('url','img'),$ret['body']));
+		return("\n\n" . $ret['body'] . "\n\n");
 	else
 		echo  "\n\n" . $ret['body'] . "\n\n";
 	killme();

From e8e980c8175be6dae7d642d9707493c465b7137b Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 9 Mar 2014 04:11:45 +0100
Subject: [PATCH 4/5] .

---
 view/theme/redbasic/css/narrow_navbar.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index cd128f35b..b05f46797 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -7,9 +7,10 @@ margin: 2px 0px 1px 10px;
 border-radius: 0px;
 }
 .navbar-left{height: 30px;}
+.container-fluid {min-height:30px;}
 .collapse .navbar-collapse {min-height:30px;}
 #nav-search-text {margin:5px;}
-header #banner {margin:5px;}
+header #banner {margin-top:5px;}
 nav .dropdown-menu {
 top: 30px;}
 nav .badge {

From 8be35d60cf8e4dee4ffc3e9cc090ebb722d72290 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 9 Mar 2014 04:18:03 +0100
Subject: [PATCH 5/5] zrl and zmg are back

---
 mod/wall_upload.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 3e7013ba1..f83f4f7cf 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -45,8 +45,7 @@ function wall_upload_post(&$a) {
 
 	$m = $ret['body'];
 
-	// This might make Friendica for Android uploads work again, as it won't have any knowledge of zrl and zmg tags
-	// and these tags probably aren't useful with other client apps. 
+
 
 	if($using_api)
 		return("\n\n" . $ret['body'] . "\n\n");