Permalink
Switch branches/tags
Nothing to show
Commits on Dec 21, 2012
  1. Restore lost chunks from merge.

    GaretJax committed Dec 21, 2012
Commits on Dec 20, 2012
  1. Merge branch 'master' of git://github.com/coffin/coffin

    Conflicts:
    	coffin/common.py
    	coffin/template/loaders.py
    GaretJax committed Dec 20, 2012
Commits on Nov 14, 2012
  1. Merge pull request #42 from midiotthimble/master

    Multiple values support for JINJA2_DEFAULT_TEMPLATE_EXTENSION
    miracle2k committed Nov 14, 2012
Commits on Nov 13, 2012
Commits on Nov 2, 2012
  1. Merge pull request #41 from midiotthimble/master

    closes #40 -- fix jinja_loader_from_django_loader
    miracle2k committed Nov 2, 2012
Commits on Sep 29, 2012
  1. Merge branch 'release/0.3.7'

    miracle2k committed Sep 29, 2012
  2. makemessages: Support whitespace stripping tags.

    Apparently, makemessages didn't work when trans or pluralize used Jinja2's {%-
    syntax to strip whitespace.
    
    Closes #37.
    dpantele committed with miracle2k Aug 6, 2012
Commits on Jul 16, 2012
  1. Fixed Copy-Paste typo

    dpantele committed Jul 16, 2012
  2. Fixed problems with generic.dates views

    Added Jinja template response mixins
    These mixins are used according to  https://docs.djangoproject.com/en/dev/topics/class-based-views
    Added documentation to coffin generic views
    dpantele committed Jul 16, 2012
Commits on May 30, 2012
  1. Merge pull request #31 from akx/master

    Non-callable globals, custom Django templatetag libraries, *.jinja loader
    miracle2k committed May 30, 2012
Commits on May 29, 2012
  1. Loader wrapper

    A loader wrapper for *.jinja files. Allows any old Django view
    (django.contrib.auth.views.* for instance) to use Coffin for its
    templates.
    akx committed May 29, 2012
  2. Non-callable globals + better Django ttag support

    Adds better support for non-callable globals (such as class instances,
    strings, etc.). Also adds JINJA2_DJANGO_TEMPLATETAG_LIBRARIES, which can
    be an iterable of templatetag library names. Use for `tz`, for instance.
    akx committed May 29, 2012
Commits on Mar 11, 2012
  1. Update README.rst

    GaretJax committed Mar 11, 2012
  2. Merge branch 'master' of github.com:GaretJax/coffin

    Conflicts:
    	coffin/template/loaders.py
    GaretJax committed Mar 11, 2012
  3. Style updates

    GaretJax committed Mar 11, 2012
Commits on Feb 8, 2012
Commits on Feb 7, 2012
  1. Implement the Django 1.3 render() shortcut.

    Closes #21.
    miracle2k committed Feb 7, 2012
  2. Do not override globals provided by extensions.

    Fixes #26, closes #27.
    miracle2k committed Feb 7, 2012
Commits on Feb 5, 2012
  1. Merge pull request #3 from desres/master

    _make_jinja_app_loader needs to return the loader
    GaretJax committed Feb 5, 2012
Commits on Jan 31, 2012
  1. _make_jinja_app_loader needs to return the loader

    U-PC7980F\Jason committed Jan 31, 2012
Commits on Jan 21, 2012
  1. Merge pull request #2 from Eksmo/master

    Support for dynamic TEMPLATE_DIRS and pulled last version of coffin
    GaretJax committed Jan 21, 2012
Commits on Jan 12, 2012
  1. Support for dynamic TEMPLATE_DIRS

    gugu committed Jan 12, 2012
  2. Support for dynamic TEMPLATE_DIRS

    gugu committed Jan 12, 2012
Commits on Dec 28, 2011
  1. Merge remote-tracking branch 'GaretJax/master'

    Conflicts:
    	coffin/template/__init__.py
    gugu committed Dec 28, 2011
Commits on Dec 27, 2011
  1. SyntaxError fix

    teferi committed Dec 27, 2011
Commits on Dec 15, 2011