summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-04-24 18:06:39 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-04-24 18:06:39 +0200
commit8946c1df1b94e277749f5cc9562a5998e0633d58 (patch)
treeffdd7cf49ee804f4d2bc8bf580dd4b9185e08800
parent49b805dade2aa07e68e816ff71d1a09cf13a5160 (diff)
downloadhyperkitty-8946c1df1b94e277749f5cc9562a5998e0633d58.tar.gz
hyperkitty-8946c1df1b94e277749f5cc9562a5998e0633d58.tar.xz
hyperkitty-8946c1df1b94e277749f5cc9562a5998e0633d58.zip
Django 1.4 compatibility
-rw-r--r--hyperkitty.spec2
-rw-r--r--hyperkitty/templates/recent_activities.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/hyperkitty.spec b/hyperkitty.spec
index 0daa41f..fc42e81 100644
--- a/hyperkitty.spec
+++ b/hyperkitty.spec
@@ -131,7 +131,7 @@ rm -f hyperkitty_standalone/__init__.py hyperkitty_standalone/settings_local.py
%{__python} %{_sysconfdir}/%{name}/sites/default/manage.py \
collectstatic --noinput >/dev/null || :
%{__python} %{_sysconfdir}/%{name}/sites/default/manage.py \
- assets build --parse-templates >/dev/null || :
+ assets build --parse-templates &>/dev/null || :
%preun
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index b46f06b..925b076 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+
+{% load url from future %}
{% load hk_generic %}
{% load gravatar %}
{% load storm %}