Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| | ||||||
* | Added add_extension method to the public API | Armin Ronacher | 2011-09-26 | 1 | -1/+1 | |
| | ||||||
* | Added GAE debugging snippet | Armin Ronacher | 2011-09-25 | 1 | -0/+12 | |
| | ||||||
* | added comma | Kevin Schuetz | 2011-07-26 | 1 | -1/+1 | |
| | ||||||
* | recieves->receives | Kevin Schuetz | 2011-07-26 | 1 | -1/+1 | |
| | ||||||
* | calld->called | Kevin Schuetz | 2011-07-26 | 1 | -1/+1 | |
| | ||||||
* | eached->reached | Kevin Schuetz | 2011-07-26 | 1 | -1/+1 | |
| | ||||||
* | Fix a typo | Wieland Hoffmann | 2011-07-07 | 1 | -1/+1 | |
| | ||||||
* | fixed typo in documentation: "environmentfilter" -> "evalcontextfilter" | Jeffrey Finkelstein | 2011-07-01 | 1 | -1/+1 | |
| | ||||||
* | fix typo | Andy McKay | 2011-06-30 | 1 | -3/+3 | |
| | ||||||
* | Fixed example of a division with a truncated integer result (it's // instead ↵ | Fabian Topfstedt | 2011-05-22 | 1 | -1/+1 | |
| | | | | of /) | |||||
* | Kampala is the capital of Uganda! Jinja's significant, but not the capital... | Joe Wass | 2011-05-19 | 1 | -1/+1 | |
| | ||||||
* | Clarity | Alan Hogan | 2011-04-28 | 1 | -2/+3 | |
| | ||||||
* | Use actual release info | Armin Ronacher | 2011-02-06 | 1 | -3/+12 | |
| | ||||||
* | Yay. PDF docs for Jinja2 | Armin Ronacher | 2011-02-06 | 6 | -34/+171 | |
| | ||||||
* | Another reference | Armin Ronacher | 2011-01-29 | 1 | -1/+1 | |
| | ||||||
* | Added missing references to docs | Armin Ronacher | 2011-01-29 | 1 | -1/+4 | |
| | ||||||
* | Slightly modified headline style | Armin Ronacher | 2011-01-24 | 1 | -5/+7 | |
| | ||||||
* | New documentation style go match Flask and Werkzeug better | Armin Ronacher | 2011-01-24 | 28 | -586/+524 | |
| |