Skip to content

Markdown support for app descriptions #1594

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

Markdown support for app descriptions #1594

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7a2151
Add marked
nickvergessen Sep 30, 2016
1e45357
Render markdown
nickvergessen Sep 30, 2016
587eca3
Remove the magic parsing of the description
nickvergessen Sep 30, 2016
d26b902
Fix "broken" app descriptions
nickvergessen Sep 30, 2016
1a7d713
Don't render non HTTP links, images and quotes
nickvergessen Dec 15, 2016
fcfb420
Fix tests
nickvergessen Jan 11, 2017
4d7dee5
Fix JSUnit tests
MorrisJobke Jan 11, 2017
6a047a0
Apply DOMPurify over HTML
LukasReschke Jan 13, 2017
ddfc7e6
Manually whitelist tags
LukasReschke Jan 13, 2017
76bc3bc
Allow ordered lists as well
nickvergessen Jan 16, 2017
aadfadf
fix list style of app description
MorrisJobke Jan 17, 2017
6ba7ba6
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
LukasReschke committed Jan 13, 2017
commit ddfc7e6a3fd231f2c3fbac4a862d595cd30fd954
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'
Copy link
Member

@LukasReschke LukasReschke Jan 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nickvergessen Whitelist here what you want to have whitelisted 😉

]
}
);

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