Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use pip-compile to pin dev requirements | David Lord | 2020-05-18 | 1 | -4/+0 |
| | |||||
* | remove vim syntax file | David Lord | 2020-04-19 | 1 | -66/+35 |
| | | | | remove unmaintained information from integration doc | ||||
* | Merge branch '2.11.x' | David Lord | 2020-03-30 | 1 | -3/+4 |
|\ | |||||
| * | Add link to template designer documentation | ldealmei | 2020-02-28 | 1 | -3/+4 |
| | | | | | | | | For those who were actually looking for the template design documentation putting a link directly to it might prevent them to have to google for it. When on the API page, there is no direct way to find the template design documentation. Hope this can help others. | ||||
* | | Fix html tag | Nils K | 2020-03-22 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '2.11.x' | David Lord | 2020-02-27 | 1 | -29/+30 |
|\ \ | |/ | |||||
| * | rewrite async discussion | David Lord | 2020-02-08 | 1 | -29/+30 |
| | | |||||
| * | Fix async doc | David Brochart | 2020-02-08 | 1 | -1/+1 |
| | | |||||
* | | apply pyupgrade and f-strings | David Lord | 2020-02-05 | 4 | -10/+9 |
| | | |||||
* | | remove Python 2 from docs | David Lord | 2020-02-05 | 7 | -223/+92 |
|/ | |||||
* | Revert "rename imports to jinja" | David Lord | 2020-01-26 | 11 | -107/+129 |
| | | | | This reverts commit 1167525b73863119f8bbec03ddb9d35eacff4bef. | ||||
* | rename imports to jinja | David Lord | 2020-01-10 | 11 | -129/+107 |
| | |||||
* | simplify module docstringsstyle | David Lord | 2020-01-10 | 1 | -10/+0 |
| | |||||
* | remove old scripts and examples | David Lord | 2020-01-10 | 3 | -6/+117 |
| | |||||
* | apply black | David Lord | 2020-01-10 | 1 | -9/+7 |
| | |||||
* | fix(templates.rst): fix typo (`hat` => `that`) | Imran Iqbal | 2019-12-08 | 1 | -1/+1 |
| | |||||
* | use "Jinja" instead of "Jinja2" | David Lord | 2019-10-23 | 2 | -5/+5 |
| | |||||
* | use "Jinja" instead of "Jinja2" | David Lord | 2019-10-23 | 9 | -116/+114 |
| | |||||
* | clarify cycler.next() behavior | David Lord | 2019-10-20 | 1 | -19/+22 |
| | |||||
* | clean up i18n documentation | David Lord | 2019-10-19 | 2 | -114/+148 |
| | | | | | | | | explain enabling newstyle organize newstyle advantages mention escaping percent signs for formatting mention marking format parameters as safe fix newstyle ref | ||||
* | document lack of file extension | David Lord | 2019-10-18 | 1 | -0/+14 |
| | | | | closes #547 | ||||
* | document behavior of block tag in if block | David Lord | 2019-10-18 | 1 | -0/+4 |
| | | | | closes #423 | ||||
* | format expression docs | David Lord | 2019-10-18 | 1 | -37/+37 |
| | |||||
* | improve docs about string methods in templates | David Lord | 2019-10-18 | 1 | -12/+29 |
| | | | | closes #273 | ||||
* | Don't make cond_expr_undefined configurable | Adrian Moennich | 2019-10-13 | 1 | -2/+2 |
| | |||||
* | Use separate undefined object for CondExpr | Adrian Moennich | 2019-10-13 | 1 | -1/+2 |
| | |||||
* | document debug extension | David Lord | 2019-10-04 | 2 | -30/+65 |
| | |||||
* | Merge branch '2.10.x' | David Lord | 2019-07-26 | 30 | -1185/+140 |
|\ | |||||
| * | Merge branch '2.9.x' into docs | David Lord | 2019-07-26 | 30 | -1165/+145 |
| |\ | |||||
| | * | fix linkcheck issuesdocs | David Lord | 2019-07-26 | 5 | -19/+19 |
| | | | |||||
| | * | modernize docs config, use pallets-sphinx-themes | David Lord | 2019-07-26 | 27 | -1145/+136 |
| | | | |||||
* | | | support underscore in int and float | CleoQc | 2019-07-23 | 1 | -4/+7 |
| | | | |||||
* | | | clean up scientific notation support | David Lord | 2019-07-23 | 1 | -12/+7 |
| | | | | | | | | | | | | | | | | | | add changelog clean up docs parametrize tests | ||||
* | | | support scientific notation | CleoQc | 2019-07-22 | 1 | -3/+10 |
| | | | |||||
* | | | Correct syntax highlighting of jinja block in docs | Jon Dufresne | 2019-07-20 | 1 | -3/+1 |
| | | | |||||
* | | | Merge branch '2.10.x' | David Lord | 2019-07-20 | 3 | -7/+29 |
|\ \ \ | |/ / | |||||
| * | | Import abstract base classes from collections.abc | Florian Bruhin | 2019-06-18 | 1 | -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-methods | Joshua Bronson | 2019-06-05 | 1 | -1/+23 |
| |\ \ | | | | | | | | | adds documentation on use of python methods in expressions | ||||
| | * | | adds documentation on use of python methods in expressions | Shams Imam | 2019-05-31 | 1 | -1/+23 |
| | | | | |||||
| * | | | Merge pull request #1012 from yongbozhang/issue-423 | Joshua Bronson | 2019-06-05 | 1 | -1/+3 |
| |\ \ \ | | | | | | | | | | | Remind not to put block in if statements in doc | ||||
| | * | | | issue-423 remind not to put block in if statements in doc | yongbozhang | 2019-06-02 | 1 | -1/+3 |
| | |/ / | |||||
| * | | | docs: Python3-ize the examples | Deepak Amin | 2019-05-31 | 2 | -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_link | Kevin Brown | 2019-05-11 | 1 | -2/+1 |
| |\ \ | | | | | | | | | fixes #242, deletes link to Jinja 1 docs. | ||||
| | * | | fixes #242, deletes link to Jinja 1 docs. | Terry N. Brown | 2019-05-06 | 1 | -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" warning | jab | 2019-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Follow suggestion to use :noindex: for the instance in api." | ||||
* | | | | Improve nested extends (super.super) example. | jab | 2019-06-05 | 1 | -19/+24 |
| | | | | |||||
* | | | | Write a new documentation section on nesting extends. | Scott Crosby | 2019-06-05 | 1 | -0/+30 |
| | | | | |||||
* | | | | Add ChainableUndefined allowing getattr & getitem (#997) | Étienne Pelletier | 2019-05-08 | 1 | -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 Lord | 2019-05-06 | 1 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix tox docs-html builds | Kevin Brown | 2019-05-06 | 1 | -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. |