From: Charles Connell <charles@connells.org>
Date: Wed, 12 Mar 2014 22:28:06 +0000 (-0400)
Subject: Merge branch 'master' into quizzes
X-Git-Tag: release-20150131~148^2^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2700d520d0274924f86d5124318f310d6d9ad0f5;p=oweals%2Fkarmaworld.git

Merge branch 'master' into quizzes
---

2700d520d0274924f86d5124318f310d6d9ad0f5
diff --cc karmaworld/templates/notes/note_detail.html
index 7b1cabe,f24dd5a..5a90f6f
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@@ -20,11 -24,9 +20,12 @@@
      var csrf_token = "{{ csrf_token }}";
    </script>
    <script src="{{ STATIC_URL }}js/setup-ajax.js"></script>
 +{% endblock %}
 +
 +{% block bodyscripts %}
    <script src="{{ STATIC_URL }}js/note-detail.js" ></script>
    <script src="{{ STATIC_URL }}js/pxem.jQuery.js"></script>
+   <script src="{{ STATIC_URL }}js/marked.js" ></script>
  {% endblock %}
  
  {% block content %}
diff --cc karmaworld/urls.py
index 6f2046b,3697277..677e4a7
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -19,8 -19,8 +19,9 @@@ from karmaworld.apps.notes.views impor
  from karmaworld.apps.notes.views import RawNoteDetailView
  from karmaworld.apps.moderation import moderator
  from karmaworld.apps.document_upload.views import save_fp_upload
 +from karmaworld.apps.quizzes.views import QuizView, KeywordEditView, quiz_answer
  from karmaworld.apps.users.views import ProfileView
+ from karmaworld.apps.users.views import ControlView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf