]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
10 years agoDOC: Update templates.rst: syntax, commas 389/head
Wes Turner [Thu, 11 Dec 2014 11:24:53 +0000 (05:24 -0600)] 
DOC: Update templates.rst: syntax, commas

10 years agoIncreased cache size to 400.
Armin Ronacher [Thu, 28 Aug 2014 07:10:22 +0000 (09:10 +0200)] 
Increased cache size to 400.

11 years agoMerge pull request #230 from p1otr/master
Armin Ronacher [Tue, 10 Jun 2014 20:34:12 +0000 (21:34 +0100)] 
Merge pull request #230 from p1otr/master

documentation typos

11 years agoMerge pull request #341 from apetresc/patch-1
Armin Ronacher [Mon, 9 Jun 2014 20:59:04 +0000 (21:59 +0100)] 
Merge pull request #341 from apetresc/patch-1

Fixing dead link to documentation in README.rst

11 years agoFixing dead link to documentation in README.rst 341/head
Adrian Petrescu [Mon, 9 Jun 2014 20:55:03 +0000 (16:55 -0400)] 
Fixing dead link to documentation in README.rst

Current link works as of June 9th, 2014.

11 years agoDocumented {% set %}...{% endset %}
Armin Ronacher [Fri, 6 Jun 2014 18:58:38 +0000 (00:58 +0600)] 
Documented {% set %}...{% endset %}

11 years agoImplemented a block set tag.
Armin Ronacher [Fri, 6 Jun 2014 18:56:05 +0000 (00:56 +0600)] 
Implemented a block set tag.

11 years agoFlake 8 fixes
Armin Ronacher [Fri, 6 Jun 2014 17:10:07 +0000 (23:10 +0600)] 
Flake 8 fixes

11 years agoRemoved unused variable
Armin Ronacher [Fri, 6 Jun 2014 17:05:04 +0000 (23:05 +0600)] 
Removed unused variable

11 years agoMerge pull request #274 from thomasballinger/fix-1
Armin Ronacher [Fri, 6 Jun 2014 16:57:54 +0000 (22:57 +0600)] 
Merge pull request #274 from thomasballinger/fix-1

docfixes in Variables section of templates.rst

11 years agoMerge pull request #284 from LucianU/patch-1
Armin Ronacher [Fri, 6 Jun 2014 16:57:36 +0000 (22:57 +0600)] 
Merge pull request #284 from LucianU/patch-1

Spelling, grammar, and punctuation fixes to extensions docs.

11 years agoMerge pull request #293 from carldunham/docfix
Armin Ronacher [Fri, 6 Jun 2014 16:55:39 +0000 (22:55 +0600)] 
Merge pull request #293 from carldunham/docfix

fixed some typos and clarifying

11 years agoAdded changelog entry on last commit
Armin Ronacher [Fri, 6 Jun 2014 16:55:20 +0000 (22:55 +0600)] 
Added changelog entry on last commit

11 years agoMerge pull request #282 from timhanus/master
Armin Ronacher [Fri, 6 Jun 2014 16:54:51 +0000 (22:54 +0600)] 
Merge pull request #282 from timhanus/master

force a reload of the template if bytecode fails to unmarshall.  issue #...

11 years agoMerge pull request #287 from omh/master
Armin Ronacher [Fri, 6 Jun 2014 16:54:21 +0000 (22:54 +0600)] 
Merge pull request #287 from omh/master

Fixed typo (igored -> ignored)

11 years agoMerge branch '2.7-maintenance'
Armin Ronacher [Fri, 6 Jun 2014 16:51:59 +0000 (22:51 +0600)] 
Merge branch '2.7-maintenance'

11 years agoReady for 2.7.4
Armin Ronacher [Fri, 6 Jun 2014 16:49:44 +0000 (22:49 +0600)] 
Ready for 2.7.4

11 years agoBump version number to 2.7.3 2.7.3
Armin Ronacher [Fri, 6 Jun 2014 16:49:12 +0000 (22:49 +0600)] 
Bump version number to 2.7.3

11 years agoAdded changelog entry
Armin Ronacher [Fri, 6 Jun 2014 16:49:07 +0000 (22:49 +0600)] 
Added changelog entry

11 years agoFix CVE-2014-0012
Tomas Hoger [Sun, 9 Feb 2014 08:40:59 +0000 (09:40 +0100)] 
Fix CVE-2014-0012

