summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-193-6/+11
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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 pull request #159 from myle/patch-1Armin Ronacher2013-05-191-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update docs/templates.rstDimitris Leventeas2012-11-011-0/+4
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #141 from dgilman/patch-1Armin Ronacher2013-05-191-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix FAQ typoDavid Gilman2012-07-211-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #173 from kracekumar/patch-1Armin Ronacher2013-05-190-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update jinja2/filters.pykracekumar2013-01-151-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'wking/keep-trailing-newline'Armin Ronacher2013-05-197-7/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add `keep_trailing_newline` to configure final endline strippingW. Trevor King2013-01-117-6/+45
| |/ / / / / / / /
* | | | | | | | | Added a way to disable memcache error ignoring and documented the change. Al...Armin Ronacher2013-05-192-4/+14
* | | | | | | | | 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
* | | | | | | | | | | Merge pull request #166 from rtorr/patch-1Armin Ronacher2013-05-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update docs/tricks.rstRichard2012-11-301-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Removed dummy readmesprint-branchArmin Ronacher2013-05-181-1/+0
* | | | | | | | | | | Merge pull request #222 from mgax/exception-messagesArmin Ronacher2013-05-181-10/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Python 3 exceptions can handle unicode messagesAlex Morega2013-05-181-10/+20
* | | | | | | | | | | | Removed a refrence to removed debugsupport in the manifestArmin Ronacher2013-05-181-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | xrange -> range_type for consistencyArmin Ronacher2013-05-181-2/+2
* | | | | | | | | | | Added 3.3Armin Ronacher2013-05-181-0/+1
* | | | | | | | | | | Removed 2.5 for travis on the new branchArmin Ronacher2013-05-181-1/+0
* | | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-181-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #219 from sharoonthomas/masterArmin Ronacher2013-05-181-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add Travis CISharoon Thomas2013-05-181-0/+8
| |/ / / / / / / / / / /
* | | | | | | | | | | | 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-185-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #163 from kuyan/patch-1Armin Ronacher2013-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed typoNatan L2012-11-221-1/+1
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #188 from lemonad/masterArmin Ronacher2013-05-184-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed typos: overriden to overriddenJonas Nockert2013-02-234-6/+6
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-182-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Added missing versionadded and changelog entryArmin Ronacher2013-05-182-0/+5
| * | | | | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-181-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status