| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Clarified some text in the intro | Armin Ronacher | 2013-05-20 | 1 | -2/+2 |
| | | |||||
| * | Documented loop.depth and added loop.depth0. | Armin Ronacher | 2013-05-20 | 1 | -0/+6 |
| | | |||||
| * | Removed mention of speedup module and rewrote docs for markupsafe dependency | Armin Ronacher | 2013-05-19 | 2 | -47/+5 |
| | | |||||
| * | Merge pull request #112 from Cito/master | Armin Ronacher | 2013-05-19 | 1 | -0/+4 |
| |\ | | | | | Addition/correction for pull request #69 - add note to docs | ||||
| | * | 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 |
| | | | | |||||
| * | | | Whitespace normalization | Armin Ronacher | 2013-05-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Flask -> Jinja2 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #104 from njl/fix-issue-77 | Armin Ronacher | 2013-05-19 | 1 | -3/+19 |
| |\ \ \ | | | | | | | | | Fix issue #77 | ||||
| | * | | | Fixes issue #77 by adding explanation to docs | Ned Jackson Lovely | 2012-03-12 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | Points out that the Django empty is replaced by the Flask else. | ||||
| * | | | | Merge pull request #94 from florentx/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix the Mako-like environment. | ||||
| | * | | | | typo | Florent Xicluna | 2012-02-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix the Mako-like environment. | Florent Xicluna | 2012-02-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #149 from dmedvinsky/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix typo in `include` documentation | ||||
| | | * | | | | | Fix typo in `include` documentation | Dmitry Medvinsky | 2012-09-21 | 1 | -1/+1 |
| | | | |_|/ / | | |/| | | | |||||
| * | | | | | | Merge remote-tracking branch 'kristi/master' | Armin Ronacher | 2013-05-19 | 1 | -5/+43 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Document the {%+ manual disable lstrip_blocks feature | Kristi Tsukida | 2012-07-12 | 1 | -1/+9 |
| | | | | | | | |||||
| | * | | | | | document `lstrip_blocks` | Kristi Tsukida | 2012-07-10 | 1 | -2/+30 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-19 | 2 | -1/+5 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #159 from myle/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -0/+4 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Update docs/templates.rst | ||||
| | | * | | | | | Update docs/templates.rst | Dimitris Leventeas | 2012-11-01 | 1 | -0/+4 |
| | | |/ / / / | | | | | | | | | | | | | Loop (recursive) --> Another loop -> loop(...) | ||||
| | * | | | | | Merge pull request #141 from dgilman/patch-1 | Armin Ronacher | 2013-05-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix FAQ typo | ||||
| | | * | | | | | Fix FAQ typo | David Gilman | 2012-07-21 | 1 | -1/+1 |
| | | |/ / / / | |||||
| * | | | | | | Merge remote-tracking branch 'wking/keep-trailing-newline' | Armin Ronacher | 2013-05-19 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Add `keep_trailing_newline` to configure final endline stripping | W. Trevor King | 2013-01-11 | 1 | -1/+3 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option defaults to False for compatibility with the existing behaviour. I've added the option because I expect I won't remember to keep an extra trailing newline in my templates, and some non-HTML templates *need* that last newline. See also: https://groups.google.com/d/msg/pocoo-libs/6DylMqq1voI/GXTbZJ1Tr-sJ | ||||
| * | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #163 from kuyan/patch-1 | Armin Ronacher | 2013-05-18 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed typo | ||||
| | | * | | | | | Fixed typo | Natan L | 2012-11-22 | 1 | -1/+1 |
| | | |/ / / / | | | | | | | | | | | | | 'ore' > 'or' | ||||
| | * | | | | | Merge pull request #188 from lemonad/master | Armin Ronacher | 2013-05-18 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed typos: overriden to overridden | ||||
| | | * | | | | | Fixed typos: overriden to overridden | Jonas Nockert | 2013-02-23 | 1 | -1/+1 |
| | | |/ / / / | |||||
| * | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Fixed improperly closed tag in menu example in tricks.rst | Eugene Kalinin | 2013-05-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Trash debugsupport. | Cory Benfield | 2013-05-18 | 1 | -24/+0 |
| | | | | | | | |||||
| * | | | | | | update docs / changelog about python requirement, add myself to AUTHORS | Thomas Waldmann | 2013-05-18 | 1 | -6/+8 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | also added 2 FIXMEs to intro.rst about the debugsupport for python 2.4 that needs to get removed | ||||
| * | | | | | Merge pull request #177 from sakti/patch-1 | Armin Ronacher | 2013-04-12 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix typo swtich -> switch | ||||
| | * | | | | | fix typo swtich -> switch | Sakti Dwi Cahyono | 2013-02-15 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #171 from mgorny/master | Armin Ronacher | 2013-04-12 | 1 | -7/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix jinjaext compatibility with Python 3 | ||||
| | * | | | | | Fix jinjaext compatibility with Python 3. | Michał Górny | 2013-01-13 | 1 | -7/+9 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Arfrever. Fixes: https://github.com/mitsuhiko/jinja2/issues/115 | ||||
| * | | | | | correct typo | Jet Sun | 2013-02-20 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Improve whitespace docs to reflect reality. | Paul McMillan | 2012-07-04 | 1 | -4/+5 |
| | |_|/ |/| | | | | | | | | | | | See also: https://groups.google.com/d/msg/pocoo-libs/6DylMqq1voI/GXTbZJ1Tr-sJ | ||||
| * | | | Fix typos. | Christoph Zwerschke | 2012-03-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Distinguish ext folder from ext namespace. | Ron DuPlain | 2012-03-13 | 1 | -7/+10 |
| | |/ |/| | |||||
| * | | Merge pull request #81 from obeattie/docs-fix | Ron DuPlain | 2012-03-09 | 1 | -1/+1 |
| |\ \ | |/ |/| | Small typo fix to extension docs | ||||
| | * | Small typo fix to extension docs | Oliver Beattie | 2011-12-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2011-12-15 | 2 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Minor type: s/of/or/ | jmoore | 2011-12-14 | 2 | -2/+2 |
| | | | |||||
| * | | Fixed a bug in the i18n extraction option handling and added a silent option. | Armin Ronacher | 2011-12-15 | 2 | -1/+10 |
| |/ | |||||
| * | Added a dict iteration example. This fixes #64 | Armin Ronacher | 2011-10-06 | 1 | -2/+16 |
| | | |||||
 |
index : delta/jinja2.git | |
| github.com: mitsuhiko/jinja2.git |
| summaryrefslogtreecommitdiff |