Django 1.4.5 #956

wants to merge 7 commits into
Commits on Mar 27, 2013
  1. @ubernostrum @groovecoder

    First draft of Django 1.5 logging configuration.

    ubernostrum committed with groovecoder Feb 1, 2013
    Django 1.5 compatibility: model field definitions and arguments.
    Django 1.5 compatibility: Small typo in log settings.
    Django 1.5 compatibility: Stop importing log_settings since we don't use it anymore.
    Django 1.5 compatibility: Fix JSON field.
    Django compatibility: More model field definitions that got left out of last commit.
    Django compatibility: The big one.
    Django compatibility: more sumo cleanup.
  2. @lmorchard @groovecoder
  3. @groovecoder
  4. @groovecoder
  5. @groovecoder

    restore CSRF in templates

    groovecoder committed Mar 25, 2013
  6. @groovecoder

    Changes from local testing.

    James Socol committed with groovecoder Mar 27, 2013
    Behavior of _ has changed.
    Add STATIC_URL setting.
    This will need to be coordinated with an Apache config change to serve
    admin assets from /static/admin/.
  7. @groovecoder

    fix rebase issue

    groovecoder committed Mar 27, 2013