1812 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Lord	0ece61041f	Merge pull request #883 from pallets/pytest ... temporarily pin pytest to avoid test bug	2018-08-07 10:16:22 -07:00
David Lord	e2f0470fce	temporarily pin pytest to avoid test bug	2018-08-07 10:09:54 -07:00
David Lord	abf6089858	Merge pull request #868 from The-Compiler/py33 ... Drop Python 2.6 and 3.3 support	2018-08-07 09:53:28 -07:00
Florian Bruhin	86df058257	Add myself to AUTHORS	2018-06-27 22:02:45 +02:00
Florian Bruhin	5425921899	Also drop Python 2.6	2018-06-27 21:48:02 +02:00
Florian Bruhin	d1fb22fd45	Drop Python 3.3 support ... It's currently broken on Travis (as it was dropped in 'wheel'), so continuing to support it is probably not worth the pain.	2018-06-27 16:13:52 +02:00
Hsiaoming Yang	fb7e12cce6	Merge pull request #849 from funkyfuture/patch-1 ... Fixes 'awaitable' typo in api.rst	2018-05-15 16:52:11 +08:00
David Lord	c7e22aeaba	Merge pull request #852 from ngr/html_highlight_fix ... remove html+jinja highlight	2018-05-14 11:48:09 -04:00
David Lord	3482342842	Merge pull request #802 from abadger/allow-more-splatting ... More closely match python splatting for calls	2018-05-14 11:21:27 -04:00
ngr	87672b85fc	remove html+jinja highlight	2018-05-14 11:20:32 -04:00
David Lord	a1c5bcab0d	Merge pull request #851 from ngr/tests_for_raw ... {% raw %} tests and note for documentation	2018-05-14 11:11:40 -04:00
ngr	0db3afced3	{% raw %} tests and note for documentation	2018-05-14 10:53:36 -04:00
Frank Sachsenheim	d0f8811d79	Fixes 'awaitable' typo in api.rst	2018-05-11 21:25:22 +02:00
David Lord	ff65310853	Merge pull request #841 from jdufresne/pypi ... Update all pypi.python.org URLs to pypi.org	2018-04-18 19:40:50 -07:00
Jon Dufresne	453f81d84f	Update all pypi.python.org URLs to pypi.org ... For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html	2018-04-18 19:35:29 -07:00
David Lord	06b10ecb1d	Merge pull request #840 from nwalsh1995/master ... Fix small typo in docs/api.rst	2018-04-17 16:51:24 -07:00
nwalsh1995	65337f8a78	Fix small typo	2018-04-17 14:55:13 -07:00
Armin Ronacher	e1e7735c76	Remove old GPL licensed emacs support ... This is unmaintained anyways and we do not want to ship non BSD code. Fixes #833	2018-03-28 23:31:03 +02:00
David Lord	3bb2ef8b83	Merge pull request #826 from terminalmage/issue823 ... Fix escaped characters in indent filter	2018-03-22 11:59:02 -07:00
Erik Johnson	a2f5e2c797	Remove unescape method for fixing concatenation issue ... This ensures that we only concatenate Markup instances to other Markup instances.	2018-03-19 21:56:54 -05:00
Erik Johnson	8ef99c3d6a	Add .pytest_cache/ to gitignore	2018-03-19 16:03:29 -05:00
Erik Johnson	5db859c5c3	Apply unesacpe fix when blank is True	2018-03-19 16:03:00 -05:00
Erik Johnson	50995cb7f9	Fix spelling in docstring	2018-03-19 14:30:46 -05:00
Erik Johnson	863558131c	Add test cases for quotes and expand coverage to include Markup input	2018-03-19 14:18:27 -05:00
Erik Johnson	e937c8a0de	Fix cases where filter input is not a Markup type ... The previous commit assumes that the filter will always be a Markup type, which is not correct.	2018-03-19 14:17:35 -05:00
Erik Johnson	bfdc8467d4	Fix escaped characters in indent filter ... This unescapes after concatenating, to fix a bug introduced in Jinja 2.10 where lines concatenated contain escaped versions of non-ascii characters.	2018-03-19 13:27:38 -05:00
Sean Sabbage	34b1ab9f6e	Correct documentation for min method (#825)	2018-03-19 15:05:42 +01:00
David Lord	3d7cfc844b	Merge pull request #820 from jdufresne/typo ... Fix typo: apparenlty -> apparently.	2018-03-05 06:23:40 -08:00
Jon Dufresne	a922a5f331	Fix typo: apparenlty -> apparently.	2018-03-04 12:15:52 -08:00
luzpaz	f2e9280f5e	Fix typos (#815) ... Found via `codespell -q 3` using v1.12.0.dev0	2018-02-18 15:57:01 +01:00
David Lord	041b7385c3	Merge pull request #806 from methane/lazy-async-patch ... Lazy asyncsupport.patch_all()	2018-02-06 07:52:32 -08:00
David Lord	989a7db234	add changelog ... fix unrelated docs issue	2018-02-06 07:48:10 -08:00
INADA Naoki	2c49d14cec	Lazy asyncsupport.patch_all() ... fixes #765	2018-02-06 21:52:57 +09:00
Godefroid Chapelle	c0c3b7879e	Remove old statement about Python 3 (#803) ... There is now Python 3 support...	2018-01-30 12:02:33 -08:00
Toshio Kuratomi	d6c016ba77	More closely match python splatting for calls ... In Python, it's legal to use splats in function calls like this: call_function('123', *b, c=5, **d) Prior to this change, jinja2 did not allow that. It mandated that all splatting had to take place at the end of the call: call_function('123', c=5, *b, **d) This commit allows both orders. Additionally, this commit adds tests for more things that are illegal: namely giving a function a positional argument after using a splat to unpack positional arguments or giving a function a named argument after using a double splat to unpack keyword arguments.	2018-01-29 15:44:46 -08:00
David Lord	96cd53d8ff	Merge pull request #799 from mkrizek/native-concat-list ... Allow to pass a list to native_concat	2018-01-23 08:31:30 -08:00
David Lord	1f60059729	fix code block markup ... closes #800	2018-01-18 08:56:55 -08:00
Martin Krizek	08a6faef2e	Don't check for generator if not needed	2018-01-17 23:09:23 +01:00
Martin Krizek	9ef99dcd82	Allow to pass a list to native_concat	2018-01-17 21:38:58 +01:00
David Lord	fe3dadacdf	Merge pull request #787 from SabujXi/patch-1 ... Fix typo instanciable > instantiable	2017-12-01 10:27:13 -08:00
Md. Sabuj Sarker	78928bffab	Fix typo instanciable > instantiable	2017-12-02 00:10:39 +06:00
David Lord	9b255f4c36	Merge pull request #783 from luzpaz/trivial-typos ... Trivial typos	2017-11-08 18:21:47 -07:00
Unknown	778ccb22e9	Trivial typos ... Most non-user facing.	2017-11-08 20:02:28 -05:00
David Lord	b2dd36b60f	Bump version number to 2.11.dev	2017-11-08 12:02:36 -08:00
David Lord	78d2f67214	Bump version number to 2.10	2017-11-08 11:58:35 -08:00
David Lord	d9d3fc32f0	clean up MANIFEST.in ... clean up make-release.py for py3 add rst extension to CHANGES for GitHub clean up changelog formatting	2017-11-08 10:53:47 -08:00
ThiefMaster	072cdf97fa	Support filters in set block ... - e.g {% set foo | trim %}...{% endset %} - closes #486	2017-10-31 23:04:45 +01:00
David Lord	d17c7dbbf0	Merge pull request #708 from jctanner/NATIVE_TYPES ... Add support for the Environment to optionally return native types.	2017-10-31 12:16:10 -07:00
David Lord	6a7a263bc0	Merge branch 'master' into NATIVE_TYPES	2017-10-31 08:51:53 -07:00
Ricardo Lafuente	31f92b5947	Fix typo in docstring (#779)	2017-10-16 13:11:44 +02:00