summaryrefslogtreecommitdiff
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
...
* Use separate undefined object for CondExprAdrian Moennich2019-10-131-1/+2
|
* document debug extensionDavid Lord2019-10-042-30/+65
|
* Merge branch '2.10.x'David Lord2019-07-2630-1185/+140
|\
| * Merge branch '2.9.x' into docsDavid Lord2019-07-2630-1165/+145
| |\
| | * fix linkcheck issuesdocsDavid Lord2019-07-265-19/+19
| | |
| | * modernize docs config, use pallets-sphinx-themesDavid Lord2019-07-2627-1145/+136
| | |
* | | support underscore in int and floatCleoQc2019-07-231-4/+7
| | |
* | | clean up scientific notation supportDavid Lord2019-07-231-12/+7
| | | | | | | | | | | | | | | | | | add changelog clean up docs parametrize tests
* | | support scientific notationCleoQc2019-07-221-3/+10
| | |
* | | Correct syntax highlighting of jinja block in docsJon Dufresne2019-07-201-3/+1
| | |
* | | Merge branch '2.10.x'David Lord2019-07-203-7/+29
|\ \ \ | |/ /
| * | Import abstract base classes from collections.abcFlorian Bruhin2019-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Python 3.7, importing ABCs directly from the `collections` module shows a warning (and in Python 3.8 it will stop working) - see https://github.com/python/cpython/commit/c66f9f8d3909f588c251957d499599a1680e2320 This fixes various DeprecationWarnings such as those: ``` .../jinja2/utils.py:485: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import MutableMapping .../jinja2/runtime.py:318: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import Mapping ```
| * | Merge pull request #1009 from shamsimam/doc-python-methodsJoshua Bronson2019-06-051-1/+23
| |\ \ | | | | | | | | adds documentation on use of python methods in expressions
| | * | adds documentation on use of python methods in expressionsShams Imam2019-05-311-1/+23
| | | |
| * | | Merge pull request #1012 from yongbozhang/issue-423Joshua Bronson2019-06-051-1/+3
| |\ \ \ | | | | | | | | | | Remind not to put block in if statements in doc
| | * | | issue-423 remind not to put block in if statements in docyongbozhang2019-06-021-1/+3
| | |/ /
| * | | docs: Python3-ize the examplesDeepak Amin2019-05-312-4/+3
| |/ / | | | | | | | | | | | | This commit updates the examples to conform to Python 3 instead of Python 2, as Python 3 is more acceptable these days.
| * | Merge pull request #988 from tbnorth/triv_docs_linkKevin Brown2019-05-111-2/+1
| |\ \ | | | | | | | | fixes #242, deletes link to Jinja 1 docs.
| | * | fixes #242, deletes link to Jinja 1 docs.Terry N. Brown2019-05-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just fixes a broken link by deleteing it. I'm assuming Jinja 1 docs. aren't readily available anymore. I looked for a git tag for version 1 as an alternative target, but didn't see that either.
* | | | Fix "duplicate object description of jinja2" warningjab2019-06-051-0/+1
| | | | | | | | | | | | | | | | Follow suggestion to use :noindex: for the instance in api."
* | | | Improve nested extends (super.super) example.jab2019-06-051-19/+24
| | | |
* | | | Write a new documentation section on nesting extends.Scott Crosby2019-06-051-0/+30
| | | |
* | | | Add ChainableUndefined allowing getattr & getitem (#997)Étienne Pelletier2019-05-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ChainableUndefined allowing getattr & getitem Allows using default values with chains of items or attributes that may contain undefined values without raising a jinja2.exceptions.UndefinedError. >>> import jinja2 >>> env = jinja2.Environment(undefined=jinja2.ChainableUndefined) >>> env.from_string("{{ foo.bar['baz'] | default('val') }}").render() 'val' * Remove class decorator from ChainableUndefined
* | | | Merge remote-tracking branch 'origin/2.10.x'David Lord2019-05-061-4/+4
|\ \ \ \ | |/ / /
| * | | Fix tox docs-html buildsKevin Brown2019-05-061-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been broken for about a month now because of the upgrade to Sphinx 2. This upgrade happened automatically because we do not have the version pinned. Luckily this issue appears to only be from having Python 2 syntax in the docs script, so making that compatible with Python 3 fixes the error and allows the docs to pass.
* | | Fix typoRuben Garcia2019-02-081-1/+1
| | |
* | | Fix broken nl2br filter exampleMark Amery2018-11-251-1/+1
| | | | | | | | | | | | | | | | | | This example attempts to handle both Windows-style and Unix-style line endings, but does it wrong; as noted at https://stackoverflow.com/q/12521127/1709587, the regex here will match a single \r\n as if it were a double line-break, which results in all single Windows-style line-breaks getting converted into <p> breaks instead of <br> breaks as intended. This patch fixes that by applying Alan Moore's proposed fix from https://stackoverflow.com/a/12521544/1709587 of using a negative lookahead so that a \r cannot be counted as a line break if it is followed by a \n (while still allowing the \r\n combination to count as a line break).
* | | Remove reference to deprecated easy_install; use pip insteadJon Dufresne2018-11-021-27/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | easy_install is deprecated and its use is discouraged by PyPA: https://setuptools.readthedocs.io/en/latest/easy_install.html > Warning: Easy Install is deprecated. Do not use it. Instead use pip. Follow upstream advice and only recommended supported tools. Replace with pip.
* | | Fix ambiguity in include sectionGrey Li2018-10-181-1/+1
| | |
* | | Trim trailing white space throughout the projectJon Dufresne2018-08-293-29/+29
| | | | | | | | | | | | | | | | | | Many editors clean up trailing white space on save. By removing it all in one go, it helps keep future diffs cleaner by avoiding spurious white space changes on unrelated lines.
* | | Merge pull request #853 from doobeh/584-filters-indexDavid Lord2018-08-071-0/+27
|\ \ \ | | | | | | | | Quick lookup table for builtin filters and tests-- references #584
| * | | Quick lookup table for builtin filters and tests-- references #584Anthony Plunkett2018-05-141-0/+27
| | | |
* | | | Merge pull request #869 from jwflory/docs/vim-syntaxDavid Lord2018-08-071-8/+13
|\ \ \ \ | | | | | | | | | | Update integration docs for Vim syntax highlighting
| * | | | Update integration docs for Vim syntax highlightingJustin W. Flory2018-06-271-8/+13
| | | | |
* | | | | Import abstract base classes from collections.abcFlorian Bruhin2018-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Python 3.7, importing ABCs directly from the `collections` module shows a warning (and in Python 3.8 it will stop working) - see https://github.com/python/cpython/commit/c66f9f8d3909f588c251957d499599a1680e2320 This fixes various DeprecationWarnings such as those: ``` .../jinja2/utils.py:485: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import MutableMapping .../jinja2/runtime.py:318: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import Mapping ```
* | | | | Also drop Python 2.6Florian Bruhin2018-06-272-7/+7
| | | | |
* | | | | Drop Python 3.3 supportFlorian Bruhin2018-06-272-4/+9
|/ / / / | | | | | | | | | | | | | | | | It's currently broken on Travis (as it was dropped in 'wheel'), so continuing to support it is probably not worth the pain.
* | | | Merge pull request #849 from funkyfuture/patch-1Hsiaoming Yang2018-05-151-1/+1
|\ \ \ \ | | | | | | | | | | Fixes 'awaitable' typo in api.rst
| * | | | Fixes 'awaitable' typo in api.rstFrank Sachsenheim2018-05-111-1/+1
| |/ / /
* | | | Merge pull request #852 from ngr/html_highlight_fixDavid Lord2018-05-141-1/+3
|\ \ \ \ | | | | | | | | | | remove html+jinja highlight
| * | | | remove html+jinja highlightngr2018-05-141-1/+3
| |/ / /
* | | | {% raw %} tests and note for documentationngr2018-05-141-0/+5
|/ / /
* | | Update all pypi.python.org URLs to pypi.orgJon Dufresne2018-04-182-5/+5
| | | | | | | | | | | | | | | | | | For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
* | | Fix small typonwalsh19952018-04-171-1/+1
| | |
* | | add changelogDavid Lord2018-02-061-4/+2
| | | | | | | | | | | | fix unrelated docs issue
* | | Remove old statement about Python 3 (#803)Godefroid Chapelle2018-01-301-16/+0
| | | | | | | | | There is now Python 3 support...
* | | fix code block markupDavid Lord2018-01-181-1/+1
| | | | | | | | | closes #800
* | | Trivial typosUnknown2017-11-081-1/+1
|/ / | | | | Most non-user facing.
* | clean up MANIFEST.inDavid Lord2017-11-081-1/+1
| | | | | | | | | | | | clean up make-release.py for py3 add rst extension to CHANGES for GitHub clean up changelog formatting
* | Support filters in set blockThiefMaster2017-10-311-0/+11
| | | | | | | | | | - e.g {% set foo | trim %}...{% endset %} - closes #486