| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'release/1.4'1.4 | Mathieu Pillard | 2014-05-20 | 88 | -778/+2561 |
| |\ | |||||
| | * | Touch up changelog for 1.4: add missing entries, sort them etc. | Mathieu Pillard | 2014-05-18 | 1 | -15/+21 |
| | * | Merge pull request #521 from diox/avoid-compressing-same-block-twice | Mathieu Pillard | 2014-05-18 | 3 | -0/+36 |
| | |\ | |||||
| | | * | Avoid re-processing a block that is already in the manifest when compressing ... | Mathieu Pillard | 2014-05-18 | 3 | -0/+36 |
| | |/ | |||||
| | * | Merge pull request #491 from cbjadwani/develop | Mathieu Pillard | 2014-05-18 | 7 | -98/+174 |
| | |\ | |||||
| | | * | Add tests for offline compression with compress tag in base template | Chirag Jadwani | 2014-04-20 | 4 | -0/+63 |
| | | * | Update offline compression tests for multiple inheritance | Chirag Jadwani | 2014-04-20 | 2 | -1/+8 |
| | | * | Fix template inheritance and other bugs in offline compression | Chirag Jadwani | 2014-04-20 | 2 | -97/+103 |
| | * | | Merge pull request #511 from alexcouper/add_changelog | Mathieu Pillard | 2014-05-10 | 1 | -5/+36 |
| | |\ \ | |||||
| | | * | | Add version 1.4 changelog docs. | Alex Couper | 2014-04-23 | 1 | -5/+36 |
| | * | | | Merge pull request #518 from alex/patch-1 | Mathieu Pillard | 2014-05-10 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | * | | | Mark this as a universal wheel | Alex Gaynor | 2014-05-10 | 1 | -0/+2 |
| | |/ / / | |||||
| | * | | | Merge pull request #517 from programmdesign/patch-1 | Mathieu Pillard | 2014-05-10 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Update jinja2.txt | Christoph Neumann | 2014-05-10 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #515 from lukaszb/patch-1 | Jannis Leidel | 2014-04-30 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Typo | Lukasz Balcerzak | 2014-04-29 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #498 from mikebryant/wip-493 | Mathieu Pillard | 2014-04-23 | 1 | -6/+3 |
| | |\ \ | |||||
| | | * | | Relax the test for a configured CachedLoader. Fixes #493. | Mike Bryant | 2014-04-22 | 1 | -6/+3 |
| | |/ / | |||||
| | * | | Merge branch 'develop' of github.com:django-compressor/django-compressor into... | Jannis Leidel | 2014-04-22 | 45 | -159/+983 |
| | |\ \ | |||||
| | | * | | Don't fail if jinja2 isn't present and JINJA2_GET_ENVIRONMENT() is called | Mathieu Pillard | 2014-04-20 | 1 | -2/+5 |
| | | |/ | |||||
| | | * | Merge pull request #489 from adamjforster/cache-key-function-docs | Mathieu Pillard | 2014-04-19 | 1 | -0/+8 |
| | | |\ | |||||
| | | | * | Document settings.COMPRESS_CACHE_KEY_FUNCTION | Adam J. Forster | 2014-03-18 | 1 | -0/+8 |
| | | * | | Merge pull request #488 from lucastan/develop | Mathieu Pillard | 2014-04-19 | 43 | -158/+971 |
| | | |\ \ | |||||
| | | | * | | updated docs for Jinja2 offline compression | Lucas Tan | 2014-04-06 | 1 | -2/+136 |
| | | | * | | added myself to AUTHORS | Lucas Tan | 2014-04-06 | 1 | -0/+1 |
| | | | * | | added explanation for Python 3 compat issues | Lucas Tan | 2014-04-06 | 1 | -2/+15 |
| | | | * | | import unittest from django.utils for python 2.6 compat | Lucas Tan | 2014-04-06 | 1 | -2/+1 |
| | | | * | | changed skipUnless to skipIf for python 2.6 | Lucas Tan | 2014-04-05 | 1 | -1/+1 |
| | | | * | | fixed for python 2.6 | Lucas Tan | 2014-04-05 | 1 | -1/+1 |
| | | | * | | attempt to fix python 2.6 issues | Lucas Tan | 2014-04-05 | 3 | -270/+280 |
| | | | * | | drop support for Jinja2 for Python 3.2 | Lucas Tan | 2014-04-05 | 2 | -15/+8 |
| | | | * | | fixed support for python 2.6 | Lucas Tan | 2014-04-05 | 3 | -7/+10 |
| | | | * | | fixed previous commit by testing exactly for 3.2 | Lucas Tan | 2014-04-05 | 1 | -2/+4 |
| | | | * | | skip Jingo and Coffin tests for Python 3.2+ | Lucas Tan | 2014-04-05 | 1 | -1/+2 |
| | | | * | | added support for Python 3.2 by using Jinja 2.6 | Lucas Tan | 2014-04-05 | 2 | -11/+14 |
| | | | * | | skip tests for certain versions of Python | Lucas Tan | 2014-04-05 | 1 | -1/+11 |
| | | | * | | fixed Python 3 compat issue | Lucas Tan | 2014-04-05 | 1 | -1/+1 |
| | | | * | | fixed missing tests dependencies | Lucas Tan | 2014-04-05 | 1 | -0/+4 |
| | | | * | | fixed style | Lucas Tan | 2014-04-05 | 2 | -2/+2 |
| | | | * | | ignore E131 | Lucas Tan | 2014-04-05 | 1 | -1/+1 |
| | | | * | | fixed styles | Lucas Tan | 2014-04-05 | 4 | -10/+10 |
| | | | * | | removed extra blank lines (suspected to cause E901) | Lucas Tan | 2014-04-05 | 2 | -2/+0 |
| | | | * | | removed usage of JINJA2_FORCED | Lucas Tan | 2014-03-22 | 4 | -9/+8 |
| | | | * | | reduced code verbosity and duplication | Lucas Tan | 2014-03-22 | 1 | -9/+11 |
| | | | * | | fixed import paths | Lucas Tan | 2014-03-22 | 1 | -2/+2 |
| | | | * | | fixed jinja2: allow offline context to override globals | Lucas Tan | 2014-03-22 | 3 | -5/+16 |
| | | | * | | fixed template dirs | Lucas Tan | 2014-03-22 | 1 | -6/+5 |
| | | | * | | fixed import paths | Lucas Tan | 2014-03-22 | 3 | -2/+4 |
| | | | * | | moved files to offline module | Lucas Tan | 2014-03-22 | 2 | -0/+0 |
| | | | * | | added new lines at the end of files | Lucas Tan | 2014-03-22 | 2 | -2/+2 |
