summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Unified version checks where appropriateArmin Ronacher2013-05-1910-28/+30
* Moved all six usages (ignoring testsuite) into jinja2._compatArmin Ronacher2013-05-1916-183/+199
* Removed mention of speedup module and rewrote docs for markupsafe dependencyArmin Ronacher2013-05-192-47/+5
* Removed bundled markupsafeArmin Ronacher2013-05-197-676/+4
* Fixed a docstring and a syntax error on 3.3Armin Ronacher2013-05-192-4/+4
* six.advance_iterator -> nextArmin Ronacher2013-05-1911-103/+113
* Merge remote-tracking branch 'paradoxxxzero/include_fix'Armin Ronacher2013-05-192-2/+25
|\
| * Support included blocks overrideFlorian Mounier2012-01-052-2/+25
* | Fixed #79Armin Ronacher2013-05-192-3/+27
* | Merge remote-tracking branch 'apollo13/master'Armin Ronacher2013-05-192-2/+23
|\ \
| * | fix previous commit, which was kinda nonfunctionalFlorian Apolloner2012-01-182-5/+12
| * | don't evaluate trans arguments twice.Florian Apolloner2012-01-182-1/+15
* | | Fixed a loop bug. This fixes #100Armin Ronacher2013-05-192-0/+11
* | | Merge pull request #112 from Cito/masterArmin Ronacher2013-05-191-0/+4
|\ \ \
| * | | Add a note about the else statement.Christoph Zwerschke2012-03-211-0/+4
* | | | Merge remote-tracking branch 'Talksum/distribute_required'Armin Ronacher2013-05-191-3/+24
|\ \ \ \
| * | | | adding explicit mention of distribute prerequisite at runtimeMike Chesnut2012-12-181-3/+6
* | | | | Added support for map, select, reject, selectattr and rejectattrArmin Ronacher2013-05-194-1/+286
* | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-191-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #76 from kracekumar/masterArmin Ronacher2013-05-191-1/+1
| |\ \ \ \ \
| | * | | | | Changed three major types to four major types in nodes.pykracekumar2011-11-251-1/+1
* | | | | | | Whitespace normalizationArmin Ronacher2013-05-191-2/+2
|/ / / / / /
* | | | | | Flask -> Jinja2Armin Ronacher2013-05-192-1/+3
* | | | | | Merge pull request #104 from njl/fix-issue-77Armin Ronacher2013-05-191-3/+19
|\ \ \ \ \ \
| * | | | | | Fixes issue #77 by adding explanation to docsNed Jackson Lovely2012-03-121-3/+19
* | | | | | | Merge pull request #94 from florentx/patch-1Armin Ronacher2013-05-191-2/+2
|\ \ \ \ \ \ \
| * | | | | | | typoFlorent Xicluna2012-02-051-1/+1
| * | | | | | | Fix the Mako-like environment.Florent Xicluna2012-02-051-1/+1
* | | | | | | | Merge pull request #114 from cocoatomo/patch-1Armin Ronacher2013-05-191-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | There is no need to initialize Environment#bytecode_cache.cocoatomo2012-04-061-1/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #138 from gazpachoking/default_fixArmin Ronacher2013-05-192-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent default filter from throwing UndefinedError when boolean flag is used...Chase Sterling2012-07-052-1/+2
* | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-193-2/+9
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #149 from dmedvinsky/patch-1Armin Ronacher2013-05-191-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typo in `include` documentationDmitry Medvinsky2012-09-211-1/+1
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #162 from mgax/fix-cachingArmin Ronacher2013-05-192-1/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix DictLoader `uptodate` callbackAlex Morega2012-11-182-1/+8
| | |/ / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'kristi/master'Armin Ronacher2013-05-197-13/+270
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Document the {%+ manual disable lstrip_blocks featureKristi Tsukida2012-07-121-1/+9
| * | | | | | | | | fix tests since lstrip_blocks strips commentsKristi Tsukida2012-07-121-13/+10
| * | | | | | | | | Apply lstrip_blocks to comments (match trim_blocks behavior)Kristi Tsukida2012-07-121-11/+22
| * | | | | | | | | Fix lstrip_blocks testsKristi Tsukida2012-07-121-32/+39
| * | | | | | | | | Don't match variable or comment blocks, Use {%+ to disable lstrip_blocks beha...Kristi Tsukida2012-07-121-8/+27
| * | | | | | | | | add tests for lstrip_blocks optionKristi Tsukida2012-07-121-0/+162
| * | | | | | | | | hash lstrip_blocks in lexer cacheKristi Tsukida2012-07-121-0/+1
| * | | | | | | | | clarify lstrip_blocks optionKristi Tsukida2012-07-101-1/+1
| * | | | | | | | | document `lstrip_blocks`Kristi Tsukida2012-07-101-2/+30
| * | | | | | | | | remove debug codeKristi Tsukida2012-07-101-2/+0
| * | | | | | | | | add lstrip_blocks environment setting, fix lexerKristi Tsukida2012-07-103-6/+20
| * | | | | | | | | lstrip spaces (but not newlines) from block tagsKristi Tsukida2012-07-101-2/+6
| | |/ / / / / / / | |/| | | | | | |