Merge pull request #880 from kawazrepos/879

HipChat連携でMarkdownが展開されないのを修正した closes #879

src/templates/activities/announcements/announcement_created.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.author.nickname }}さんが「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」を書きました</strong>
-<pre>{{  object.body | truncatechars_html:150 }}</pre>
+<pre>{{  object.body | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/blogs/entry_created.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.author.nickname }}さんが「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」を書きました</strong>
-<pre>{{  object.body | truncatechars_html:150 }}</pre>
+<pre>{{  object.body | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/comment_added.hipchat.html

@@ -1,4 +1,2 @@
 <strong>{{ comment.user.nickname }}さんが「{{ comment.content_object }}」にコメントしました <a href="http://{{ site.domain }}{{ comment.get_absolute_url }}">http://{{ site.domain }}{{ comment.get_absolute_url }}</a></strong>
-<pre>
-{{ comment.comment }}
-</pre>
+<pre>{{ comment.comment | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/events/event_created.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.organizer.nickname }}さんが「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」を企画しました</strong>
-<pre>{{  object.body | truncatechars_html:150 }}</pre>
+<pre>{{  object.body | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/personas/persona_activated.hipchat.html

@@ -1,2 +1,2 @@
 <strong><a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.nickname }}</a>さんが入会しました</strong>
-<pre>{{  object.body | truncatechars_html:150 }}</pre>
+<pre>{{  object.body | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/products/product_created.hipchat.html

@@ -1,2 +1,2 @@
 <strong>「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」が公開されました</strong>
-<pre>{{ object.description | truncatechars_html:150 }}</pre>
+<pre>{{ object.description | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/products/product_release_added.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.last_modifier.nickname }}さんが「{{ release.product.title }}」に「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ release.label }}</a>」を追加しました</strong>
-<pre>{{  object.description | truncatechars_html:150 }}</pre>
+<pre>{{ object.description | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/products/product_screenshot_added.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.last_modifier.nickname }}さんが「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」にスクリーンショットを追加しました</strong>
-<pre>{{  object.description | truncatechars_html:150 }}</pre>
+<pre>{{ object.description | kfm | striptags | truncatechars_html:150 }}</pre>

src/templates/activities/projects/project_created.hipchat.html

@@ -1,2 +1,2 @@
 <strong>{{ object.administrator.nickname }}さんが「<a href="http://{{ site.domain }}{{ object.get_absolute_url }}">{{ object.title }}</a>」を発足しました</strong>
-<pre>{{  object.body | truncatechars_html:150 }}</pre>
+<pre>{{ object.body | kfm | striptags | truncatechars_html:150 }}</pre>