Skip to content
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

Jump to bottom

[stable11] Markdown support for app descriptions #3117

Merged
merged 12 commits into from Jan 17, 2017
Merged

[stable11] Markdown support for app descriptions #3117

merged 12 commits into from Jan 17, 2017

Conversation

nickvergessen
Copy link
Member

Backport #1594

nickvergessen and others added 12 commits January 17, 2017 11:36
@nickvergessen
Add marked
33644d9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Render markdown
eb94f74 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Remove the magic parsing of the description
de1a89a 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix "broken" app descriptions
832007a 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Don't render non HTTP links, images and quotes
a21dfdf 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix tests
964d7b2 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke @nickvergessen
Fix JSUnit tests
45c12d2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@LukasReschke @nickvergessen
Apply DOMPurify over HTML
2382bf9 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
@LukasReschke @nickvergessen
Manually whitelist tags
a30d170 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
@nickvergessen
Allow ordered lists as well
e05f53e 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke @nickvergessen
fix list style of app description
bc60429 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke @nickvergessen
add a bit of space around paragraphs
4158f38 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@nickvergessen nickvergessen added this to the Nextcloud 11.0.2 milestone Jan 17, 2017
@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @MorrisJobke, @LukasReschke, @icewind1991 and @Xenopathic to be potential reviewers.

@nickvergessen nickvergessen mentioned this pull request Jan 17, 2017
Closed
MorrisJobke
MorrisJobke approved these changes Jan 17, 2017
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and looks good 👍

MariusBluem
MariusBluem approved these changes Jan 17, 2017
View reviewed changes
Copy link
Member

@MariusBluem MariusBluem left a comment

Choose a reason for hiding this comment

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

Bam... Nice 👍

@nickvergessen nickvergessen merged commit 6eb31b5 into stable11 Jan 17, 2017
@nickvergessen nickvergessen deleted the backport-1594-markdown-support-for-app-descriptions branch January 17, 2017 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@MariusBluem MariusBluem MariusBluem approved these changes

@LukasReschke LukasReschke Awaiting requested review from LukasReschke

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

Assignees
No one assigned
Labels
3. to review Waiting for reviews enhancement feature: apps management
Projects
None yet
Milestone
Nextcloud 11.0.2
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nickvergessen @mention-bot @MorrisJobke @MariusBluem @LukasReschke