Add checks for the per-user temporary directory.  If it already exists, make
sure that it:
- is owned by the current user
- is directory
- has expected permissions

This commit also fixes:
- nt -> n typo pointed out in the review of acb672b
- replace 448 with stat.S_IRWXU when setting directory mode

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
11 years agoApplied changes from #296 for better checking.
Armin Ronacher [Fri, 6 Jun 2014 16:44:49 +0000 (22:44 +0600)] 
Applied changes from #296 for better checking.

11 years agoMake sure filtering returns a list for template listing.
Armin Ronacher [Fri, 6 Jun 2014 16:40:02 +0000 (22:40 +0600)] 
Make sure filtering returns a list for template listing.

11 years agoFixed #320
Armin Ronacher [Fri, 6 Jun 2014 16:31:00 +0000 (22:31 +0600)] 
Fixed #320

11 years agoMerge pull request #312 from fengsp/master
Armin Ronacher [Fri, 6 Jun 2014 16:18:27 +0000 (22:18 +0600)] 
Merge pull request #312 from fengsp/master

Removed duplication from ignored_tokens in lexer

11 years agoMerge pull request #310 from vivekagr/patch-1
Armin Ronacher [Fri, 6 Jun 2014 16:18:06 +0000 (22:18 +0600)] 
Merge pull request #310 from vivekagr/patch-1

Fix typo.

11 years agoFixed a Python 3 regression.
Armin Ronacher [Fri, 6 Jun 2014 16:17:05 +0000 (22:17 +0600)] 
Fixed a Python 3 regression.

11 years agoAdded tests for logging undefined and added it to the docs.
Armin Ronacher [Fri, 6 Jun 2014 16:14:45 +0000 (22:14 +0600)] 
Added tests for logging undefined and added it to the docs.

11 years agoAdded support for logging of undefined objects.
Armin Ronacher [Fri, 6 Jun 2014 16:00:04 +0000 (22:00 +0600)] 
Added support for logging of undefined objects.

fixup!

fixup!

11 years agoAdded changelog for #304 fix.
Armin Ronacher [Fri, 6 Jun 2014 15:49:25 +0000 (21:49 +0600)] 
Added changelog for #304 fix.

11 years agoFix for #304
Armin Ronacher [Fri, 6 Jun 2014 15:48:42 +0000 (21:48 +0600)] 
Fix for #304

11 years agoMerge pull request #324 from br0p0p/patch-1
Armin Ronacher [Fri, 6 Jun 2014 15:38:55 +0000 (21:38 +0600)] 
Merge pull request #324 from br0p0p/patch-1

Update Jinja2 tip link

11 years agoMerge branch 'pr/314'
Armin Ronacher [Fri, 6 Jun 2014 15:37:47 +0000 (21:37 +0600)] 
Merge branch 'pr/314'

11 years agoAdded changelog entry
Armin Ronacher [Fri, 6 Jun 2014 15:36:53 +0000 (21:36 +0600)] 
Added changelog entry

11 years agoMerge pull request #315 from lazka/fix-iter-length
Armin Ronacher [Fri, 6 Jun 2014 15:36:26 +0000 (21:36 +0600)] 
Merge pull request #315 from lazka/fix-iter-length

Fix loop context length calculation for iterators. Fixes #244

11 years agoMerge pull request #317 from shedokan/master
Armin Ronacher [Fri, 6 Jun 2014 15:36:08 +0000 (21:36 +0600)] 
Merge pull request #317 from shedokan/master

Improved performance of filters.do_truncate()

11 years agoMerge pull request #319 from richierichrawr/master
Armin Ronacher [Fri, 6 Jun 2014 15:35:56 +0000 (21:35 +0600)] 
Merge pull request #319 from richierichrawr/master

Edit code comments for readability

11 years agoAdded 3.4 to tox
Armin Ronacher [Fri, 6 Jun 2014 15:33:07 +0000 (21:33 +0600)] 
Added 3.4 to tox

11 years agoAdded 3.4 to travis
Armin Ronacher [Fri, 6 Jun 2014 15:32:55 +0000 (21:32 +0600)] 
Added 3.4 to travis

11 years agoStyle cleanups in environment and a tiny bugfix.
Armin Ronacher [Fri, 6 Jun 2014 15:31:03 +0000 (21:31 +0600)] 
Style cleanups in environment and a tiny bugfix.

