jinja2.git
12 years agoAdded release script 2.6
Armin Ronacher [Sun, 24 Jul 2011 19:48:29 +0000 (21:48 +0200)]
Added release script

12 years agoversion is now static
Armin Ronacher [Sun, 24 Jul 2011 19:46:23 +0000 (21:46 +0200)]
version is now static

12 years agoPrepairing for a 2.6 release
Armin Ronacher [Sun, 24 Jul 2011 19:46:07 +0000 (21:46 +0200)]
Prepairing for a 2.6 release

12 years agoMerge pull request #48 from ymirpl/master
Armin Ronacher [Tue, 12 Jul 2011 12:02:23 +0000 (05:02 -0700)]
Merge pull request #48 from ymirpl/master

"NameError: global name 'code' is not defined" if using byte code cache on Python 2.7.1.

12 years agoFixed a bug causing "NameError: global name 'code' is not defined".
Marcin Mincer [Tue, 12 Jul 2011 08:59:54 +0000 (01:59 -0700)]
Fixed a bug causing "NameError: global name 'code' is not defined".

12 years agoMerge pull request #47 from mineo/patch-1
Armin Ronacher [Thu, 7 Jul 2011 19:10:31 +0000 (12:10 -0700)]
Merge pull request #47 from mineo/patch-1

Fix a typo

12 years agoFix a typo
Wieland Hoffmann [Thu, 7 Jul 2011 19:09:21 +0000 (12:09 -0700)]
Fix a typo

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoFixed a broken example. This fies #45
Armin Ronacher [Thu, 7 Jul 2011 13:42:25 +0000 (15:42 +0200)]
Fixed a broken example.  This fies #45

12 years agoMerge pull request #43 from jfinkels/patch-1
Armin Ronacher [Tue, 5 Jul 2011 16:25:39 +0000 (09:25 -0700)]
Merge pull request #43 from jfinkels/patch-1

fixed typo in documentation: "environmentfilter" -> "evalcontextfilter"

12 years agofixed typo in documentation: "environmentfilter" -> "evalcontextfilter"
Jeffrey Finkelstein [Fri, 1 Jul 2011 22:46:54 +0000 (15:46 -0700)]
fixed typo in documentation: "environmentfilter" -> "evalcontextfilter"

12 years agoMerge pull request #41 from andymckay/master
Armin Ronacher [Thu, 30 Jun 2011 21:42:01 +0000 (14:42 -0700)]
Merge pull request #41 from andymckay/master

typo?

12 years agofix typo
Andy McKay [Thu, 30 Jun 2011 21:40:05 +0000 (14:40 -0700)]
fix typo

12 years agoMerge pull request #39 from failberg/master
Armin Ronacher [Fri, 17 Jun 2011 02:13:38 +0000 (19:13 -0700)]
Merge pull request #39 from failberg/master

Bugfix for list_templates in PackageLoader

12 years agoFixed groupby bare integer. This fixes #40
Armin Ronacher [Fri, 17 Jun 2011 02:13:00 +0000 (04:13 +0200)]
Fixed groupby bare integer.  This fixes #40

12 years agoFix list_modules for PackageLoader
Bryan Berg [Tue, 14 Jun 2011 01:43:11 +0000 (18:43 -0700)]
Fix list_modules for PackageLoader

12 years agoMerge pull request #33 from razamatan/master
Armin Ronacher [Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)]
Merge pull request #33 from razamatan/master

jinja.vim subsumes htmljinja.vim

12 years agoVarious tweaks to support bccache on Python 3. This fixes #34
Armin Ronacher [Tue, 24 May 2011 15:50:08 +0000 (17:50 +0200)]
Various tweaks to support bccache on Python 3.  This fixes #34

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoAdded test for mappings. This fixes #35
Armin Ronacher [Tue, 24 May 2011 14:40:23 +0000 (16:40 +0200)]
Added test for mappings.  This fixes #35

12 years agoMore extensions in jinja debug
Armin Ronacher [Tue, 24 May 2011 14:40:09 +0000 (16:40 +0200)]
More extensions in jinja debug

12 years agoMerge pull request #37 from fabiant7t/patch-1
Armin Ronacher [Tue, 24 May 2011 14:33:06 +0000 (07:33 -0700)]
Merge pull request #37 from fabiant7t/patch-1

Fixed example of a division with a truncated integer result

12 years agoFixed example of a division with a truncated integer result (it's // instead of /)
Fabian Topfstedt [Sun, 22 May 2011 15:19:12 +0000 (08:19 -0700)]
Fixed example of a division with a truncated integer result (it's // instead of /)

12 years agoMerge pull request #36 from afandian/patch-1
Armin Ronacher [Thu, 19 May 2011 12:01:53 +0000 (05:01 -0700)]
Merge pull request #36 from afandian/patch-1

Kampala is the capital of Uganda!

12 years agoKampala is the capital of Uganda! Jinja's significant, but not the capital...
Joe Wass [Thu, 19 May 2011 10:58:05 +0000 (03:58 -0700)]
Kampala is the capital of Uganda! Jinja's significant, but not the capital...

12 years agojinja.vim subsumes htmljinja.vim
Jin Yi [Fri, 13 May 2011 23:04:20 +0000 (16:04 -0700)]
jinja.vim subsumes htmljinja.vim

12 years agoMerge pull request #30 from sevas/wordwrap-newline
Armin Ronacher [Sat, 7 May 2011 22:27:10 +0000 (15:27 -0700)]
Merge pull request #30 from sevas/wordwrap-newline

wordwrap filter should use the newline_sequence defined in current Environment

12 years agoMerge pull request #26 from jek/master
Armin Ronacher [Sat, 7 May 2011 22:26:51 +0000 (15:26 -0700)]
Merge pull request #26 from jek/master

Removes some dead code from self.block lookup path

12 years agoMerge pull request #28 from alanhogan/patch-1
Armin Ronacher [Sat, 7 May 2011 22:26:31 +0000 (15:26 -0700)]
Merge pull request #28 from alanhogan/patch-1

Clarity

12 years agowordwrap filter should use the newline_sequence defined in current Environment object
sevas [Sun, 1 May 2011 21:28:25 +0000 (23:28 +0200)]
wordwrap filter should use the newline_sequence defined in current Environment object

12 years agoClarity
Alan Hogan [Fri, 29 Apr 2011 03:18:55 +0000 (20:18 -0700)]
Clarity

13 years agoRemoved dead code.
jason kirtland [Mon, 25 Apr 2011 18:19:22 +0000 (11:19 -0700)]
Removed dead code.

13 years agojinja.el: replace obsolete mumamo-find-possible-chunk with mumamo-quick-chunk-forward...
Kanak Kshetri [Wed, 20 Apr 2011 11:31:15 +0000 (07:31 -0400)]
jinja.el: replace obsolete mumamo-find-possible-chunk with mumamo-quick-chunk-forward . This allows jinja mode to be used with nxhtml mode versions later than 2.07.

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
13 years agoCatch down errors caused by tb_set_next. This fixes #22
Armin Ronacher [Mon, 18 Apr 2011 14:27:14 +0000 (16:27 +0200)]
Catch down errors caused by tb_set_next.  This fixes #22

13 years agoFixed a test case
Armin Ronacher [Sun, 13 Mar 2011 18:33:27 +0000 (14:33 -0400)]
Fixed a test case

13 years agoFixed filesizeformat filter. It should now conform to the official SI prefixes and...
Alan Plum [Thu, 17 Feb 2011 15:54:58 +0000 (16:54 +0100)]
Fixed filesizeformat filter. It should now conform to the official SI prefixes and use the correct prefixes for sizes greater than base ** 4.

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
13 years agoUse actual release info
Armin Ronacher [Sun, 6 Feb 2011 11:28:29 +0000 (12:28 +0100)]
Use actual release info

13 years agoWith number of course. Jinja2.pdf not Jinja.pdf
Armin Ronacher [Sun, 6 Feb 2011 11:21:18 +0000 (12:21 +0100)]
With number of course. Jinja2.pdf not Jinja.pdf

13 years agoYay. PDF docs for Jinja2
Armin Ronacher [Sun, 6 Feb 2011 11:19:30 +0000 (12:19 +0100)]
Yay. PDF docs for Jinja2

13 years agoAnother reference
Armin Ronacher [Sat, 29 Jan 2011 19:29:00 +0000 (20:29 +0100)]
Another reference

13 years agoReference to compile_templates
Armin Ronacher [Sat, 29 Jan 2011 19:26:14 +0000 (20:26 +0100)]
Reference to compile_templates

13 years agoAdded missing references to docs
Armin Ronacher [Sat, 29 Jan 2011 19:19:58 +0000 (20:19 +0100)]
Added missing references to docs

13 years agoSlightly modified headline style
Armin Ronacher [Mon, 24 Jan 2011 11:49:56 +0000 (12:49 +0100)]
Slightly modified headline style

13 years agoMakefile for uploading and stuff
Armin Ronacher [Mon, 24 Jan 2011 01:04:48 +0000 (02:04 +0100)]
Makefile for uploading and stuff

13 years agoNew documentation style go match Flask and Werkzeug better
Armin Ronacher [Mon, 24 Jan 2011 01:03:57 +0000 (02:03 +0100)]
New documentation style go match Flask and Werkzeug better

13 years agoDamn you Sphinx
Armin Ronacher [Mon, 24 Jan 2011 00:16:00 +0000 (01:16 +0100)]
Damn you Sphinx

13 years agoFixed a bug in the documentation tool
Armin Ronacher [Mon, 24 Jan 2011 00:14:20 +0000 (01:14 +0100)]
Fixed a bug in the documentation tool

13 years agojoin now also accepts parameters
Armin Ronacher [Mon, 24 Jan 2011 00:13:51 +0000 (01:13 +0100)]
join now also accepts parameters

13 years agoImproved documentation for sum
Armin Ronacher [Mon, 24 Jan 2011 00:07:36 +0000 (01:07 +0100)]
Improved documentation for sum

13 years agosort now also accepts an attribute
Armin Ronacher [Mon, 24 Jan 2011 00:05:47 +0000 (01:05 +0100)]
sort now also accepts an attribute

13 years agoThe sum filter can now sum up attributes
Armin Ronacher [Sun, 23 Jan 2011 23:57:58 +0000 (00:57 +0100)]
The sum filter can now sum up attributes

13 years agoGrammar.
Armin Ronacher [Sat, 15 Jan 2011 17:35:45 +0000 (18:35 +0100)]
Grammar.

13 years agoNo longer segfault on new versions. This fixes #4
Armin Ronacher [Tue, 11 Jan 2011 19:53:42 +0000 (20:53 +0100)]
No longer segfault on new versions.  This fixes #4

13 years agoFixed imports with scoped blocks
Armin Ronacher [Wed, 22 Dec 2010 22:22:08 +0000 (23:22 +0100)]
Fixed imports with scoped blocks

13 years agogroupby now supports attributes of attributes. This fixes #10
Armin Ronacher [Mon, 20 Dec 2010 23:44:34 +0000 (00:44 +0100)]
groupby now supports attributes of attributes.  This fixes #10

13 years agoUpdated documentation for operator intercepting
Armin Ronacher [Mon, 29 Nov 2010 13:29:00 +0000 (14:29 +0100)]
Updated documentation for operator intercepting

13 years agoImplemented operator intercepting
Armin Ronacher [Mon, 29 Nov 2010 12:21:57 +0000 (13:21 +0100)]
Implemented operator intercepting

13 years agoRemoved more imports
Armin Ronacher [Mon, 29 Nov 2010 12:02:06 +0000 (13:02 +0100)]
Removed more imports

13 years agoRemoved unnecessary imports
Armin Ronacher [Mon, 29 Nov 2010 12:01:39 +0000 (13:01 +0100)]
Removed unnecessary imports

13 years agoFixed a typo and removed a useless backslash
Armin Ronacher [Mon, 29 Nov 2010 11:39:11 +0000 (12:39 +0100)]
Fixed a typo and removed a useless backslash

13 years agoRemoved unused import
Armin Ronacher [Mon, 29 Nov 2010 11:36:18 +0000 (12:36 +0100)]
Removed unused import

13 years agoTraceback support now works with PyPy
Armin Ronacher [Mon, 29 Nov 2010 11:24:57 +0000 (12:24 +0100)]
Traceback support now works with PyPy

13 years agoTraceback hack now works for pypy
Armin Ronacher [Mon, 29 Nov 2010 11:24:03 +0000 (12:24 +0100)]
Traceback hack now works for pypy

13 years agoShould work for cpython and pypy now (if the latter is fixed)
Armin Ronacher [Mon, 29 Nov 2010 11:16:17 +0000 (12:16 +0100)]
Should work for cpython and pypy now (if the latter is fixed)

13 years agoWe cannot fake the descriptor on a tproxy so we have to set _tb_next directly
Armin Ronacher [Mon, 29 Nov 2010 11:14:50 +0000 (12:14 +0100)]
We cannot fake the descriptor on a tproxy so we have to set _tb_next directly

13 years agoStarted work on support for transparent proxies for the debug hack
Armin Ronacher [Mon, 29 Nov 2010 09:50:34 +0000 (10:50 +0100)]
Started work on support for transparent proxies for the debug hack

13 years agoUndefineds now support attribute errors for special attributes. This fixes #6
Armin Ronacher [Fri, 19 Nov 2010 12:51:38 +0000 (13:51 +0100)]
Undefineds now support attribute errors for special attributes.  This fixes #6

13 years agoChanged naked except statements to catch only subclasses of Exception.
Ian Lewis [Sun, 31 Oct 2010 11:29:28 +0000 (20:29 +0900)]
Changed naked except statements to catch only subclasses of Exception.

Naked except statements catch subclasses of BaseException which
can occur anywhere (i.e. KeyboardInterrupt).

Unexpected issues can occur when the exception happens during the
loading of a module. The python interpreter doesn't know about a
module's failed load and does not remove it from sys.modules. This
is particularly a problem on AppEngine where python will think the
module is loaded but in fact the module load has failed.

See: http://code.google.com/p/googleappengine/issues/detail?id=1409
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Mon, 18 Oct 2010 12:38:39 +0000 (14:38 +0200)]
Merge branch '2.5-maintenance'

Conflicts:
CHANGES
setup.py

13 years agoRe-release of 2.5.4 as 2.5.5 without docs 2.5.5
Armin Ronacher [Mon, 18 Oct 2010 12:38:03 +0000 (14:38 +0200)]
Re-release of 2.5.4 as 2.5.5 without docs

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:48:55 +0000 (16:48 +0200)]
Merge branch '2.5-maintenance'

13 years agoRelease 2.5.4 as well 2.5.4
Armin Ronacher [Sun, 17 Oct 2010 14:48:18 +0000 (16:48 +0200)]
Release 2.5.4 as well

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:47:13 +0000 (16:47 +0200)]
Merge branch '2.5-maintenance'

13 years agoFinally fixed the 64bit segfault on big-endian architectures in non-tracing mode
Armin Ronacher [Sun, 17 Oct 2010 14:47:06 +0000 (16:47 +0200)]
Finally fixed the 64bit segfault on big-endian architectures in non-tracing mode

13 years agoFixed extensions not loading properly with overlays
Armin Ronacher [Sun, 17 Oct 2010 14:44:19 +0000 (16:44 +0200)]
Fixed extensions not loading properly with overlays

13 years agomaster will be 2.6
Armin Ronacher [Sun, 17 Oct 2010 14:43:07 +0000 (16:43 +0200)]
master will be 2.6

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:42:32 +0000 (16:42 +0200)]
Merge branch '2.5-maintenance'

13 years agoThis will be 2.5.4
Armin Ronacher [Sun, 17 Oct 2010 14:42:26 +0000 (16:42 +0200)]
This will be 2.5.4

13 years agoAdded upload command for docs
Armin Ronacher [Sun, 17 Oct 2010 14:37:22 +0000 (16:37 +0200)]
Added upload command for docs

13 years agoDocumentation update. Documentation will become the new Jinja2 website
Armin Ronacher [Sun, 17 Oct 2010 14:30:15 +0000 (16:30 +0200)]
Documentation update.  Documentation will become the new Jinja2 website

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:13:02 +0000 (16:13 +0200)]
Merge branch '2.5-maintenance'

13 years agoUpdated setup file for URLs
Armin Ronacher [Sun, 17 Oct 2010 14:12:55 +0000 (16:12 +0200)]
Updated setup file for URLs

13 years agoFixed link to git
Armin Ronacher [Sun, 17 Oct 2010 14:07:38 +0000 (16:07 +0200)]
Fixed link to git

13 years agoChanged links to github
Armin Ronacher [Sun, 17 Oct 2010 14:07:08 +0000 (16:07 +0200)]
Changed links to github

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:04:26 +0000 (16:04 +0200)]
Merge branch '2.5-maintenance'

13 years agoRemoved unneeded file
Armin Ronacher [Sun, 17 Oct 2010 14:04:19 +0000 (16:04 +0200)]
Removed unneeded file

13 years agoMerge branch '2.5-maintenance'
Armin Ronacher [Sun, 17 Oct 2010 14:02:23 +0000 (16:02 +0200)]
Merge branch '2.5-maintenance'

13 years agoUpdated ignore files
Armin Ronacher [Sun, 17 Oct 2010 14:02:17 +0000 (16:02 +0200)]
Updated ignore files

13 years agoAdded README
Armin Ronacher [Sun, 17 Oct 2010 13:58:08 +0000 (15:58 +0200)]
Added README

13 years agoUpdated CHANGES entry for release
Armin Ronacher [Sun, 17 Oct 2010 13:56:49 +0000 (15:56 +0200)]
Updated CHANGES entry for release

13 years agofixed an operator precedence error introduced in 2.5.2. 2.5.3
Armin Ronacher [Sun, 17 Oct 2010 13:53:59 +0000 (15:53 +0200)]
fixed an operator precedence error introduced in 2.5.2.

Statements like "-foo.bar" had their implicit parentheses applied around
the first part of the expression ("(-foo).bar") instead of the more
correct "-(foo.bar)".

13 years agoPrepare for Jinja 2.5.3
Armin Ronacher [Sun, 17 Oct 2010 13:52:57 +0000 (15:52 +0200)]
Prepare for Jinja 2.5.3

13 years agoUnbroke setup.py
Armin Ronacher [Wed, 18 Aug 2010 09:14:28 +0000 (11:14 +0200)]
Unbroke setup.py

--HG--
branch : trunk

13 years agoMerged in fix for Python 3 regarding precisions
Armin Ronacher [Wed, 18 Aug 2010 09:13:16 +0000 (11:13 +0200)]
Merged in fix for Python 3 regarding precisions

--HG--
branch : trunk

13 years agoImproved message and unbroke 3.x
Armin Ronacher [Wed, 18 Aug 2010 09:12:52 +0000 (11:12 +0200)]
Improved message and unbroke 3.x

--HG--
branch : trunk

13 years agoPreparing for a 2.5.2 release. Fixed an issue with setup.py
Armin Ronacher [Wed, 18 Aug 2010 09:10:50 +0000 (11:10 +0200)]
Preparing for a 2.5.2 release.  Fixed an issue with setup.py

--HG--
branch : trunk

13 years agoAdded benchmark for chameleon/chameleon-genshi.
Rodrigo Moraes [Tue, 17 Aug 2010 15:08:01 +0000 (12:08 -0300)]
Added benchmark for chameleon/chameleon-genshi.

--HG--
branch : trunk

13 years agoround filter: remove the special case for precission=0 in order to ensure consistent...
Ronny Pfannschmidt [Tue, 17 Aug 2010 11:18:41 +0000 (13:18 +0200)]
round filter: remove the special case for precission=0 in order to ensure consistent output types on python3

--HG--
branch : trunk

13 years agotip is 2.6
Armin Ronacher [Tue, 17 Aug 2010 10:39:40 +0000 (12:39 +0200)]
tip is 2.6

--HG--
branch : trunk

13 years agoAdded tag 2.5.1 for changeset 7867a9cb933a
Armin Ronacher [Tue, 17 Aug 2010 10:39:07 +0000 (12:39 +0200)]
Added tag 2.5.1 for changeset 7867a9cb933a

--HG--
branch : trunk