summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remove docs requirements from dev requirmentsremove-docs-devDavid Lord2020-05-233-35/+2
| | | | otherwise Sphinx will cause Jinja to be pinned
* try another dependabot ignore patternDavid Lord2020-05-181-1/+1
|
* try another dependabot ignore patternDavid Lord2020-05-181-1/+1
|
* fix dependabot config syntaxDavid Lord2020-05-181-1/+2
|
* Merge pull request #1216 from pallets/dependabot-configDavid Lord2020-05-181-0/+7
|\ | | | | try to make dependabot ignore editable line
| * try to make dependabot ignore editable lineDavid Lord2020-05-181-0/+7
|/
* Merge pull request #1214 from pallets/requirementsDavid Lord2020-05-1810-8/+121
|\ | | | | use pip-compile to pin dev requirements
| * use pip-compile to pin dev requirementsDavid Lord2020-05-1810-8/+121
|/
* Merge pull request #1213 from pallets/rtd-configDavid Lord2020-05-181-0/+8
|\ | | | | add readthedocs config
| * add readthedocs configDavid Lord2020-05-181-0/+8
|/
* Merge pull request #1196 from pallets/remove-vimDavid Lord2020-04-193-202/+35
|\ | | | | remove vim syntax file
| * remove vim syntax fileDavid Lord2020-04-193-202/+35
|/ | | | remove unmaintained information from integration doc
* Merge branch '2.11.x'David Lord2020-04-135-33/+127
|\
| * fix changelog headerDavid Lord2020-04-131-2/+2
| |
| * release version 2.11.22.11.2David Lord2020-04-132-2/+2
| |
| * Merge pull request #1190 from pallets/native-evalDavid Lord2020-04-133-24/+20
| |\ | | | | | | native only evals at end of render
| | * native only evals at end of renderDavid Lord2020-04-133-24/+20
| |/ | | | | | | Co-authored-by: Martin Krizek <mkrizek@redhat.com>
| * Merge pull request #1183 from exponea/1138-fix-unintended-lstrip-behavior-changeDavid Lord2020-04-133-5/+102
| |\ | | | | | | Fix unintended lstrip_blocks behavior
| | * Add tests for lstrip whitespace behavior fixPeter Dolak2020-04-132-0/+94
| | | | | | | | | | | | | | | Also did peformance tests for the previous fix and saw no measurable impact.
| | * Fix unintended lstrip_blocks behavior. Fixes #1138Peter Dolak2020-04-131-5/+8
| |/ | | | | | | | | Introduced in #858. Tests will follow, also results of performance testing.
* | Don't use setlocal in syntax file (#1164)Ken Crowell2020-04-121-3/+0
| | | | | | | | | | | | | | | | | | | | I'm not 100% sure that one should not use `setlocal` in a syntax file, but this breaks other filetypes that may include this syntax file, like the vim-markdown plugin. The `comments` and `commentstring` get set for that markdown buffer with the jinja settings. See https://github.com/dhruvasagar/vim-table-mode/issues/162#issuecomment-595317626 for an example of side effects.
* | Update oudated CutomLoader code example (#1185)Xinbin Huang2020-04-081-2/+2
| | | | | | py3 for CustomLoader example
* | Merge branch '2.11.x'David Lord2020-04-080-0/+0
|\ \ | |/
| * Merge tag '2.11.1' into 2.11.xDavid Lord2020-04-081-1/+1
| |\
| | * release version 2.11.12.11.1David Lord2020-01-302-2/+2
| | |
* | | Merge pull request #1169 from asottile/pep_451David Lord2020-03-303-14/+49
|\ \ \ | | | | | | | | Use importlib machinery to fix PEP 451 import hooks
| * | | add changelog and cleanup for pep 451 supportDavid Lord2020-03-303-20/+15
| | | |
| * | | Use importlib machinery to fix PEP 451 import hooksAnthony Sottile2020-03-302-14/+54
|/ / /
* | | Merge branch '2.11.x'David Lord2020-03-305-3/+41
|\ \ \ | |/ /
| * | Merge pull request #1181 from bartfeenstra/async-namespaceDavid Lord2020-03-303-1/+15
| |\ \ | | | | | | | | Allow namespaces to be used in asynchronously rendered templates.
| | * | namespace object works in async templatesBart Feenstra2020-03-303-1/+15
| |/ /
| * | Merge pull request #1178 from avli/fix-lexer-linenoDavid Lord2020-03-303-2/+26
| |\ \ | | | | | | | | Fix tokens line number calculation when whitespace stripping is used
| | * | Fix tokens line number calculation when whitespace stripping is usedAndrey Lisin2020-03-303-2/+26
| |/ /
* | | Merge branch '2.11.x'David Lord2020-03-306-15/+41
|\ \ \ | |/ /
| * | Merge pull request #1182 from pallets/revert-package-loaderDavid Lord2020-03-304-165/+53
| |\ \ | | | | | | | | Revert dropping pkg_resources from PackageLoader for 2.11
| | * | changelog for reverting PackageLoader changesDavid Lord2020-03-301-0/+6
| | | |
| | * | Revert "PackageLoader doesn't depend on setuptools"David Lord2020-03-303-134/+47
| | | | | | | | | | | | | | | | This reverts commit 4b6077a8c0a0f56bb8dbac37f8f9027130b4091c.
| | * | Revert "PackageLoader understands namespace packages"David Lord2020-03-301-39/+8
| |/ / | | | | | | | | | This reverts commit d2e0e78afe7c6ae864a20c2cc29e80936cff47af.
| * | Merge pull request #1179 from pallets/undefined-recursionDavid Lord2020-03-273-3/+25
| |\ \ | | | | | | | | AttributeError in undefined message doesn't cause RuntimeError
| | * | AttributeError in undefined message doesn't cause RuntimeErrorDavid Lord2020-03-273-3/+25
| |/ /
| * | Merge pull request #1163 from pallets/traceback-32-bitDavid Lord2020-02-282-4/+3
| |\ \ | | | | | | | | better PyObject_HEAD size calculation
| | * | better PyObject_HEAD size calculationDavid Lord2020-02-282-4/+3
| |/ / | | | | | | | | | fixes infinite loop on Python 3.6 32-bit
| * | Merge pull request #1161 from ldealmei/patch-1David Lord2020-02-281-3/+4
| |\ \ | | | | | | | | Add link to template designer documentation
| | * | Add link to template designer documentationldealmei2020-02-281-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.
* | | Merge pull request #1174 from septatrix/patch-1Joshua Bronson2020-03-221-2/+2
|\ \ \ | | | | | | | | Fix html tag
| * | | Fix html tagNils K2020-03-221-2/+2
|/ / /
* | | Merge branch '2.11.x'David Lord2020-02-274-31/+40
|\ \ \ | |/ /
| * | Merge pull request #1160 from sivel/wordcount-soft-strDavid Lord2020-02-273-2/+10
| |\ \ | | | | | | | | Use soft_str in do_wordcount, to trigger undefined
| | * | use soft_str in do_wordcount, to trigger undefinedMatt Martz2020-02-273-2/+10
| |/ /
| * | Merge pull request #1149 from davidbrochart/fix_docDavid Lord2020-02-081-29/+30
| |\ \
View Lorry Controller Status