11 years agoFixed issue #309
Armin Ronacher [Fri, 6 Jun 2014 15:30:53 +0000 (21:30 +0600)] 
Fixed issue #309

11 years agoMore resilient template directory handling for bytecode cache.
Armin Ronacher [Fri, 6 Jun 2014 15:28:09 +0000 (21:28 +0600)] 
More resilient template directory handling for bytecode cache.

11 years agoMerge pull request #331 from SteelyWing/patch-1
Armin Ronacher [Fri, 6 Jun 2014 15:23:30 +0000 (21:23 +0600)] 
Merge pull request #331 from SteelyWing/patch-1

fix os.name of Windows

11 years agoAdded changelog entry
Armin Ronacher [Fri, 6 Jun 2014 15:23:13 +0000 (21:23 +0600)] 
Added changelog entry

11 years agoMerge pull request #332 from SteelyWing/patch-2
Armin Ronacher [Fri, 6 Jun 2014 15:22:27 +0000 (21:22 +0600)] 
Merge pull request #332 from SteelyWing/patch-2

Use abs path for cache key

11 years agoMerge pull request #333 from SteelyWing/patch-3
Armin Ronacher [Fri, 6 Jun 2014 15:20:11 +0000 (21:20 +0600)] 
Merge pull request #333 from SteelyWing/patch-3

close temp file

11 years agoMerge pull request #336 from berkerpeksag/wheel-support
Armin Ronacher [Fri, 6 Jun 2014 15:19:56 +0000 (21:19 +0600)] 
Merge pull request #336 from berkerpeksag/wheel-support

Add wheel support.

11 years agoMerge pull request #337 from berkerpeksag/delete-with-speedups-warning
Armin Ronacher [Fri, 6 Jun 2014 15:19:40 +0000 (21:19 +0600)] 
Merge pull request #337 from berkerpeksag/delete-with-speedups-warning

Delete the ignore --with-speedups message.

11 years agoDelete the ignore --with-speedups message. 337/head
Berker Peksag [Mon, 19 May 2014 03:55:02 +0000 (06:55 +0300)] 
Delete the ignore --with-speedups message.

The with-speedups flag was deprecated 4 years and
3 major releases ago.

11 years agoAdd wheel support. 336/head
Berker Peksag [Mon, 19 May 2014 03:48:10 +0000 (06:48 +0300)] 
Add wheel support.

11 years agobetter assignment 332/head
Wing [Sat, 17 May 2014 06:30:34 +0000 (14:30 +0800)] 
better assignment

11 years agocheck for if loader does not implement get_source()
Wing [Sat, 17 May 2014 05:42:53 +0000 (13:42 +0800)] 
check for if loader does not implement get_source()

11 years agoclose temp file 333/head
Wing [Sat, 17 May 2014 05:18:39 +0000 (13:18 +0800)] 
close temp file

The test can't remove the temp file on Windows, because `mkstemp()` will open the temp.

11 years agoif template is not file, use name for cache key
Wing [Sat, 17 May 2014 04:49:49 +0000 (12:49 +0800)] 
if template is not file, use name for cache key

11 years agoUpdate environment.py
Wing [Fri, 16 May 2014 19:52:50 +0000 (03:52 +0800)] 
Update environment.py

11 years agoUpdate environment.py
Wing [Fri, 16 May 2014 19:52:11 +0000 (03:52 +0800)] 
Update environment.py

11 years agouse abs path for cache key
Wing [Fri, 16 May 2014 19:36:57 +0000 (03:36 +0800)] 
use abs path for cache key

11 years agofix os.name of Windows 331/head
Wing [Fri, 16 May 2014 19:27:05 +0000 (03:27 +0800)] 
fix os.name of Windows

os.name of Windows is 'nt', https://docs.python.org/3.4/library/os.html#os.name

11 years agoUpdate Jinja2 tip link 324/head
Caleb Williams [Thu, 17 Apr 2014 04:44:56 +0000 (23:44 -0500)] 
Update Jinja2 tip link

11 years agoSwitch to new server
Armin Ronacher [Mon, 7 Apr 2014 21:25:37 +0000 (23:25 +0200)] 
Switch to new server

11 years agoEdit code comments for readability 319/head
richierichrawr [Sat, 5 Apr 2014 20:33:51 +0000 (16:33 -0400)] 
Edit code comments for readability

Changed a few things to make it more understandable

