Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
* | | | | 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 | 2 | -1/+8 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | 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 | 5 | -8/+226 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | |
| * | | | | | | 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 | 1 | -5/+6 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | 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 remote-tracking branch 'wking/keep-trailing-newline' | Armin Ronacher | 2013-05-19 | 5 | -6/+42 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add `keep_trailing_newline` to configure final endline stripping | W. Trevor King | 2013-01-11 | 5 | -5/+40 | |
| |/ / / / / | ||||||
* | | | | | | Added a way to disable memcache error ignoring and documented the change. Al... | Armin Ronacher | 2013-05-19 | 1 | -4/+13 | |
* | | | | | | Merge remote-tracking branch 'kadams54/master' | Armin Ronacher | 2013-05-19 | 1 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixes #181: Handle memcached errors gracefully. | Kyle Adams | 2013-02-18 | 1 | -2/+8 | |
* | | | | | | | Merge pull request #203 from aspiers/master | Armin Ronacher | 2013-05-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Prevent line statements eating newlines (fixes #52) | Adam Spiers | 2013-05-01 | 1 | -1/+1 | |
* | | | | | | | | Python 3 exceptions can handle unicode messages | Alex Morega | 2013-05-18 | 1 | -10/+20 | |
* | | | | | | | | xrange -> range_type for consistency | Armin Ronacher | 2013-05-18 | 1 | -2/+2 | |
* | | | | | | | | Fixed MethodType being wrong on 3.x | Armin Ronacher | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | unit test for dumping as utf-8 to a file | Alex Morega | 2013-05-18 | 1 | -0/+14 | |
* | | | | | | | | | Fixed a type in a module name. | Armin Ronacher | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | | Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch | Armin Ronacher | 2013-05-18 | 4 | -11/+30 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | stuff missing from previous commit, thanks git | Thomas Waldmann | 2013-05-18 | 2 | -6/+4 | |
| * | | | | | | | | new jinja2._compat module for stuff not yet in six 1.3.0 | Thomas Waldmann | 2013-05-18 | 3 | -4/+21 | |
* | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #188 from lemonad/master | Armin Ronacher | 2013-05-18 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fixed typos: overriden to overridden | Jonas Nockert | 2013-02-23 | 2 | -4/+4 | |
| | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Added missing versionadded and changelog entry | Armin Ronacher | 2013-05-18 | 1 | -0/+3 | |
| * | | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-18 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #206 from johnmcdonnell/wordwrap | Armin Ronacher | 2013-05-18 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Allow choice of wrap string in wordwrap filter. | John McDonnell | 2013-05-07 | 1 | -3/+8 | |
| | | | |_|/ / / / / / | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -26/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Python 2.6+ supports conditional expressions. | Cory Benfield | 2013-05-18 | 1 | -24/+7 | |
| * | | | | | | | | | | | BytesIO from six. | Cory Benfield | 2013-05-18 | 1 | -2/+1 |