From eb94f748c80cce5a8be6b03d4d03367c9e0d6906 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 Sep 2016 14:41:19 +0200 Subject: [PATCH] Render markdown Signed-off-by: Joas Schilling --- 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 9f27b53e5e8..5726b13d238 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(