Merge pull request #121 from a8/tiny_fixes

Tiny fixes * isodate in requirements.txt * script declaration in timeline.html
tobami · Aug 22, 2012 · 01317c6 · 01317c6
2 parents 5b73c97 + 6edb48f
commit 01317c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/codespeed/templates/codespeed/timeline.html b/codespeed/templates/codespeed/timeline.html
@@ -101,11 +101,11 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.categoryAxisRenderer.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasTextRenderer.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}js/timeline.js"></script>
-
 <script type="text/javascript">
   var CHANGES_URL = "{% url changes %}";
-
+</script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/timeline.js"></script>
+<script type="text/javascript">
   $(function() {
     Timeline.init({
       revisions: {{ defaultlast }},

diff --git a/example/requirements.txt b/example/requirements.txt
@@ -1,4 +1,5 @@
 Django>=1.3
 South>=0.7.3
--e git://github.com/toastdriven/django-tastypie.git@d9c86299118b4a1db9f646018169c1c45fd065df#egg=django-tastypie
+isodate==0.4.8
+-e git://github.com/toastdriven/django-tastypie.git@5397dec04fe83092a56ba14a843731f2aa08184d#egg=django-tastypie
 #-e git://github.com/robhudson/django-debug-toolbar.git#egg=django-debug-toolbar