Permalink
Commits on Mar 6, 2015
  1. Merge pull request #65 from Osmose/contribute.json

    jsocol committed Mar 6, 2015
    Add contribute.json file.
Commits on Mar 4, 2015
  1. Add contribute.json file.

    Osmose committed Mar 4, 2015
Commits on Dec 5, 2014
  1. Merge pull request #62 from robhudson/django17

    jsocol committed Dec 5, 2014
    Updated to work around StrAndUnicode removal in 1.7 (fixes #61)
Commits on Oct 21, 2014
  1. Fixes for review feedback

    robhudson committed Oct 21, 2014
Commits on Oct 8, 2014
Commits on Jun 24, 2014
  1. Start updating CHANGELOG

    jsocol committed Jun 24, 2014
  2. Python3 moved this.

    jsocol committed Jun 24, 2014
  3. Assume less order

    jsocol committed Jun 24, 2014
Commits on Jan 7, 2014
  1. Version 0.7.

    James Socol committed Jan 7, 2014
  2. Unpin tox versions.

    James Socol committed Jan 7, 2014
Commits on Nov 27, 2013
  1. Merge pull request #49 from dpoirier/document-templates-from-strings

    jsocol committed Nov 27, 2013
    Document how to use Jingo when template is in a string
Commits on Nov 17, 2013
  1. Merge pull request #48 from magopian/tox

    davedash committed Nov 17, 2013
    use tox
Commits on Nov 15, 2013
  1. use tox

    magopian committed Nov 15, 2013
Commits on Sep 9, 2013
  1. Merge pull request #43 from berkerpeksag/py3-support

    jsocol committed Sep 9, 2013
    Add Python 3 support.
Commits on Aug 22, 2013
  1. Add Python 3 support.

    berkerpeksag committed Jun 11, 2013
Commits on Aug 21, 2013
Commits on Jul 29, 2013
  1. Revert "Split template_name into dirname and basename."

    jsocol committed Jul 29, 2013
    This reverts commit 962754e.
Commits on Jul 28, 2013
  1. Split template_name into dirname and basename.

    jsocol committed Jul 28, 2013
    I believe this is closer to what we intend the behavior to be. For
    example, if you have the following setting:
    
        JINGO_EXCLUDE_APPS = (
            'admin,
            'myapp/admin',
            'myapp/email',
        )
    
    Then templates in the `myapp/` prefix will be rendered with Jinja2 but
    templates in the subdirectories `myapp/admin/` and `myapp/email/` will
    be rendered with Django.
Commits on Jul 10, 2013
  1. Merge pull request #37 from berkerpeksag/readme-update

    jsocol committed Jul 10, 2013
    Readme update
  2. Fix a typo.

    berkerpeksag committed Jul 10, 2013
  3. Update README.rst.

    berkerpeksag committed Apr 26, 2013
    - Add a note about the RTFD link
    - Sync with docs/index.rst
    - Fix the automodule usage in README.rst.
  4. Merge pull request #40 from berkerpeksag/unused-import

    jsocol committed Jul 10, 2013
    Remove unused import "patch".
  5. Merge pull request #41 from berkerpeksag/fix-deprecated-function

    jsocol committed Jul 10, 2013
    django.conf.urls.defaults is deprecated.
Commits on Jun 6, 2013
  1. Fix field_attrs test.

    jsocol committed Jun 6, 2013
Commits on May 18, 2013
  1. Copyright updates for 2013.

    berkerpeksag committed with Dave Dash Apr 26, 2013