summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/1.4'1.4Mathieu Pillard2014-05-2088-778/+2561
|\
| * Touch up changelog for 1.4: add missing entries, sort them etc.Mathieu Pillard2014-05-181-15/+21
| * Merge pull request #521 from diox/avoid-compressing-same-block-twiceMathieu Pillard2014-05-183-0/+36
| |\
| | * Avoid re-processing a block that is already in the manifest when compressing ...Mathieu Pillard2014-05-183-0/+36
| |/
| * Merge pull request #491 from cbjadwani/developMathieu Pillard2014-05-187-98/+174
| |\
| | * Add tests for offline compression with compress tag in base templateChirag Jadwani2014-04-204-0/+63
| | * Update offline compression tests for multiple inheritanceChirag Jadwani2014-04-202-1/+8
| | * Fix template inheritance and other bugs in offline compressionChirag Jadwani2014-04-202-97/+103
| * | Merge pull request #511 from alexcouper/add_changelogMathieu Pillard2014-05-101-5/+36
| |\ \
| | * | Add version 1.4 changelog docs.Alex Couper2014-04-231-5/+36
| * | | Merge pull request #518 from alex/patch-1Mathieu Pillard2014-05-101-0/+2
| |\ \ \
| | * | | Mark this as a universal wheelAlex Gaynor2014-05-101-0/+2
| |/ / /
| * | | Merge pull request #517 from programmdesign/patch-1Mathieu Pillard2014-05-101-1/+1
| |\ \ \
| | * | | Update jinja2.txtChristoph Neumann2014-05-101-1/+1
| |/ / /
| * | | Merge pull request #515 from lukaszb/patch-1Jannis Leidel2014-04-301-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | TypoLukasz Balcerzak2014-04-291-1/+1
| |/ /
| * | Merge pull request #498 from mikebryant/wip-493Mathieu Pillard2014-04-231-6/+3
| |\ \
| | * | Relax the test for a configured CachedLoader. Fixes #493.Mike Bryant2014-04-221-6/+3
| |/ /
| * | Merge branch 'develop' of github.com:django-compressor/django-compressor into...Jannis Leidel2014-04-2245-159/+983
| |\ \
| | * | Don't fail if jinja2 isn't present and JINJA2_GET_ENVIRONMENT() is calledMathieu Pillard2014-04-201-2/+5
| | |/
| | * Merge pull request #489 from adamjforster/cache-key-function-docsMathieu Pillard2014-04-191-0/+8
| | |\
| | | * Document settings.COMPRESS_CACHE_KEY_FUNCTIONAdam J. Forster2014-03-181-0/+8
| | * | Merge pull request #488 from lucastan/developMathieu Pillard2014-04-1943-158/+971
| | |\ \
| | | * | updated docs for Jinja2 offline compressionLucas Tan2014-04-061-2/+136
| | | * | added myself to AUTHORSLucas Tan2014-04-061-0/+1
| | | * | added explanation for Python 3 compat issuesLucas Tan2014-04-061-2/+15
| | | * | import unittest from django.utils for python 2.6 compatLucas Tan2014-04-061-2/+1
| | | * | changed skipUnless to skipIf for python 2.6Lucas Tan2014-04-051-1/+1
| | | * | fixed for python 2.6Lucas Tan2014-04-051-1/+1
| | | * | attempt to fix python 2.6 issuesLucas Tan2014-04-053-270/+280
| | | * | drop support for Jinja2 for Python 3.2Lucas Tan2014-04-052-15/+8
| | | * | fixed support for python 2.6Lucas Tan2014-04-053-7/+10
| | | * | fixed previous commit by testing exactly for 3.2Lucas Tan2014-04-051-2/+4
| | | * | skip Jingo and Coffin tests for Python 3.2+Lucas Tan2014-04-051-1/+2
| | | * | added support for Python 3.2 by using Jinja 2.6Lucas Tan2014-04-052-11/+14
| | | * | skip tests for certain versions of PythonLucas Tan2014-04-051-1/+11
| | | * | fixed Python 3 compat issueLucas Tan2014-04-051-1/+1
| | | * | fixed missing tests dependenciesLucas Tan2014-04-051-0/+4
| | | * | fixed styleLucas Tan2014-04-052-2/+2
| | | * | ignore E131Lucas Tan2014-04-051-1/+1
| | | * | fixed stylesLucas Tan2014-04-054-10/+10
| | | * | removed extra blank lines (suspected to cause E901)Lucas Tan2014-04-052-2/+0
| | | * | removed usage of JINJA2_FORCEDLucas Tan2014-03-224-9/+8
| | | * | reduced code verbosity and duplicationLucas Tan2014-03-221-9/+11
| | | * | fixed import pathsLucas Tan2014-03-221-2/+2
| | | * | fixed jinja2: allow offline context to override globalsLucas Tan2014-03-223-5/+16
| | | * | fixed template dirsLucas Tan2014-03-221-6/+5
| | | * | fixed import pathsLucas Tan2014-03-223-2/+4
| | | * | moved files to offline moduleLucas Tan2014-03-222-0/+0
| | | * | added new lines at the end of filesLucas Tan2014-03-222-2/+2