11 years agoImproved performance of filters.do_truncate() 317/head
Eric Sh [Thu, 3 Apr 2014 11:19:05 +0000 (14:19 +0300)] 
Improved performance of filters.do_truncate()

11 years agoFix loop context length calculation for iterators. Fixes #244 315/head
Christoph Reiter [Sun, 30 Mar 2014 15:40:08 +0000 (17:40 +0200)] 
Fix loop context length calculation for iterators. Fixes #244

This resulted in wrong values for revindex and revindex0
while looping over an iterator.

11 years agoFixed typo 314/head
fsp [Sun, 30 Mar 2014 06:18:10 +0000 (14:18 +0800)] 
Fixed typo

11 years agoRemoved duplication from ignored_tokens in lexer 312/head
fsp [Tue, 18 Mar 2014 05:56:29 +0000 (13:56 +0800)] 
Removed duplication from ignored_tokens in lexer

11 years agoFix typo. 310/head
Vivek Agarwal [Wed, 12 Mar 2014 14:56:03 +0000 (20:26 +0530)] 
Fix typo.

11 years agofixed some typos and clarifying 293/head
Carl A Dunham [Sat, 18 Jan 2014 21:26:10 +0000 (15:26 -0600)] 
fixed some typos and clarifying

11 years agoMerge branch '2.7-maintenance'
Armin Ronacher [Fri, 10 Jan 2014 10:43:55 +0000 (10:43 +0000)] 
Merge branch '2.7-maintenance'

11 years agoThis is 0.7.3-dev
Armin Ronacher [Fri, 10 Jan 2014 10:43:07 +0000 (10:43 +0000)] 
This is 0.7.3-dev

11 years agoBump version number to 2.7.2 2.7.2
Armin Ronacher [Fri, 10 Jan 2014 10:42:33 +0000 (10:42 +0000)] 
Bump version number to 2.7.2

11 years agoFixed a syntax error on Python 3
Armin Ronacher [Fri, 10 Jan 2014 10:42:24 +0000 (10:42 +0000)] 
Fixed a syntax error on Python 3

11 years agoRelease 2.7.2 today
Armin Ronacher [Fri, 10 Jan 2014 10:41:28 +0000 (10:41 +0000)] 
Release 2.7.2 today

11 years agoFixed a security issue with temporary files on the filesystem cache on UNIX.
Armin Ronacher [Fri, 10 Jan 2014 10:40:51 +0000 (10:40 +0000)] 
Fixed a security issue with temporary files on the filesystem cache on UNIX.

11 years agoFixed typo (igored -> ignored) 287/head
Ole Morten Halvorsen [Mon, 30 Dec 2013 12:37:23 +0000 (23:37 +1100)] 
Fixed typo (igored -> ignored)

11 years agoAdded a note on why equalto exists.
Armin Ronacher [Thu, 12 Dec 2013 22:32:44 +0000 (22:32 +0000)] 
Added a note on why equalto exists.

11 years agoAdded a changelog entry for the equalto filter
Armin Ronacher [Thu, 12 Dec 2013 22:30:24 +0000 (22:30 +0000)] 
Added a changelog entry for the equalto filter

11 years agoMerge branch 'pr/283'
Armin Ronacher [Thu, 12 Dec 2013 22:29:46 +0000 (22:29 +0000)] 
Merge branch 'pr/283'

11 years agoAdded changelog entry for truncate filter
Armin Ronacher [Thu, 12 Dec 2013 22:28:21 +0000 (22:28 +0000)] 
Added changelog entry for truncate filter

11 years agoMerge branch 'pr/267'
Armin Ronacher [Thu, 12 Dec 2013 22:27:53 +0000 (22:27 +0000)] 
Merge branch 'pr/267'

11 years agoAdded and corrected changelog entry
Armin Ronacher [Thu, 12 Dec 2013 22:27:28 +0000 (22:27 +0000)] 
Added and corrected changelog entry

11 years agoMerge branch 'pr/266'
Armin Ronacher [Thu, 12 Dec 2013 22:26:58 +0000 (22:26 +0000)] 
Merge branch 'pr/266'

11 years agoAdded changelog entry
Armin Ronacher [Thu, 12 Dec 2013 22:26:29 +0000 (22:26 +0000)] 
Added changelog entry

11 years agoSpelling, grammar, and punctuation fixes to extensions docs. 284/head
Lucian Ursu [Fri, 29 Nov 2013 12:16:06 +0000 (14:16 +0200)] 
Spelling, grammar, and punctuation fixes to extensions docs.

