search

devhub-tud / devhub

DevHub is a software system designed to give students a simple practical introduction into modern software development.
15 stars 8 forks source link

add preview panel for comments #393

Closed DouweKoopmans closed 8 years ago

coveralls commented 8 years ago

Coverage Status

Coverage increased (+0.1%) to 56.903% when pulling 3273ddd1db144dcb6ab0e010a027b2f621281503 on previewPanel into 70e815ac49b5ae57025d91fbd036fafcb6264192 on master.

jwgmeligmeyling commented 8 years ago

I expected this to continue on #391, are there potential merge conflicts I should take in to consideration when merging this?

DouweKoopmans commented 8 years ago

there are no merge conflicts between this branch and #391, however in order for markdown to be displayed in previews the markdown parser needs to be applied to the previewed content first.

I'd suggest we first merge this branch, I will then be able to apply any fixes to #391 so markdown is also used in previews, after this #391 should be ready to be merged aswel.

Fastjur commented 8 years ago

I suggest merging this into your local #391 (MarkdownRendering). In case of conflicts you can fix these locally and push to this remote branch again, which then can be merged into master effortlessly (and makes the WIP #391 redundant)

jwgmeligmeyling commented 8 years ago

Please rebase on the Markdown branch, we will use PR #400