From 1e453576dd5cc22596f8daea060daf353513c261 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Sep 2016 14:41:19 +0200
Subject: [PATCH] Render markdown

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 settings/js/apps.js         | 3 +++
 settings/templates/apps.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 61d817e43e4..15d3547b707 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -186,6 +186,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			app.author = app.author['@value'];
 		}
 
+		// Parse markdown in app description
+		app.description = marked(app.description.trim());
+
 		var html = template(app);
 		if (selector) {
 			selector.html(html);
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 24f8061a530..bd1d4a2ba77 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,7 +3,8 @@ style('settings', 'settings');
 vendor_script(
 	'core',
 	[
-		'handlebars/handlebars'
+		'handlebars/handlebars',
+		'marked/marked.min',
 	]
 );
 script(
@@ -59,7 +60,7 @@ script(
 	<div class="app-detailpage"></div>
 
 	<div class="app-description-container hidden">
-		<div class="app-description"><pre>{{description}}</pre></div>
+		<div class="app-description"><pre>{{{description}}}</pre></div>
 		<!--<div class="app-changed">{{changed}}</div>-->
 		{{#if documentation}}
 		<p class="documentation">