summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates/base.html
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-03-05 01:50:11 -0800
committerAurélien Bompard <aurelien@bompard.org>2013-03-05 01:50:11 -0800
commite5d3e7e34d0b1dddf5d776735edc0173d7061aff (patch)
treeffb91d271b638fdcb2713675a9f4e7ec18384afe /hyperkitty/templates/base.html
parent794676f241a284a2df95b57224aa7f9165f058e0 (diff)
parent331ea452fa1186e096e3a905b2b729a599d07b42 (diff)
downloadhyperkitty-e5d3e7e34d0b1dddf5d776735edc0173d7061aff.tar.gz
hyperkitty-e5d3e7e34d0b1dddf5d776735edc0173d7061aff.tar.xz
hyperkitty-e5d3e7e34d0b1dddf5d776735edc0173d7061aff.zip
Merge pull request #2 from aslakknutsen/graph
Change Activity Graph from Protovis to d3 (#43)
Diffstat (limited to 'hyperkitty/templates/base.html')
-rw-r--r--hyperkitty/templates/base.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index 98450f5..c63b7be 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -73,7 +73,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script>
<script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script>
- {% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %}
+ {% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/d3.v2.min.js", "js/hyperkitty.js" %}
<script src="{{ ASSET_URL }}"></script>
{% endassets %}
{% block additionaljs %} {% endblock %}