11 years agoexplicitly catch marshal errors rather than genertic exception #281 282/head
Tim Hanus [Fri, 22 Nov 2013 16:18:25 +0000 (10:18 -0600)] 
explicitly catch marshal errors rather than genertic exception #281

11 years agoDefine tests for equalto. 283/head
Thomas van Noort [Fri, 22 Nov 2013 12:50:51 +0000 (13:50 +0100)] 
Define tests for equalto.

11 years agoAdd equalto test as value-level analogue of reference-level sameas test.
Thomas van Noort [Fri, 22 Nov 2013 11:24:52 +0000 (12:24 +0100)] 
Add equalto test as value-level analogue of reference-level sameas test.

11 years agoforce a reload of the template if bytecode fails to unmarshall. issue #281
Tim Hanus [Thu, 21 Nov 2013 19:15:57 +0000 (13:15 -0600)] 
force a reload of the template if bytecode fails to unmarshall.  issue #281

11 years agodocfixes in Variables section of templates.rst 274/head
Thomas Ballinger [Sun, 27 Oct 2013 22:53:06 +0000 (18:53 -0400)] 
docfixes in Variables section of templates.rst

I was distracted by "alternative" -> alternatively, then changed other bits and pieces in the section.
fixes suggested by @Naddiseo, and clarify that "what a variable looks like" really means "what attributes a variable has."

11 years agoIssue #121: The truncate filter now counts the length 267/head
Berker Peksag [Sun, 8 Sep 2013 15:09:29 +0000 (18:09 +0300)] 
Issue #121: The truncate filter now counts the length
of the *end* parameter when truncating a string.

This is the same behavior as Django's truncate filter:

https://docs.djangoproject.com/en/1.4/ref/templates/builtins/#truncatechars

11 years agoIssue #71: Add `followlinks` parameter to FileSystemLoader. 266/head
Berker Peksag [Sun, 8 Sep 2013 15:27:58 +0000 (18:27 +0300)] 
Issue #71: Add `followlinks` parameter to FileSystemLoader.

11 years agoIssue #126: Add `target` keyword argument to urlize. 261/head
Berker Peksag [Wed, 21 Aug 2013 10:13:48 +0000 (13:13 +0300)] 
Issue #126: Add `target` keyword argument to urlize.

12 years agoMerge branch '2.7-maintenance'
Armin Ronacher [Wed, 7 Aug 2013 15:04:01 +0000 (16:04 +0100)] 
Merge branch '2.7-maintenance'

12 years agoFixed prefix loader now properly forward globals.
Armin Ronacher [Wed, 7 Aug 2013 15:01:00 +0000 (16:01 +0100)] 
Fixed prefix loader now properly forward globals.

This fixes #238

12 years agoPrepared a changelog entry
Armin Ronacher [Wed, 7 Aug 2013 14:59:07 +0000 (15:59 +0100)] 
Prepared a changelog entry

12 years agoMerge branch '2.7-maintenance'
Armin Ronacher [Wed, 7 Aug 2013 13:28:50 +0000 (14:28 +0100)] 
Merge branch '2.7-maintenance'

12 years agoReady for another release
Armin Ronacher [Wed, 7 Aug 2013 13:27:53 +0000 (14:27 +0100)] 
Ready for another release

12 years agoBump version number to 2.7.1 2.7.1
Armin Ronacher [Wed, 7 Aug 2013 13:27:31 +0000 (14:27 +0100)] 
Bump version number to 2.7.1

12 years agoFixed release script
Armin Ronacher [Wed, 7 Aug 2013 13:25:19 +0000 (14:25 +0100)] 
Fixed release script

12 years agoBugfix release is today
Armin Ronacher [Wed, 7 Aug 2013 12:04:00 +0000 (13:04 +0100)] 
Bugfix release is today

12 years agoCorrected title filter behavior.
Armin Ronacher [Wed, 7 Aug 2013 11:53:03 +0000 (12:53 +0100)] 
Corrected title filter behavior.

The title filter will now correctly lowercase the non first letter
like the regular Python filter does.

This fixes #251.

12 years agoFixed warnings if Python is run with -3.
Armin Ronacher [Wed, 7 Aug 2013 11:48:37 +0000 (12:48 +0100)] 
Fixed warnings if Python is run with -3.

This also adds proper hashing and comparision support to
undefined objects.

This fixes #224