summaryrefslogtreecommitdiff
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Custom Filters example inserts escaped <br>sJörn Hees2014-06-151-1/+1
| | | | | | | | | The example nl2br custom filter inserts escaped `&lt;br&gt;` <br> tags as a `Markup.replace` method seems to be aware of modifications and pass `str`/`unicode` arguments through `escape`.
* | | Merge branch 'adamchainz-master'Markus Unterwaditzer2015-03-111-21/+20
|\ \ \
| * | | Clarify sentenceMarkus Unterwaditzer2015-03-111-2/+2
| | | |
| * | | Switching docs tweaksAdam Chainz2014-07-121-21/+20
| |/ /
* | | Merge pull request #370 from BillyWM/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | fix typo "makes sense to defined" -> define
| * | | fix typo "possible to defined" -> defineWilliam Wenge-Murphy2014-09-201-1/+1
| |/ /
* | | Merge pull request #381 from ubershmekel/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | A double quote is missing
| * | | A double quote is missingYuval Greenfield2014-11-061-1/+1
| |/ /
* | | Merge pull request #403 from whit537/patch-1Markus Unterwaditzer2015-03-111-4/+3
|\ \ \ | | | | | | | | trim obsolete sentence re: i18n extension
| * | | trim obsolete sentence re: i18n extensionChad Whitacre2015-02-051-4/+3
| |/ / | | | | | | This sentence seems like a leftover from when i18n was the only extension available, eh?
* | | Merge pull request #395 from esonderegger/masterMarkus Unterwaditzer2015-03-111-3/+3
|\ \ \ | | | | | | | | Updated template documentation examples
| * | | Updated template documentation examplesEvan Sonderegger2015-01-071-3/+3
| |/ / | | | | | | | | | | | | | | | Fixed html tags in base template example. Since I was removing the xmlns="http://www.w3.org/1999/xhtml" tag, it seemed like a good time to update the examples to the html5 doctype.
* | | Merge pull request #398 from cerivera/masterMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | grammar fix
| * | | grammar fixCarlos Eduardo Rivera2015-01-181-1/+1
| |/ /
* | | A few nitpicksMarkus Unterwaditzer2015-03-111-52/+40
| | |
* | | We don't want to give a specific recommendation.Markus Unterwaditzer2015-03-111-3/+2
| | |
* | | Not only syntax is affected.Markus Unterwaditzer2015-03-111-2/+2
| | |
* | | DOC: Update templates.rst: syntax, commasWes Turner2014-12-111-268/+334
|/ /
* | Merge pull request #230 from p1otr/masterArmin Ronacher2014-06-104-6/+6
|\ \ | | | | | | documentation typos
| * | fix a bunch of typos in the documentationJakub Wilk2013-05-255-7/+7
| |/
* | Documented {% set %}...{% endset %}Armin Ronacher2014-06-071-0/+21
| |
* | Merge pull request #274 from thomasballinger/fix-1Armin Ronacher2014-06-061-10/+10
|\ \ | | | | | | docfixes in Variables section of templates.rst
| * | docfixes in Variables section of templates.rstThomas Ballinger2013-10-281-10/+10
| |/ | | | | | | | | I was distracted by "alternative" -> alternatively, then changed other bits and pieces in the section. fixes suggested by @Naddiseo, and clarify that "what a variable looks like" really means "what attributes a variable has."
* | Merge pull request #284 from LucianU/patch-1Armin Ronacher2014-06-061-12/+12
|\ \ | | | | | | Spelling, grammar, and punctuation fixes to extensions docs.
| * | Spelling, grammar, and punctuation fixes to extensions docs.Lucian Ursu2013-11-291-12/+12
| |/
* | Merge pull request #293 from carldunham/docfixArmin Ronacher2014-06-063-11/+10
|\ \ | | | | | | fixed some typos and clarifying
| * | fixed some typos and clarifyingCarl A Dunham2014-01-183-11/+10
| |/
* | Merge pull request #310 from vivekagr/patch-1Armin Ronacher2014-06-061-2/+2
|\ \ | | | | | | Fix typo.
| * | Fix typo.Vivek Agarwal2014-03-121-2/+2
| |/
* | Added tests for logging undefined and added it to the docs.Armin Ronacher2014-06-061-0/+5
|/
* Since we no longer support 2.5 we can use the builtin next() functionArmin Ronacher2013-05-201-1/+0
|
* Fixed docs not buildingArmin Ronacher2013-05-203-3/+3
|
* Clarified some text in the introArmin Ronacher2013-05-201-2/+2
|
* Documented loop.depth and added loop.depth0.Armin Ronacher2013-05-201-0/+6
|
* Removed mention of speedup module and rewrote docs for markupsafe dependencyArmin Ronacher2013-05-192-47/+5
|
* Merge pull request #112 from Cito/masterArmin Ronacher2013-05-191-0/+4
|\ | | | | Addition/correction for pull request #69 - add note to docs
| * Add a note about the else statement.Christoph Zwerschke2012-03-211-0/+4
| |
* | Merge remote-tracking branch 'Talksum/distribute_required'Armin Ronacher2013-05-191-3/+24
|\ \
| * | adding explicit mention of distribute prerequisite at runtimeMike Chesnut2012-12-181-3/+6
| | |
* | | Whitespace normalizationArmin Ronacher2013-05-191-2/+2
| | |
* | | Flask -> Jinja2Armin Ronacher2013-05-191-1/+1
| | |
* | | Merge pull request #104 from njl/fix-issue-77Armin Ronacher2013-05-191-3/+19
|\ \ \ | | | | | | | | Fix issue #77
| * | | Fixes issue #77 by adding explanation to docsNed Jackson Lovely2012-03-121-3/+19
| | | | | | | | | | | | | | | | | | | | Points out that the Django empty is replaced by the Flask else.
* | | | Merge pull request #94 from florentx/patch-1Armin Ronacher2013-05-191-2/+2
|\ \ \ \ | | | | | | | | | | Fix the Mako-like environment.
| * | | | typoFlorent Xicluna2012-02-051-1/+1
| | | | |
| * | | | Fix the Mako-like environment.Florent Xicluna2012-02-051-1/+1
| | | | |
* | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-191-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #149 from dmedvinsky/patch-1Armin Ronacher2013-05-191-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix typo in `include` documentation
| | * | | | | Fix typo in `include` documentationDmitry Medvinsky2012-09-211-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge remote-tracking branch 'kristi/master'Armin Ronacher2013-05-191-5/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status