summaryrefslogtreecommitdiff
path: root/jinja2
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* | | | 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-192-1/+8
|\ \ \ \ \
| * \ \ \ \ 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-195-8/+226
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
| * | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-191-5/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #165 from AquarHEAD/masterArmin Ronacher2013-05-191-5/+6
| |\ \ \ \ \ \
| | * | | | | | update the Docstring of do_truncate, add useful examplesAquarHEAD L2012-11-261-5/+6
| | | |/ / / / | | |/| | | |
* | | | | | | Merge remote-tracking branch 'wking/keep-trailing-newline'Armin Ronacher2013-05-195-6/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add `keep_trailing_newline` to configure final endline strippingW. Trevor King2013-01-115-5/+40
| |/ / / / /
* | | | | | Added a way to disable memcache error ignoring and documented the change. Al...Armin Ronacher2013-05-191-4/+13
* | | | | | Merge remote-tracking branch 'kadams54/master'Armin Ronacher2013-05-191-2/+8
|\ \ \ \ \ \
| * | | | | | Fixes #181: Handle memcached errors gracefully.Kyle Adams2013-02-181-2/+8
* | | | | | | Merge pull request #203 from aspiers/masterArmin Ronacher2013-05-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Prevent line statements eating newlines (fixes #52)Adam Spiers2013-05-011-1/+1
* | | | | | | | Python 3 exceptions can handle unicode messagesAlex Morega2013-05-181-10/+20
* | | | | | | | xrange -> range_type for consistencyArmin Ronacher2013-05-181-2/+2
* | | | | | | | Fixed MethodType being wrong on 3.xArmin Ronacher2013-05-181-1/+1
* | | | | | | | Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branchArmin Ronacher2013-05-181-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | unit test for dumping as utf-8 to a fileAlex Morega2013-05-181-0/+14
* | | | | | | | | Fixed a type in a module name.Armin Ronacher2013-05-181-1/+1
* | | | | | | | | Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branchArmin Ronacher2013-05-184-11/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | stuff missing from previous commit, thanks gitThomas Waldmann2013-05-182-6/+4
| * | | | | | | | new jinja2._compat module for stuff not yet in six 1.3.0Thomas Waldmann2013-05-183-4/+21
* | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-182-4/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #188 from lemonad/masterArmin Ronacher2013-05-182-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed typos: overriden to overriddenJonas Nockert2013-02-232-4/+4
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-181-3/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Added missing versionadded and changelog entryArmin Ronacher2013-05-181-0/+3
| * | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-181-3/+8
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #206 from johnmcdonnell/wordwrapArmin Ronacher2013-05-181-3/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Allow choice of wrap string in wordwrap filter.John McDonnell2013-05-071-3/+8
| | | | |_|/ / / / / / | | | |/| | | | | | |
* | | | | | | | | | | Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branchArmin Ronacher2013-05-182-26/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Python 2.6+ supports conditional expressions.Cory Benfield2013-05-181-24/+7
| * | | | | | | | | | | BytesIO from six.Cory Benfield2013-05-181-2/+1