]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
8 years agoIn documentation, prefer https over http when available 703/head
Jon Dufresne [Sun, 9 Apr 2017 22:18:38 +0000 (15:18 -0700)] 
In documentation, prefer https over http when available

8 years agoMerge pull request #700 from brunodoamaral/patch-1
David Lord [Wed, 5 Apr 2017 14:26:08 +0000 (07:26 -0700)] 
Merge pull request #700 from brunodoamaral/patch-1

Fixed incorrect merge in setup.py

8 years agoFixed incorrect merge in setup.py 700/head
Bruno Guberfain do Amaral [Wed, 5 Apr 2017 14:01:25 +0000 (11:01 -0300)] 
Fixed incorrect merge in setup.py

I just don't know if the correct version is 2.9.7.dev or 2.10.dev

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Mon, 3 Apr 2017 13:12:19 +0000 (15:12 +0200)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Mon, 3 Apr 2017 13:12:08 +0000 (15:12 +0200)] 
Merge branch '2.9-maintenance'

8 years ago2.9.7-dev
Armin Ronacher [Mon, 3 Apr 2017 13:11:44 +0000 (15:11 +0200)] 
2.9.7-dev

8 years agoBump version number to 2.9.6 2.9.6
Armin Ronacher [Mon, 3 Apr 2017 13:11:27 +0000 (15:11 +0200)] 
Bump version number to 2.9.6

8 years agoUpdated release command
Armin Ronacher [Mon, 3 Apr 2017 13:11:09 +0000 (15:11 +0200)] 
Updated release command

8 years agoSet release date
Armin Ronacher [Mon, 3 Apr 2017 13:08:43 +0000 (15:08 +0200)] 
Set release date

8 years agoMerge pull request #693 from tedder/multiple_argument_select_documentation
David Lord [Fri, 17 Mar 2017 21:23:18 +0000 (14:23 -0700)] 
Merge pull request #693 from tedder/multiple_argument_select_documentation

add examples showing > 1 argument in filter

8 years agoadd examples showing > 1 argument in filter 693/head
tedder [Fri, 17 Mar 2017 20:15:12 +0000 (13:15 -0700)] 
add examples showing > 1 argument in filter

This is implied but poorly documented. A few examples make it clear.

8 years agoFix custom contexts in fast resolve mode
Adrian Moennich [Wed, 15 Mar 2017 18:19:04 +0000 (19:19 +0100)] 
Fix custom contexts in fast resolve mode

closes #675

8 years agoFix typo (#687)
Daniel van Flymen [Wed, 1 Mar 2017 19:10:34 +0000 (14:10 -0500)] 
Fix typo (#687)

8 years agoUse proper `versionadded` annotation in docs
Adrian Moennich [Sun, 26 Feb 2017 17:01:59 +0000 (18:01 +0100)] 
Use proper `versionadded` annotation in docs

8 years agobdist_wheel replaces wheel
Jeff Widman [Sat, 11 Feb 2017 07:12:14 +0000 (23:12 -0800)] 
bdist_wheel replaces wheel

https://packaging.python.org/distributing/#universal-wheels

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 28 Jan 2017 14:44:17 +0000 (15:44 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.6-dev
Armin Ronacher [Sat, 28 Jan 2017 14:43:46 +0000 (15:43 +0100)] 
2.9.6-dev

8 years agoBump version number to 2.9.5 2.9.5
Armin Ronacher [Sat, 28 Jan 2017 14:42:29 +0000 (15:42 +0100)] 
Bump version number to 2.9.5

8 years agoSet date for 2.9.5
Armin Ronacher [Sat, 28 Jan 2017 14:42:19 +0000 (15:42 +0100)] 
Set date for 2.9.5

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 28 Jan 2017 14:34:25 +0000 (15:34 +0100)] 
Merge branch '2.9-maintenance'

8 years agoFixed async macro autoescape. Fixes #671
Armin Ronacher [Sat, 28 Jan 2017 14:33:09 +0000 (15:33 +0100)] 
Fixed async macro autoescape. Fixes #671

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:49:51 +0000 (20:49 +0100)] 
Merge branch '2.9-maintenance'

8 years agoReduce unused unicodedata dump. Fixes #666
Armin Ronacher [Tue, 24 Jan 2017 19:49:43 +0000 (20:49 +0100)] 
Reduce unused unicodedata dump. Fixes #666

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:22:27 +0000 (20:22 +0100)] 
Merge branch '2.9-maintenance'

