Merge branch 'security'

Conflicts: endpoints/api.py endpoints/web.py
2014-01-23 14:51:43 -05:00 · 2014-01-23 14:51:43 -05:00 · 845985c859
commit 845985c859
parent ea6ec52689 310c98df50
10 changed files with 202 additions and 153 deletions
--- a/templates/base.html
+++ b/templates/base.html
@ -69,6 +69,7 @@

    <script type="text/javascript">
      window.__endpoints = {{ route_data|safe }}.endpoints;
+      window.__token = '{{ csrf_token() }}';
    </script>

    <script src="static/js/app.js"></script>