Render markdown

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 61d817e43e41314a045c484cb4ef2819e7c7baf6..15d3547b707e8f10d48e8b48ddd90242505a4453 100644 (file)
--- 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 9f27b53e5e81c1fb4346701064fba83b819f504c..5726b13d238f28513b8e13d6c596d7083c566b5b 100644 (file)
--- 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">