delta/jinja2.git - github.com: mitsuhiko/jinja2.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	support scientific notation	CleoQc	2019-07-22	3	-6/+21
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #961 from JulienPalard/TemplateNotFound	David Lord	2019-07-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better repr for TemplateNotFound.
\| * \| \| \| \| \| \|	Better repr for TemplateNotFound.	Julien Palard	2019-03-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #994 from bkiu/931-undeclared-variables	David Lord	2019-07-22	3	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	exclude globals from find_undeclared_variables
\| * \| \| \| \| \| \| \|	exclude globals from find_undeclared_variables	Brendan	2019-07-22	3	-1/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #985 from bkiu/557-map-default	David Lord	2019-07-22	2	-6/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding a default parameter to builtin map filter
\| * \ \ \ \ \ \ \	Merge branch 'master' into 557-map-default	David Lord	2019-07-22	31	-215/+581
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #990 from tbnorth/vim_syntax_tweak	David Lord	2019-07-22	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the correct thing to do, vim-wise, although whether
\| * \| \| \| \| \| \| \| \|	This is the correct thing to do, vim-wise, although whether	Terry N. Brown	2019-05-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it has any impact depends on how the user has folding set up in vim. I confirmed that with the change, a folding setup that uses these variables works, whereas without the change, the same setup doesn't work. Change only effects a file that has to be manually copied to the user's ~/.vim/syntax folder, so it won't impact jinja execution in any way.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1018 from kbiggers/jinja/557	David Lord	2019-07-22	3	-6/+47
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add default to map filter
\| * \| \| \| \| \| \| \| \| \|	add default to map filter	Kevin	2019-07-22	3	-6/+47
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1014 from markroth8/mroth/fix/748	David Lord	2019-07-20	3	-17/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748
\| * \| \| \| \| \| \| \| \| \|	Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes ↵	Mark Roth	2019-07-20	3	-17/+39
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#748.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1022 from jdufresne/hl	David Lord	2019-07-20	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct syntax highlighting of jinja block in docs
\| * \| \| \| \| \| \| \| \| \|	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	11	-110/+171
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #1030 from rillian/PytestUnknownMarkWarning	David Lord	2019-07-20	2	-2/+44
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pytest unknown mark warnings
\| \| * \| \| \| \| \| \| \| \|	warnings are errors during tests	David Lord	2019-07-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Register custom test category markers.	Ralph Giles	2019-07-20	1	-1/+43
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since around pytest 3.6 it's been possible to register custom markers, and since version 4.5.0 pytest warns about any which are not registered. Register a list of such markers, extracted from those warnings, so they don't clutter the test output.
\| * \| \| \| \| \| \| \| \|	ignore coverage parse errors	David Lord	2019-07-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Azure has Python 2.7.15 and Python 3.5.5, which can't parse async code. Later patch versions can parse it fine, so this can be removed if Azure updates.
\| * \| \| \| \| \| \| \| \|	switch tests to azure pipelines	David Lord	2019-07-20	6	-104/+91
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #1019 from ↵	David Lord	2019-06-18	7	-26/+26
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jbarreneche/backport-python3.7-collections-warning-fix Backport python3.7 collections warning fix
\| \| * \| \| \| \| \| \| \| \|	Add python 3.7 deprecation warning fix to changelog	Juan Barreneche	2019-06-18	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Import abstract base classes from collections.abc	Florian Bruhin	2019-06-18	6	-26/+19
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #1010 from dvamin/master	David Lord	2019-05-31	2	-4/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	docs: Python3-ize the examples
\| \| * \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Add new maintenance branch format to Travis (#987)	Kevin Brown	2019-05-07	1	-5/+6
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added new maintenance branch format to Travis The maintenance branch format appeared to change from `[version]-maintenance` to `[version].x` in the recent months, and this broke Travis CI builds made to those branches. Because they no longer meet the branch regex, the pull requests builds against these branches were no longer being run. This ads the regex for any branch which ends in `.x`, which should catch the new pattern for maintenance branches. * Use the branch regex from werkzeug This is more specific to only catch version number branches. * Sync with master Apparently the build configuration for this branch is very old and doesn't match master at all.
* \| \| \| \| \| \| \| \|	Merge pull request #1025 from pallets/unpin-pytest	David Lord	2019-07-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unpin Pytest on master branch
\| * \| \| \| \| \| \| \| \|	Unpin pytest in tox.iniunpin-pytest	Kevin Brown	2019-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was "temporarily" pinned many months back, given that this is not pinned on the stable branch and tests appear to be passing, we should be able to remove it here.
* \| \| \| \| \| \| \| \| \|	standardize license	David Lord	2019-07-17	3	-32/+29
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1031 from minho42/Fix-typo	Joshua Bronson	2019-07-07	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo
\| * \| \| \| \| \| \| \| \| \|	Fix line length	Min ho Kim	2019-07-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Apply suggestions	Min ho Kim	2019-07-07	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix typo	Min ho Kim	2019-07-07	2	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #975 from kevbroch/master	Kevin Brown	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add list filter to make example match output
\| * \| \| \| \| \| \| \| \| \|	add list filter to make example match output	Kevin Broch	2019-04-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1002 from ↵	Kevin Brown	2019-06-24	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eplata31/bugfix-template-parse-if-with-dict-subproperty BUGFIX #930 - Template parse if with when referencing with dictionary…
\| * \| \| \| \| \| \| \| \| \| \|	BUGFIX #930 - Template parse if with when referencing with dictionary ↵	eplata31	2019-05-13	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	subproperty
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1013 from mayuropensource/jinja-670-sort-multi-attr	Kevin Brown	2019-06-24	2	-7/+76
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add ability to specify multiple attributes in sort
\| * \| \| \| \| \| \| \| \| \| \|	Refactor _prepare_attribute_parts() to use in both make_attrgetter() and ↵	mayur-srivastava	2019-06-09	1	-14/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make_multi_attrgetter()
\| * \| \| \| \| \| \| \| \| \| \|	Add ability to specify multiple attributes in sort,	mayur-srivastava	2019-05-31	2	-1/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	e.g. foo\|sort(attribute='name,id'). This fixes #670
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1021 from jdufresne/the-the	Joshua Bronson	2019-06-21	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo "the the"
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo "the the"	Jon Dufresne	2019-06-21	2	-2/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1015 from jab/pr-1011	Joshua Bronson	2019-06-05	2	-1/+37
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document nested extends and super.super().