From 05a5e1792d27184d29e0c78fd9c61334232a507e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 10 Apr 2017 22:09:49 -0400
Subject: [PATCH 01/18] Left trim at sign from nicks in ACL

---
 include/acl_selectors.php | 12 ++++++------
 mod/acl.php               |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f4b644d68f..8404c8f4b6 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -627,14 +627,14 @@ function acl_lookup(App $a, $out_type = 'json') {
 				dbesc($search),
 				implode("','", $known_contacts)
 		);
-		if (dbm::is_result($r)){
+		if (dbm::is_result($r)) {
 			foreach ($r as $row) {
-				// nickname..
 				$up = parse_url($row['author-link']);
-				$nick = explode("/",$up['path']);
-				$nick = $nick[count($nick)-1];
-				$nick .= "@".$up['host'];
-				// /nickname
+				$nick = explode('/', $up['path']);
+				// Fix for Mastodon URLs with format https://domain.tld/@nick
+				$nick = ltrim($nick[count($nick) - 1], '@');
+				$nick .= '@' . $up['host'];
+
 				$unknow_contacts[] = array(
 					'type'    => 'c',
 					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
diff --git a/mod/acl.php b/mod/acl.php
index 04aa9f50a6..9220bc77a9 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -1,7 +1,7 @@
 <?php
 /* ACL selector json backend */
 
-require_once("include/acl_selectors.php");
+require_once 'include/acl_selectors.php';
 
 function acl_init(App $a) {
 	acl_lookup($a);

From 7f2fddea69a942a59c5b707b7b19f3557c636ca8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 10 Apr 2017 22:10:05 -0400
Subject: [PATCH 02/18] Add network for unknown contacts in ACL

---
 include/acl_selectors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 8404c8f4b6..2a435c8e74 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -615,7 +615,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 		function _contact_link($i){ return dbesc($i['link']); }
 		$known_contacts = array_map(_contact_link, $contacts);
 		$unknow_contacts=array();
-		$r = q("SELECT `author-avatar`,`author-name`,`author-link`
+		$r = q("SELECT `author-avatar`,`author-name`,`author-link`, `network`
 				FROM `item` WHERE `parent` = %d
 					AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
 					AND `author-link` NOT IN ('%s')
@@ -640,7 +640,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
 					'name'    => htmlentities($row['author-name']),
 					'id'      => '',
-					'network' => 'unknown',
+					'network' => $row['network'],
 					'link'    => $row['author-link'],
 					'nick'    => htmlentities($nick),
 					'forum'   => false

From 762e8eda7a7d314ce74180831a3f3bfe7b2dbe96 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 11 Apr 2017 02:41:19 -0400
Subject: [PATCH 03/18] Use get_contact_details_by_url for unknown contacts

- Fix typo
- Fix comment
- Fix closure
---
 include/acl_selectors.php | 46 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 2a435c8e74..4036886c49 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -610,12 +610,18 @@ function acl_lookup(App $a, $out_type = 'json') {
 	$items = array_merge($groups, $contacts);
 
 	if ($conv_id) {
-		/* if $conv_id is set, get unknow contacts in thread */
-		/* but first get know contacts url to filter them out */
-		function _contact_link($i){ return dbesc($i['link']); }
-		$known_contacts = array_map(_contact_link, $contacts);
-		$unknow_contacts=array();
-		$r = q("SELECT `author-avatar`,`author-name`,`author-link`, `network`
+		/*
+		 * if $conv_id is set, get unknown contacts in thread
+		 * but first get known contacts url to filter them out
+		 */
+		$known_contacts = array_map(
+			function ($i) {
+				return dbesc($i['link']);
+			}
+		, $contacts);
+
+		$unknown_contacts = array();
+		$r = q("SELECT `author-link`
 				FROM `item` WHERE `parent` = %d
 					AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
 					AND `author-link` NOT IN ('%s')
@@ -625,31 +631,27 @@ function acl_lookup(App $a, $out_type = 'json') {
 				intval($conv_id),
 				dbesc($search),
 				dbesc($search),
-				implode("','", $known_contacts)
+				implode("', '", $known_contacts)
 		);
 		if (dbm::is_result($r)) {
 			foreach ($r as $row) {
-				$up = parse_url($row['author-link']);
-				$nick = explode('/', $up['path']);
-				// Fix for Mastodon URLs with format https://domain.tld/@nick
-				$nick = ltrim($nick[count($nick) - 1], '@');
-				$nick .= '@' . $up['host'];
+				$contact = get_contact_details_by_url($row['author-link'], 0);
 
-				$unknow_contacts[] = array(
-					'type'    => 'c',
-					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
-					'name'    => htmlentities($row['author-name']),
-					'id'      => '',
-					'network' => $row['network'],
-					'link'    => $row['author-link'],
-					'nick'    => htmlentities($nick),
+				$unknown_contacts[] = array(
+					'type'    => 'cu',
+					'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+					'name'    => htmlentities($contact['name']),
+					'id'      => intval($contact['id']),
+					'network' => $contact['network'],
+					'link'    => $contact['url'],
+					'nick'    => $contact['nick'],
 					'forum'   => false
 				);
 			}
 		}
 
-		$items = array_merge($items, $unknow_contacts);
-		$tot += count($unknow_contacts);
+		$items = array_merge($items, $unknown_contacts);
+		$tot += count($unknown_contacts);
 	}
 
 	$results = array(

From 6b8ad57399e46eef6db713861f74a6fbddf587e8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 11 Apr 2017 21:18:34 -0400
Subject: [PATCH 04/18] Add error handling for missing contacts

---
 include/acl_selectors.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4036886c49..0e30ee06e8 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -637,16 +637,18 @@ function acl_lookup(App $a, $out_type = 'json') {
 			foreach ($r as $row) {
 				$contact = get_contact_details_by_url($row['author-link'], 0);
 
-				$unknown_contacts[] = array(
-					'type'    => 'cu',
-					'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
-					'name'    => htmlentities($contact['name']),
-					'id'      => intval($contact['id']),
-					'network' => $contact['network'],
-					'link'    => $contact['url'],
-					'nick'    => $contact['nick'],
-					'forum'   => false
-				);
+				if (count($contact) > 0) {
+					$unknown_contacts[] = array(
+						'type'    => 'cu',
+						'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+						'name'    => htmlentities($contact['name']),
+						'id'      => intval($contact['id']),
+						'network' => $contact['network'],
+						'link'    => $contact['url'],
+						'nick'    => $contact['nick'],
+						'forum'   => false
+					);
+				}
 			}
 		}
 

From b8e4094e7b475dd5ab980134ea463902c718a4aa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Apr 2017 23:09:22 +0200
Subject: [PATCH 05/18] Allow negative contact.contat-type

https://github.com/friendica/friendica/issues/3328
---
 database.sql            | 2 +-
 include/dbstructure.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/database.sql b/database.sql
index 7ed19f439c..9d56957100 100644
--- a/database.sql
+++ b/database.sql
@@ -159,7 +159,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`writable` tinyint(1) NOT NULL DEFAULT 0,
 	`forum` tinyint(1) NOT NULL DEFAULT 0,
 	`prv` tinyint(1) NOT NULL DEFAULT 0,
-	`contact-type` int(11) unsigned NOT NULL DEFAULT 0,
+	`contact-type` int(11) NOT NULL DEFAULT 0,
 	`hidden` tinyint(1) NOT NULL DEFAULT 0,
 	`archive` tinyint(1) NOT NULL DEFAULT 0,
 	`pending` tinyint(1) NOT NULL DEFAULT 1,
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 48cc02d2d1..9828230a12 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -5,7 +5,7 @@ use \Friendica\Core\Config;
 require_once("boot.php");
 require_once("include/text.php");
 
-define('NEW_UPDATE_ROUTINE_VERSION', 1170);
+define('NEW_UPDATE_ROUTINE_VERSION', 1171);
 
 /*
  * send the email and do what is needed to do on update fails
@@ -671,7 +671,7 @@ function db_definition($charset) {
 					"writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-					"contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),

From 325d3afe183a397ea6688480c1b2df8e1be99dc1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Apr 2017 23:14:33 +0200
Subject: [PATCH 06/18] Bump DB version

---
 boot.php                | 2 +-
 include/dbstructure.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 070dcf7266..ed4fe10a3a 100644
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1216      );
+define ( 'DB_UPDATE_VERSION',      1217      );
 
 /**
  * @brief Constant with a HTML line break.
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 9828230a12..406ad6c93d 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -5,7 +5,7 @@ use \Friendica\Core\Config;
 require_once("boot.php");
 require_once("include/text.php");
 
-define('NEW_UPDATE_ROUTINE_VERSION', 1171);
+define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /*
  * send the email and do what is needed to do on update fails

From 92361a0209da085e1bed4de56ce46f755175142a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Apr 2017 23:20:10 +0200
Subject: [PATCH 07/18] Bump update version

---
 update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.php b/update.php
index 8404f5bf26..4e945d2091 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1216);
+define('UPDATE_VERSION' , 1217);
 
 /**
  *

From 96b1a00e91e204515e632bc9e8d29c46aedddcbf Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 12 Apr 2017 21:32:06 -0400
Subject: [PATCH 08/18] Fiddling with the unknown contact array values

---
 include/acl_selectors.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 0e30ee06e8..4cc810fb5c 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -635,18 +635,18 @@ function acl_lookup(App $a, $out_type = 'json') {
 		);
 		if (dbm::is_result($r)) {
 			foreach ($r as $row) {
-				$contact = get_contact_details_by_url($row['author-link'], 0);
+				$contact = get_contact_details_by_url($row['author-link']);
 
 				if (count($contact) > 0) {
 					$unknown_contacts[] = array(
 						'type'    => 'cu',
 						'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
 						'name'    => htmlentities($contact['name']),
-						'id'      => intval($contact['id']),
+						'id'      => intval($contact['cid']),
 						'network' => $contact['network'],
 						'link'    => $contact['url'],
-						'nick'    => $contact['nick'],
-						'forum'   => false
+						'nick'    => $contact['nick'] ? : $contact['addr'],
+						'forum'   => $contact['forum']
 					);
 				}
 			}

From d82684219a861ad25ade416cf95f85c2cc8a8217 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Apr 2017 04:51:16 +0000
Subject: [PATCH 09/18] Issue 3331: Removed unneeded table "deliverq"

---
 mod/admin.php                    | 5 +----
 view/templates/admin_summary.tpl | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index e86bb90ddd..2652b33c12 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -474,9 +474,6 @@ function admin_page_summary(App $a) {
 	$r = qu("SELECT COUNT(`id`) AS `count` FROM `register`");
 	$pending = $r[0]['count'];
 
-	$r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1");
-	$deliverq = (($r) ? $r[0]['total'] : 0);
-
 	$r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
 	$queue = (($r) ? $r[0]['total'] : 0);
 
@@ -485,7 +482,7 @@ function admin_page_summary(App $a) {
 
 	// We can do better, but this is a quick queue status
 
-	$queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue);
+	$queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue);
 
 
 	$t = get_markup_template("admin_summary.tpl");
diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl
index a8243b6149..e650144134 100644
--- a/view/templates/admin_summary.tpl
+++ b/view/templates/admin_summary.tpl
@@ -11,7 +11,7 @@
 
 	<dl>
 		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.deliverq}} - <a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
+		<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$pending.0}}</dt>

From f399a1914f5e349dc2ae38f8a9b66b4135f4be3d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Apr 2017 05:08:12 +0000
Subject: [PATCH 10/18] Removed documentation

---
 doc/database/db_deliverq.md | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 doc/database/db_deliverq.md

diff --git a/doc/database/db_deliverq.md b/doc/database/db_deliverq.md
deleted file mode 100644
index 5335899571..0000000000
--- a/doc/database/db_deliverq.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Table deliverq
-==============
-
-| Field   | Description      | Type             | Null | Key | Default | Extra          |
-|---------|------------------|------------------|------|-----|---------|----------------|
-| id      | sequential ID    | int(10) unsigned | NO   | PRI | NULL    | auto_increment |
-| cmd     |                  | varchar(32)      | NO   |     |         |                |
-| item    |                  | int(11)          | NO   |     | 0       |                |
-| contact |                  | int(11)          | NO   |     | 0       |                |
-
-
-Return to [database documentation](help/database)

From 2b3a12948051c6171226b20614c9e762a07a1eeb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Apr 2017 05:08:42 +0000
Subject: [PATCH 11/18] Removed it here as well

---
 doc/database.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/database.md b/doc/database.md
index f48404c17d..4c61505202 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -14,7 +14,6 @@ Database Tables
 | [config](help/database/db_config)                    | main configuration storage                       |
 | [contact](help/database/db_contact)                  | contact table                                    |
 | [conv](help/database/db_conv)                        | private messages                                 |
-| [deliverq](help/database/db_deliverq)                |                                                  |
 | [event](help/database/db_event)                      | Events                                           |
 | [fcontact](help/database/db_fcontact)                | friend suggestion stuff                          |
 | [ffinder](help/database/db_ffinder)                  | friend suggestion stuff                          |

From 31f9b418ba3d37ae32f3c0ccda53563e08b21a5d Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 12 Apr 2017 23:16:44 +0200
Subject: [PATCH 12/18] Scroll to next/previous thread when pressing j/k (fixes
 #3327)

---
 js/main.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/js/main.js b/js/main.js
index 556e4ed8cf..98c219d78c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -322,6 +322,29 @@
 			}
 		});
 
+		$(document).keydown(function (event) {
+			var threads = $('.thread_level_1');
+			if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) {
+				var scrollTop = $(window).scrollTop();
+				if (event.keyCode === 75) {
+					threads = $(threads.get().reverse());
+				}
+				threads.each(function(key, item) {
+					var comparison;
+					var top = $(item).offset().top - 100;
+					if (event.keyCode === 74) {
+						comparison = top > scrollTop + 1;
+					} else if (event.keyCode === 75) {
+						comparison = top < scrollTop - 1;
+					}
+					if (comparison) {
+						$('html, body').animate({ scrollTop: top }, 200);
+						return false;
+					}
+				});
+			}
+		});
+
 		// Set an event listener for infinite scroll
 		if(typeof infinite_scroll !== 'undefined') {
 			$(window).scroll(function(e){

From ead9cbe534d3c520957d72b543004c0fcce70c87 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Thu, 13 Apr 2017 02:24:27 +0200
Subject: [PATCH 13/18] Web app manifest (fixes #3317)

---
 mod/manifest.php                   | 26 ++++++++++++++++++++++++++
 view/templates/head.tpl            |  1 +
 view/templates/manifest.tpl        |  9 +++++++++
 view/theme/frio/templates/head.tpl |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 mod/manifest.php
 create mode 100644 view/templates/manifest.tpl

diff --git a/mod/manifest.php b/mod/manifest.php
new file mode 100644
index 0000000000..6dc0d10a21
--- /dev/null
+++ b/mod/manifest.php
@@ -0,0 +1,26 @@
+<?php
+    use Friendica\Core\Config;
+
+    function manifest_content(App $a) {
+
+		$tpl = get_markup_template('manifest.tpl');
+
+		header('Content-type: application/manifest+json');
+
+		$touch_icon = Config::get('system', 'touch_icon', 'images/friendica-128.png');
+		if ($touch_icon == '') {
+			$touch_icon = 'images/friendica-128.png';
+		}
+
+		$o = replace_macros($tpl, array(
+			'$baseurl' => App::get_baseurl(),
+			'$touch_icon' => $touch_icon,
+			'$title' => Config::get('config', 'sitename', 'Friendica'),
+		));
+
+		echo $o;
+
+		killme();
+
+	}
+?>
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index bfc5728ed2..e7df8a18cd 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -19,6 +19,7 @@
 <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
+<link rel="manifest" href="{{$baseurl}}/manifest" />
 <script>
 // Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
 (function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");
diff --git a/view/templates/manifest.tpl b/view/templates/manifest.tpl
new file mode 100644
index 0000000000..6f9294774d
--- /dev/null
+++ b/view/templates/manifest.tpl
@@ -0,0 +1,9 @@
+{
+  "name": "{{$title}}",
+  "start_url": "{{$baseurl}}",
+  "display": "standalone",
+  "description": "A Decentralized Social Network",
+  "icons": [{
+    "src": "{{$baseurl}}/{{$touch_icon}}"
+  }]
+}
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 32005417c8..882d2215cf 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -41,6 +41,7 @@
 <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
+<link rel="manifest" href="{{$baseurl}}/manifest" />
 <script>
 // Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
 (function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");

From 8567113f0f4d1014098e7b16b9cd805944c67f56 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Thu, 13 Apr 2017 17:20:05 +0200
Subject: [PATCH 14/18] Doc about j/k keyboard shortcuts

---
 doc/KeyboardShortcuts.md | 10 ++++++++++
 js/main.js               |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 doc/KeyboardShortcuts.md

diff --git a/doc/KeyboardShortcuts.md b/doc/KeyboardShortcuts.md
new file mode 100644
index 0000000000..cf783b0da1
--- /dev/null
+++ b/doc/KeyboardShortcuts.md
@@ -0,0 +1,10 @@
+Keyboard shortcuts in Friendica
+=======================
+
+* [Home](help)
+
+General
+-------
+
+* j: Scroll to next thread
+* k: Scroll to previous thread
diff --git a/js/main.js b/js/main.js
index 98c219d78c..c85aab4a27 100644
--- a/js/main.js
+++ b/js/main.js
@@ -322,6 +322,7 @@
 			}
 		});
 
+		// Scroll to the next/previous thread when pressing J and K
 		$(document).keydown(function (event) {
 			var threads = $('.thread_level_1');
 			if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) {

From d5c6f67a4a07f25dac150a120285cdddb63b5586 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Apr 2017 19:10:53 +0000
Subject: [PATCH 15/18] Changed documentation

---
 doc/Settings.md    |  6 ++----
 doc/de/Settings.md | 11 ++++-------
 include/photos.php |  5 ++---
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/doc/Settings.md b/doc/Settings.md
index 5055ed7d23..3652562720 100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -6,12 +6,10 @@ If you are the admin of a Friendica node, you have access to the so called **Adm
 
 On the front page of the admin panel you will see a summary of information about your node.
 These information include the amount of messages currently being processed in the queues.
-The first number is the number of messages being actively sent.
-This number should decrease quickly.
-The second is the messages which could for various reasons not being delivered.
+The first number is the number of messages which could not been delivered for various reasons.
 They will be resend later.
 You can have a quick glance into that second queus in the "Inspect Queue" section of the admin panel.
-If you have activated the background workers, there is a third number representing the count of jobs queued for the workers.
+The second number represents the current number of jobs for the background workers.
 These worker tasks are prioritised and are done accordingly.
 
 Then you get an overview of the accounts on your node, which can be moderated in the "Users" section of the panel.
diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 2b7e89a52c..68e17adc78 100644
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@@ -5,17 +5,14 @@
 Wenn du der Administrator einer Friendica Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica Instanz konfigurieren kannst,
 
 Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst.
-Diese Informationen beinhalten die Anzahl der Nachrichten, die sich aktuell in den Warteschlangen befinden.
-Hierbei ist die erste Zahl die Zahl der Nachrichten die gerade aktiv verteilt werden.
-Diese Zahl sollte sich relativ schnell sinken.
-Die zweite Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
+Die erste Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
 Die Zustellung wird zu einem späteren Zeitpunkt noch einmal versucht.
 Unter dem Punkt "Warteschlange Inspizieren" kannst du einen schnellen Blick auf die zweite Warteschlange werfen.
-Solltest du für die Hintergrundprozesse die Worker aktiviert haben, wird eine dritte Zahl angezeigt.
-Diese repräsentiert die Anzahl der Aufgaben, die die Worker noch vor sich haben.
+Die zweite Zahl steht für die Anzahl der Aufgaben, die die Worker noch vor sich haben. 
+Die Worker arbeiten Hintergrundprozesse ab. 
 Die Aufgaben der Worker sind priorisiert und werden anhand dieser Prioritäten abgearbeitet.
 
-Des weiteren findest du eine Übersicht über die Accounts auf dem Friendica Knoten, die unter dem Punkt "Nutzer" moderiert werden können.
+Desweiteren findest du eine Übersicht über die Accounts auf dem Friendica Knoten, die unter dem Punkt "Nutzer" moderiert werden können.
 Sowie eine Liste der derzeit aktivierten Addons.
 Diese Liste ist verlinkt, so dass du schnellen Zugriff auf die Informationsseiten der einzelnen Addons hast.
 Abschließend findest du auf der Startseite des Admin Panels die installierte Version von Friendica.
diff --git a/include/photos.php b/include/photos.php
index 9d8d3309c2..376be05c8f 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -59,9 +59,8 @@ function photo_albums($uid, $update = false) {
 		} else {
 			// This query doesn't do the count and is much faster
 			$albums = qu("SELECT DISTINCT(`album`), '' AS `total`
-				FROM `photo`
-				WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-				GROUP BY `album` ORDER BY `created` DESC",
+				FROM `photo` USE INDEX (`uid_album_scale_created`)
+				WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
 				intval($uid),
 				dbesc('Contact Photos'),
 				dbesc(t('Contact Photos'))

From 319284c66588296cfc199e97db8b14d562168587 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Apr 2017 19:25:00 +0000
Subject: [PATCH 16/18] Issue 3336: The date format should now be okay

---
 include/socgraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/socgraph.php b/include/socgraph.php
index 642d03d891..66533e1511 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -2096,7 +2096,7 @@ function update_gcontact($contact) {
 	fix_alternate_contact_address($contact);
 
 	if (!isset($contact["updated"]))
-		$contact["updated"] = datetime_convert();
+		$contact["updated"] = dbm::date();
 
 	if ($contact["server_url"] == "") {
 		$server_url = $contact["url"];
@@ -2151,7 +2151,7 @@ function update_gcontact($contact) {
 			dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
 			intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
 			dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
-			dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
+			dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
 			dbesc($contact["server_url"]), dbesc($contact["connect"]),
 			dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
 

From bffd3f230470f435ccd3b1eb810c166dbc90125f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 13 Apr 2017 18:33:40 -0400
Subject: [PATCH 17/18] Add htmlentities to protect nick/addr in acl_lookup

---
 include/acl_selectors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4cc810fb5c..9c3eab58ba 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -639,13 +639,13 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 				if (count($contact) > 0) {
 					$unknown_contacts[] = array(
-						'type'    => 'cu',
+						'type'    => 'c',
 						'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
 						'name'    => htmlentities($contact['name']),
 						'id'      => intval($contact['cid']),
 						'network' => $contact['network'],
 						'link'    => $contact['url'],
-						'nick'    => $contact['nick'] ? : $contact['addr'],
+						'nick'    => htmlentities($contact['nick'] ? : $contact['addr']),
 						'forum'   => $contact['forum']
 					);
 				}

From 440fd29c1eb694339d81b279911ddaad192c25f0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 13 Apr 2017 23:00:02 -0400
Subject: [PATCH 18/18] Change icon of contact page links

---
 view/templates/hovercard.tpl                   | 4 ++--
 view/theme/frio/templates/contact_template.tpl | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/view/templates/hovercard.tpl b/view/templates/hovercard.tpl
index b7acd6c505..aff1c320a2 100644
--- a/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@ -15,7 +15,7 @@
 					{{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}
 				</div>
 				{{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}
-	
+
 			</div>
 			<div class="hover-card-actions  right-aligned">
 				{{* here are the differnt actions like privat message, poke, delete and so on *}}
@@ -26,7 +26,7 @@
 				</div>
 				<div class="hover-card-actions-connection">
 					{{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-					{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+					{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
 					{{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
 				</div>
 			</div>
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 5ae4fd4f79..36564cf337 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -42,7 +42,6 @@
 
 				{{/if}}
 			</div>
-
 		</div>
 
 		<div class="media-body">
@@ -51,7 +50,7 @@
 				{{if $contact.photo_menu.pm     }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.poke   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.drop   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.hide   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}