summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2015-04-02 01:12:48 +0000
committerluxagraf <sng@luxagraf.net>2015-04-02 01:12:48 +0000
commitb8607c2a5d93c494c849e73a50a857e002db8601 (patch)
tree47875e161c50fe1b34e47a67db8f42844a0c2107
parent50fe80969b9ddbfa795b11e303430d58a8e10a8c (diff)
fixed markdown template processor to use standard python markdown
-rw-r--r--app/lib/templatetags/templatetags/markdown.py7
-rw-r--r--config/requirements.txt45
2 files changed, 25 insertions, 27 deletions
diff --git a/app/lib/templatetags/templatetags/markdown.py b/app/lib/templatetags/templatetags/markdown.py
index dca51f2..f14d5e0 100644
--- a/app/lib/templatetags/templatetags/markdown.py
+++ b/app/lib/templatetags/templatetags/markdown.py
@@ -1,9 +1,10 @@
from django import template
-import markdown2 as markdown
+import markdown
register = template.Library()
def do_markdown(text):
- return markdown.markdown(text, safe_mode = False)
-register.filter('markdown', do_markdown) \ No newline at end of file
+ return markdown.markdown(text, extensions=['extra'], safe_mode=False)
+
+register.filter('markdown', do_markdown)
diff --git a/config/requirements.txt b/config/requirements.txt
index b498b14..162e67e 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -1,24 +1,21 @@
-Django==1.6.4
-Markdown==2.4
-Pillow==2.4.0
-PyYAML==3.11
--e git://github.com/mgan59/python-pinboard.git@9e1691fae2c17242a2e081d5d1d486c7e1d90af8#egg=Python_Pinboard-origin/master
-argparse==1.1
-django-extensions==1.3.3
-django-taggit==0.12
-django-typogrify==1.3
-gnureadline==6.3.3
-gunicorn==18.0
-ipython==2.1.0
-jsmin==2.0.9
-oauthlib==0.6.1
-pep8==1.5.6
-psycopg2==2.5.2
-python-dateutil==2.2
-requests==2.1.0
-requests-oauthlib==0.4.0
-simplejson==3.5.2
-six==1.6.1
-smartypants==1.8.3
-twitter-text-py==2.0.2
-twython==3.1.2
+bleach==1.4.1
+Django==1.7.7
+django-bleach==0.3.0
+django-contrib-comments==1.5
+django-extensions==1.5.2
+django-gravatar2==1.2.1
+django-taggit==0.12.3
+gunicorn==19.3.0
+html5lib==0.999
+ipython==3.0.0
+jsmin==2.1.1
+Markdown==2.6.1
+oauthlib==0.7.2
+Pillow==2.7.0
+psycopg2==2.6
+requests==2.6.0
+requests-oauthlib==0.4.2
+six==1.9.0
+smartypants==1.8.6
+twython==3.2.0
+typogrify==2.0.7