8 years agoResolved extends errors in async mode (Fixes #668)
Armin Ronacher [Tue, 24 Jan 2017 19:22:19 +0000 (20:22 +0100)] 
Resolved extends errors in async mode (Fixes #668)

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:16:20 +0000 (20:16 +0100)] 
Merge branch '2.9-maintenance'

8 years agoCorrectly use buffer for else frame in loops. Fixes #669
Armin Ronacher [Tue, 24 Jan 2017 19:16:02 +0000 (20:16 +0100)] 
Correctly use buffer for else frame in loops. Fixes #669

8 years agoMerge branch '2.9-maintenance'
Markus Unterwaditzer [Tue, 24 Jan 2017 15:36:16 +0000 (16:36 +0100)] 
Merge branch '2.9-maintenance'

8 years agofix failing tests: removed some broken code (#661)
Andrew Arendt [Thu, 12 Jan 2017 18:46:05 +0000 (12:46 -0600)] 
fix failing tests: removed some broken code (#661)

8 years agoAdded changelog entry for #658
Armin Ronacher [Thu, 12 Jan 2017 22:50:08 +0000 (23:50 +0100)] 
Added changelog entry for #658

8 years agoAdd "is in" containment test (#658)
Dirk D [Thu, 12 Jan 2017 21:03:38 +0000 (22:03 +0100)] 
Add "is in" containment test (#658)

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 19:11:00 +0000 (20:11 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdd support back for custom resolves on old resolve method
Armin Ronacher [Thu, 12 Jan 2017 19:10:58 +0000 (20:10 +0100)] 
Add support back for custom resolves on old resolve method

8 years agofix failing tests: removed some broken code (#661)
Andrew Arendt [Thu, 12 Jan 2017 18:46:05 +0000 (12:46 -0600)] 
fix failing tests: removed some broken code (#661)

8 years agoMerge branch '2.9-maintenance' 630/head
Armin Ronacher [Thu, 12 Jan 2017 15:00:17 +0000 (16:00 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a note for #657
Armin Ronacher [Thu, 12 Jan 2017 15:00:02 +0000 (16:00 +0100)] 
Added a note for #657

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:55:29 +0000 (15:55 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAlso restore original str method
Armin Ronacher [Thu, 12 Jan 2017 14:55:20 +0000 (15:55 +0100)] 
Also restore original str method

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:53:36 +0000 (15:53 +0100)] 
Merge branch '2.9-maintenance'

8 years agoRestore original tuple repr for grouper. Fixes #654
Armin Ronacher [Thu, 12 Jan 2017 14:53:09 +0000 (15:53 +0100)] 
Restore original tuple repr for grouper.  Fixes #654

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:47:26 +0000 (15:47 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a note on loop scoping
Armin Ronacher [Thu, 12 Jan 2017 14:47:18 +0000 (15:47 +0100)] 
Added a note on loop scoping

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:43:39 +0000 (15:43 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded another regression test for ansible/ansible#20063
Armin Ronacher [Thu, 12 Jan 2017 14:43:31 +0000 (15:43 +0100)] 
Added another regression test for ansible/ansible#20063

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:38:38 +0000 (15:38 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a test for an assumed regression (refs #659)
Armin Ronacher [Thu, 12 Jan 2017 14:38:31 +0000 (15:38 +0100)] 
Added a test for an assumed regression (refs #659)

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 10 Jan 2017 08:24:55 +0000 (09:24 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.5-dev
Armin Ronacher [Tue, 10 Jan 2017 08:24:24 +0000 (09:24 +0100)] 
2.9.5-dev

8 years agoBump version number to 2.9.4 2.9.4
Armin Ronacher [Tue, 10 Jan 2017 08:24:10 +0000 (09:24 +0100)] 
Bump version number to 2.9.4

8 years ago2.9.4
Armin Ronacher [Tue, 10 Jan 2017 08:23:55 +0000 (09:23 +0100)] 
2.9.4

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Tue, 10 Jan 2017 08:21:57 +0000 (09:21 +0100)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 10 Jan 2017 08:21:45 +0000 (09:21 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAllow to reconfigure the default for truncate leeway
Armin Ronacher [Tue, 10 Jan 2017 08:21:14 +0000 (09:21 +0100)] 
Allow to reconfigure the default for truncate leeway

Refs #610

8 years agoImprove issue template
Adrian [Mon, 9 Jan 2017 16:37:18 +0000 (17:37 +0100)] 
Improve issue template

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Mon, 9 Jan 2017 15:51:14 +0000 (16:51 +0100)] 
Merge branch '2.9-maintenance'

8 years agoResolved bad code generation on toplevel ifs
Armin Ronacher [Mon, 9 Jan 2017 15:50:54 +0000 (16:50 +0100)] 
Resolved bad code generation on toplevel ifs

This fixes #651

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Mon, 9 Jan 2017 11:23:32 +0000 (12:23 +0100)] 
Merge branch '2.9-maintenance'

8 years agoCorrectly scope loop filters. Fixes #649
Armin Ronacher [Mon, 9 Jan 2017 11:23:18 +0000 (12:23 +0100)] 
Correctly scope loop filters.  Fixes #649

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Mon, 9 Jan 2017 10:05:46 +0000 (11:05 +0100)] 
Merge branch '2.9-maintenance'

8 years agoMerge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance
Armin Ronacher [Mon, 9 Jan 2017 10:03:10 +0000 (11:03 +0100)] 
Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance

8 years agoIncrement bytecode cache version. Fixes #650
Armin Ronacher [Mon, 9 Jan 2017 10:02:55 +0000 (11:02 +0100)] 
Increment bytecode cache version.  Fixes #650

8 years agoShow 2.9 build badge instead of 2.7 in README
Adrian [Mon, 9 Jan 2017 01:31:09 +0000 (02:31 +0100)] 
Show 2.9 build badge instead of 2.7 in README

8 years agoRemove unused/duplicate imports
Adrian Moennich [Sun, 8 Jan 2017 23:21:45 +0000 (00:21 +0100)] 
Remove unused/duplicate imports

8 years agoFix another invalid \s escale sequence
Adrian Moennich [Sun, 8 Jan 2017 23:08:40 +0000 (00:08 +0100)] 
Fix another invalid \s escale sequence

8 years agoMove regex flags to separate argument
Adrian Moennich [Sun, 8 Jan 2017 22:38:23 +0000 (23:38 +0100)] 
Move regex flags to separate argument

8 years agoEnable py36 in tox.ini
Adrian Moennich [Sun, 8 Jan 2017 22:34:31 +0000 (23:34 +0100)] 
Enable py36 in tox.ini

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 22:40:52 +0000 (23:40 +0100)] 
Merge branch '2.9-maintenance'

8 years agoFixed some string literal warnings. Fixes #646
Armin Ronacher [Sun, 8 Jan 2017 22:40:38 +0000 (23:40 +0100)] 
Fixed some string literal warnings. Fixes #646

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 21:25:11 +0000 (22:25 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.4-dev
Armin Ronacher [Sun, 8 Jan 2017 21:24:32 +0000 (22:24 +0100)] 
2.9.4-dev

8 years agoBump version number to 2.9.3 2.9.3
Armin Ronacher [Sun, 8 Jan 2017 21:23:53 +0000 (22:23 +0100)] 
Bump version number to 2.9.3

8 years ago2.9.3
Armin Ronacher [Sun, 8 Jan 2017 21:23:25 +0000 (22:23 +0100)] 
2.9.3

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)] 
Merge branch '2.9-maintenance'

8 years agoImplement with-tag with a custom node
Armin Ronacher [Sun, 8 Jan 2017 14:35:54 +0000 (15:35 +0100)] 
Implement with-tag with a custom node

8 years agoAdded test for the scope node
Armin Ronacher [Sun, 8 Jan 2017 13:37:57 +0000 (14:37 +0100)] 
Added test for the scope node

8 years agoOptimize the with test
Armin Ronacher [Sun, 8 Jan 2017 13:22:29 +0000 (14:22 +0100)] 
Optimize the with test

8 years agoMoved with test to coretags
Armin Ronacher [Sun, 8 Jan 2017 13:20:55 +0000 (14:20 +0100)] 
Moved with test to coretags

8 years agoAdded support for unoptimized scopes
Armin Ronacher [Sun, 8 Jan 2017 11:01:27 +0000 (12:01 +0100)] 
Added support for unoptimized scopes

8 years agoWIP for overlay scopes
Armin Ronacher [Sun, 8 Jan 2017 10:10:55 +0000 (11:10 +0100)] 
WIP for overlay scopes

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 10:21:39 +0000 (11:21 +0100)] 
Merge branch '2.9-maintenance'

8 years agoSupport new scoping rules in scoped blocks
Armin Ronacher [Sun, 8 Jan 2017 10:21:32 +0000 (11:21 +0100)] 
Support new scoping rules in scoped blocks

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 08:43:57 +0000 (09:43 +0100)] 
Merge branch '2.9-maintenance'

8 years agoMention new set scoping behavior. Refs #641
Armin Ronacher [Sun, 8 Jan 2017 08:43:45 +0000 (09:43 +0100)] 
Mention new set scoping behavior. Refs #641

8 years agoMoved a changelog entry to the right release
Armin Ronacher [Sun, 8 Jan 2017 08:41:34 +0000 (09:41 +0100)] 
Moved a changelog entry to the right release

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 08:28:06 +0000 (09:28 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded bug reference
Armin Ronacher [Sun, 8 Jan 2017 08:27:51 +0000 (09:27 +0100)] 
Added bug reference

8 years agoDo not use yield from for blocks with buffers. Fixes #645
Armin Ronacher [Sun, 8 Jan 2017 08:27:11 +0000 (09:27 +0100)] 
Do not use yield from for blocks with buffers.  Fixes #645

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 02:19:04 +0000 (03:19 +0100)] 
Merge branch '2.9-maintenance'

8 years agoImplement consistent scoping for sets in loops
Armin Ronacher [Sun, 8 Jan 2017 02:17:30 +0000 (03:17 +0100)] 
Implement consistent scoping for sets in loops

While technically this applies to any scope and not just for loops
it comes up most commonly in the context of for loops.  This now
defines the behavior for scoping in a way that is consistent but
different than it was in the past.  There is an ongoing conversation
if we should keep it that way or not.

References #641

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 01:51:29 +0000 (02:51 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.3-dev
Armin Ronacher [Sun, 8 Jan 2017 01:50:57 +0000 (02:50 +0100)] 
2.9.3-dev

8 years agoBump version number to 2.9.2 2.9.2
Armin Ronacher [Sun, 8 Jan 2017 01:50:41 +0000 (02:50 +0100)] 
Bump version number to 2.9.2

8 years ago2.8.2
Armin Ronacher [Sun, 8 Jan 2017 01:50:27 +0000 (02:50 +0100)] 
2.8.2

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sun, 8 Jan 2017 01:19:12 +0000 (02:19 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdd support for explicit callers
Armin Ronacher [Sun, 8 Jan 2017 01:16:41 +0000 (02:16 +0100)] 
Add support for explicit callers

This adds support for a never intended Jinja2 feature which however
worked in limited support before due to a bug with the identifier
scoping.  A quick github code search indicates that developers
commonly did this to set the default caller to none.

This fixes #642

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 7 Jan 2017 22:23:07 +0000 (23:23 +0100)] 
Merge branch '2.9-maintenance'

8 years agoCorrect bad scoping for for loops. This fixes #640
Armin Ronacher [Sat, 7 Jan 2017 22:15:07 +0000 (23:15 +0100)] 
Correct bad scoping for for loops.  This fixes #640

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 7 Jan 2017 15:57:25 +0000 (16:57 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.2-dev
Armin Ronacher [Sat, 7 Jan 2017 15:56:57 +0000 (16:56 +0100)] 
2.9.2-dev