Skip to content
Commits on Feb 3, 2016
  1. @diox

    Merge pull request #740 from jonklo/develop

    diox committed
    Updated required django-appconf version
  2. @jonklo
Commits on Jan 22, 2016
  1. @diox
  2. @diox
  3. @diox

    Fix pypi badge

    diox committed
  4. @diox

    Merge branch 'master' into develop

    diox committed
    (I merged #726 into master by accident)
  5. @diox

    Merge pull request #726 from thenewguy/patch-1

    diox committed
    return jinja2 template environment per docs
  6. @diox

    Merge pull request #728 from cbjadwani/fix_offline_extends_recursion

    diox committed
    Fix offline extends recursion
  7. @yprez @cbjadwani
Commits on Jan 20, 2016
  1. @cbjadwani

    Remove debug comment

    cbjadwani committed
  2. @cbjadwani
  3. @cbjadwani
  4. @cbjadwani
  5. @cbjadwani
Commits on Jan 19, 2016
  1. @yprez

    Regression test for #718

    yprez committed
  2. @thenewguy
Commits on Jan 10, 2016
  1. @diox

    Merge pull request #723 from salvadormrf/patch-1

    diox committed
    Welcome to 2016
  2. @salvadormrf

    Welcome to 2016

    salvadormrf committed
    Welcome to 2016! :)
    v2.0 (01/07/2015) should be 2016
Commits on Jan 7, 2016
  1. @diox

    Bump version to 2.0

    diox committed
  2. @diox
  3. @diox

    Add changelog for 2.0

    diox committed
  4. @diox
Commits on Dec 26, 2015
  1. @diox

    Merge pull request #716 from karyon/use_override_settings

    diox committed
    Switch remaining tests to use override_settings. Fixes #669
Commits on Dec 25, 2015
  1. @karyon
Commits on Dec 24, 2015
  1. @diox

    Merge pull request #707 from nikolas/patch-2

    diox committed
    remove setup.py classifier for py2.6, add py3.5
  2. @diox

    Merge pull request #715 from diox/switch-tests-to-new-template-settings

    diox committed
    Switch tests to new TEMPLATES setting
  3. @nwilson5 @diox

    Work-around to get compressor working for jinja2 templates in django …

    nwilson5 committed with diox
    …1.8.
    
    Update JINJA2_GET_ENVIRONMENT() to retrieve correct environment for jinja2 backend.
  4. @diox
  5. @diox
  6. @diox
  7. @diox

    Merge pull request #714 from diox/remove-overextends

    diox committed
    Remove test using django-overextends to simplify codebase
  8. @diox
Commits on Dec 23, 2015
  1. @diox

    Merge pull request #708 from nikolas/html5lib-0.9999999

    diox committed
    Update html5lib to 0.9999999 and fix URL
Commits on Dec 16, 2015
  1. @nikolas
  2. @nikolas
Something went wrong with that request. Please try again.