From 547df2219ab4b870256f2ed90e36b97d8bf200bf Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Tue, 23 May 2017 00:32:11 +0200
Subject: Replace Mardownify library with html-to-markdown library.

---
 include/markdown.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/markdown.php b/include/markdown.php
index a9617f72b..39569a0f6 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -5,7 +5,7 @@
  */
 
 use Michelf\MarkdownExtra;
-use Markdownify\Converter;
+use League\HTMLToMarkdown\HtmlConverter;
 
 require_once("include/oembed.php");
 require_once("include/event.php");
@@ -495,9 +495,8 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 	$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
 
 	// Now convert HTML to Markdown
-	$md = new Converter(Converter::LINK_AFTER_CONTENT, false, false);
-	$Text = $md->parseString($Text);
-
+	$md = new HtmlConverter();
+	$Text = $md->convert($Text);
 
 	// It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
 
-- 
cgit v1.2.3


From 647b5d098f0985a12acbaf6fc1d3d89c2a758129 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 17:07:34 -0700
Subject: apporder style improvement and add to nav menu, also add language
 awareness to webpages

---
 include/nav.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index 0fd555abf..91bade5a7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -281,6 +281,7 @@ EOT;
 		'$nav_apps' => $nav_apps,
 		'$channel_apps' => $channel_apps,
 		'$addapps' => t('Add Apps'),
+		'$orderapps' => t('Arrange Apps'),
 		'$sysapps_toggle' => t('Toggle System Apps')
 	));
 
-- 
cgit v1.2.3


From 6ff16e2651e46a33c9228150a1b13476c5741901 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 14 May 2017 20:51:15 -0700
Subject: hubzilla issue #777

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

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 2f15cefe1..4c5ec7599 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -383,7 +383,7 @@ function bb_definitionList($match) {
 	$eatLeadingSpaces = '(?:&nbsp;|[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element
 	$listElements = preg_replace('/^(\n|<br \/>)/', '', $match[2]); // ltrim the first newline
 	$listElements = preg_replace(
-		'/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?<!\\\)\]/ism', 
+		'/' . $eatLeadingSpaces . '\[\*=([\p{Any}]*?)(?<!\\\)\]/uism', 
 		$closeDescriptionTag . '<dt>$1</dt><dd>', 
 		$listElements
 	);
-- 
cgit v1.2.3


From 508ea9153c128b0204b125911dde56d568867ad0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 14 May 2017 21:04:34 -0700
Subject: this looks like a slightly cleaner solution to the unicode dl issue

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

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 4c5ec7599..135368db9 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -383,7 +383,7 @@ function bb_definitionList($match) {
 	$eatLeadingSpaces = '(?:&nbsp;|[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element
 	$listElements = preg_replace('/^(\n|<br \/>)/', '', $match[2]); // ltrim the first newline
 	$listElements = preg_replace(
-		'/' . $eatLeadingSpaces . '\[\*=([\p{Any}]*?)(?<!\\\)\]/uism', 
+		'/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?<!\\\)\]/uism', 
 		$closeDescriptionTag . '<dt>$1</dt><dd>', 
 		$listElements
 	);
-- 
cgit v1.2.3