From cef9f7690be90cd565213e2f04f6584dcb78e8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Wed, 5 Oct 2016 16:52:14 +0200
Subject: [PATCH] Revert "render messages as markdown"

This reverts commit 65de4ed8d1514a8b49c636e387c546fad8d72fb3.

Looks pretty bad.
---
 conversations/templates/conversations/_message_detail.html    | 4 +---
 conversations/templates/conversations/emails/message.html     | 2 +-
 .../templates/conversations/emails/talk_notification.html     | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conversations/templates/conversations/_message_detail.html b/conversations/templates/conversations/_message_detail.html
index 143407c..090db4f 100644
--- a/conversations/templates/conversations/_message_detail.html
+++ b/conversations/templates/conversations/_message_detail.html
@@ -1,10 +1,8 @@
-{% load proposals_tags %}
-
 <div class="panel panel-{% block panelstyleblock %}default{% endblock %}">
   <div class="panel-heading">
     {{ message.created }} | <a href="{% url 'show-speaker' message.author.username %}">{{ message.author.profile }}</a>
   </div>
   <div class="panel-body">
-    {% markdown message.content %}
+    {{ message.content|linebreaksbr }}
   </div>
 </div>
diff --git a/conversations/templates/conversations/emails/message.html b/conversations/templates/conversations/emails/message.html
index 142d995..af1a03d 100644
--- a/conversations/templates/conversations/emails/message.html
+++ b/conversations/templates/conversations/emails/message.html
@@ -1,4 +1,4 @@
-{% load proposals_tags %}{% markdown content %}
+{{ content|linebreaksbr }}
 
 <hr>
 {% if answering %}
diff --git a/conversations/templates/conversations/emails/talk_notification.html b/conversations/templates/conversations/emails/talk_notification.html
index a8056ae..1db0dae 100644
--- a/conversations/templates/conversations/emails/talk_notification.html
+++ b/conversations/templates/conversations/emails/talk_notification.html
@@ -1,11 +1,11 @@
-{% load proposals_tags %}Hi!<br />
+Hi!<br />
 <br />
 A <a href="https://{{ uri }}">new {{ talk.event }}</a> has been proposed by <a href="https://{{ proposer_uri }}">{{ proposer.profile }}</a>!<br />
 <br />
 Title: {{ talk.title }}<br />
 <br />
 Description:<br />
-<p>{% markdown talk.description %}</p>
+<p>{{ talk.description|linebreaksbr }}</p>
 {% if answering %}
 <hr>
 Reply to this email directly to comment this talk.{% endif %}