summaryrefslogtreecommitdiff
path: root/jinja2
Commit message (Expand)AuthorAgeFilesLines
* Removed unnecessary delArmin Ronacher2013-05-191-1/+0
* Added unicode mixin for unified string logicArmin Ronacher2013-05-195-51/+21
* PY3 -> PY2 macroArmin Ronacher2013-05-199-57/+94
* Rewrapped importArmin Ronacher2013-05-191-1/+2
* 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 bundled markupsafeArmin Ronacher2013-05-196-673/+2
* 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
* | | Added support for map, select, reject, selectattr and rejectattrArmin Ronacher2013-05-193-1/+284
* | | 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