Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fixed a docstring and a syntax error on 3.3 | Armin Ronacher | 2013-05-19 | 2 | -4/+4 | |
* | six.advance_iterator -> next | Armin Ronacher | 2013-05-19 | 11 | -103/+113 | |
* | Merge remote-tracking branch 'paradoxxxzero/include_fix' | Armin Ronacher | 2013-05-19 | 2 | -2/+25 | |
|\ | ||||||
| * | Support included blocks override | Florian Mounier | 2012-01-05 | 2 | -2/+25 | |
* | | Fixed #79 | Armin Ronacher | 2013-05-19 | 2 | -3/+27 | |
* | | Merge remote-tracking branch 'apollo13/master' | Armin Ronacher | 2013-05-19 | 2 | -2/+23 | |
|\ \ | ||||||
| * | | fix previous commit, which was kinda nonfunctional | Florian Apolloner | 2012-01-18 | 2 | -5/+12 | |
| * | | don't evaluate trans arguments twice. | Florian Apolloner | 2012-01-18 | 2 | -1/+15 | |
* | | | Fixed a loop bug. This fixes #100 | Armin Ronacher | 2013-05-19 | 2 | -0/+11 | |
* | | | Merge pull request #112 from Cito/master | Armin Ronacher | 2013-05-19 | 1 | -0/+4 | |
|\ \ \ | ||||||
| * | | | Add a note about the else statement. | Christoph Zwerschke | 2012-03-21 | 1 | -0/+4 | |
* | | | | Merge remote-tracking branch 'Talksum/distribute_required' | Armin Ronacher | 2013-05-19 | 1 | -3/+24 | |
|\ \ \ \ | ||||||
| * | | | | adding explicit mention of distribute prerequisite at runtime | Mike Chesnut | 2012-12-18 | 1 | -3/+6 | |
* | | | | | Added support for map, select, reject, selectattr and rejectattr | Armin Ronacher | 2013-05-19 | 4 | -1/+286 | |
* | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #76 from kracekumar/master | Armin Ronacher | 2013-05-19 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Changed three major types to four major types in nodes.py | kracekumar | 2011-11-25 | 1 | -1/+1 | |
* | | | | | | | Whitespace normalization | Armin Ronacher | 2013-05-19 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Flask -> Jinja2 | Armin Ronacher | 2013-05-19 | 2 | -1/+3 | |
* | | | | | | Merge pull request #104 from njl/fix-issue-77 | Armin Ronacher | 2013-05-19 | 1 | -3/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixes issue #77 by adding explanation to docs | Ned Jackson Lovely | 2012-03-12 | 1 | -3/+19 | |
* | | | | | | | Merge pull request #94 from florentx/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | typo | Florent Xicluna | 2012-02-05 | 1 | -1/+1 | |
| * | | | | | | | Fix the Mako-like environment. | Florent Xicluna | 2012-02-05 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #114 from cocoatomo/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | There is no need to initialize Environment#bytecode_cache. | cocoatomo | 2012-04-06 | 1 | -1/+0 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #138 from gazpachoking/default_fix | Armin Ronacher | 2013-05-19 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Prevent default filter from throwing UndefinedError when boolean flag is used... | Chase Sterling | 2012-07-05 | 2 | -1/+2 | |
* | | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-19 | 3 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #149 from dmedvinsky/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix typo in `include` documentation | Dmitry Medvinsky | 2012-09-21 | 1 | -1/+1 | |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #162 from mgax/fix-caching | Armin Ronacher | 2013-05-19 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | fix DictLoader `uptodate` callback | Alex Morega | 2012-11-18 | 2 | -1/+8 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | Merge remote-tracking branch 'kristi/master' | Armin Ronacher | 2013-05-19 | 7 | -13/+270 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Document the {%+ manual disable lstrip_blocks feature | Kristi Tsukida | 2012-07-12 | 1 | -1/+9 | |
| * | | | | | | | | | fix tests since lstrip_blocks strips comments | Kristi Tsukida | 2012-07-12 | 1 | -13/+10 | |
| * | | | | | | | | | Apply lstrip_blocks to comments (match trim_blocks behavior) | Kristi Tsukida | 2012-07-12 | 1 | -11/+22 | |
| * | | | | | | | | | Fix lstrip_blocks tests | Kristi Tsukida | 2012-07-12 | 1 | -32/+39 | |
| * | | | | | | | | | Don't match variable or comment blocks, Use {%+ to disable lstrip_blocks beha... | Kristi Tsukida | 2012-07-12 | 1 | -8/+27 | |
| * | | | | | | | | | add tests for lstrip_blocks option | Kristi Tsukida | 2012-07-12 | 1 | -0/+162 | |
| * | | | | | | | | | hash lstrip_blocks in lexer cache | Kristi Tsukida | 2012-07-12 | 1 | -0/+1 | |
| * | | | | | | | | | clarify lstrip_blocks option | Kristi Tsukida | 2012-07-10 | 1 | -1/+1 | |
| * | | | | | | | | | document `lstrip_blocks` | Kristi Tsukida | 2012-07-10 | 1 | -2/+30 | |
| * | | | | | | | | | remove debug code | Kristi Tsukida | 2012-07-10 | 1 | -2/+0 | |
| * | | | | | | | | | add lstrip_blocks environment setting, fix lexer | Kristi Tsukida | 2012-07-10 | 3 | -6/+20 | |
| * | | | | | | | | | lstrip spaces (but not newlines) from block tags | Kristi Tsukida | 2012-07-10 | 1 | -2/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-19 | 3 | -6/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #165 from AquarHEAD/master | Armin Ronacher | 2013-05-19 | 1 | -5/+6 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | update the Docstring of do_truncate, add useful examples | AquarHEAD L | 2012-11-26 | 1 | -5/+6 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #159 from myle/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ |