Skip to content

[stable11] Markdown support for app descriptions #3117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 12 commits into from
Jan 17, 2017
Merged

[stable11] Markdown support for app descriptions #3117

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
33644d9
Add marked
nickvergessen Sep 30, 2016
eb94f74
Render markdown
nickvergessen Sep 30, 2016
de1a89a
Remove the magic parsing of the description
nickvergessen Sep 30, 2016
832007a
Fix "broken" app descriptions
nickvergessen Sep 30, 2016
a21dfdf
Don't render non HTTP links, images and quotes
nickvergessen Dec 15, 2016
964d7b2
Fix tests
nickvergessen Jan 11, 2017
45c12d2
Fix JSUnit tests
MorrisJobke Jan 11, 2017
2382bf9
Apply DOMPurify over HTML
LukasReschke Jan 13, 2017
a30d170
Manually whitelist tags
LukasReschke Jan 13, 2017
e05f53e
Allow ordered lists as well
nickvergessen Jan 16, 2017
bc60429
fix list style of app description
MorrisJobke Jan 17, 2017
4158f38
add a bit of space around paragraphs
MorrisJobke Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Manually whitelist tags 
Signed-off-by: Lukas Reschke <[email protected]>
  • Loading branch information
@LukasReschke @nickvergessen
LukasReschke authored and nickvergessen committed Jan 17, 2017
commit a30d170aca2e13a11e8530aae736b728fe813895
17 changes: 16 additions & 1 deletion settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,22 @@ OC.Settings.Apps = OC.Settings.Apps || {
}

// Parse markdown in app description
app.description = DOMPurify.sanitize(marked(app.description.trim(), OC.Settings.Apps.markedOptions));
app.description = DOMPurify.sanitize(
marked(app.description.trim(), OC.Settings.Apps.markedOptions),
{
SAFE_FOR_JQUERY: true,
ALLOWED_TAGS: [
'strong',
'p',
'a',
'ul',
'li',
'em',
's',
'blockquote'
]
}
);

var html = template(app);
if (selector) {
Expand Down