]>
git.ipfire.org Git - thirdparty/jinja.git/log
Tim Swast [Sun, 10 Apr 2016 15:48:09 +0000 (08:48 -0700)]
Change links for Babel to new docs location. (#562)
Sambhav Satija [Sun, 10 Apr 2016 15:40:38 +0000 (21:10 +0530)]
Escape target attribute in the urlize function in utils.py. (#507)
José Carlos García [Sun, 3 Apr 2016 23:21:39 +0000 (01:21 +0200)]
change from @mitsuhiko to pallets project
Armin Ronacher [Mon, 4 Jan 2016 17:15:43 +0000 (18:15 +0100)]
Merge pull request #526 from ioab/master
docs: Integration link fix
Abdullah [Mon, 4 Jan 2016 17:13:07 +0000 (20:13 +0300)]
docs: Integration link fix
Armin Ronacher [Mon, 4 Jan 2016 17:08:36 +0000 (18:08 +0100)]
Merge pull request #523 from alimony/patch-1
Fix typo.
Markus Amalthea Magnuson [Mon, 28 Dec 2015 16:17:22 +0000 (17:17 +0100)]
Fix typo.
Armin Ronacher [Fri, 20 Nov 2015 09:05:39 +0000 (10:05 +0100)]
Merge branch '2.8-maintenance'
Armin Ronacher [Fri, 20 Nov 2015 09:05:12 +0000 (10:05 +0100)]
Fixed for_qs for urlencode. This fixes #515
Armin Ronacher [Fri, 20 Nov 2015 09:04:20 +0000 (10:04 +0100)]
This is 2.8.1-dev
Armin Ronacher [Sat, 14 Nov 2015 09:48:20 +0000 (10:48 +0100)]
Merge pull request #513 from spookylukey/patch-1
Fixed a few spelling mistakes in a docstring
Luke Plant [Sat, 14 Nov 2015 09:46:08 +0000 (09:46 +0000)]
Fixed a few spelling mistakes in a docstring
Markus Unterwaditzer [Sun, 20 Sep 2015 18:37:37 +0000 (20:37 +0200)]
Merge pull request #497 from snoack/pypy
Added pypy to the list of Python versions tested by Travis CI
Sebastian Noack [Sun, 20 Sep 2015 18:29:34 +0000 (20:29 +0200)]
Added pypy to the list of Python versions tested by Travis CI
Markus Unterwaditzer [Sun, 20 Sep 2015 17:43:09 +0000 (19:43 +0200)]
Don't pin to .0 version
Markus Unterwaditzer [Sun, 20 Sep 2015 17:42:30 +0000 (19:42 +0200)]
Merge pull request #495 from snoack/py35
Added Python 3.5 to tox and Travis configuration
Sebastian Noack [Sun, 20 Sep 2015 17:26:05 +0000 (19:26 +0200)]
Added Python 3.5 to tox and Travis configuration
Markus Unterwaditzer [Thu, 6 Aug 2015 16:02:36 +0000 (18:02 +0200)]
Merge pull request #472 from pydanny/pydanny-update-django-switch-docs
Remove conditions segment of Django section
Daniel Greenfeld [Thu, 6 Aug 2015 15:35:51 +0000 (08:35 -0700)]
Removed outdated condition section on Django
Markus Unterwaditzer [Thu, 6 Aug 2015 07:12:34 +0000 (09:12 +0200)]
Merge pull request #471 from snoack/metaclass-improvement
Improve with_metaclass()
Sebastian Noack [Wed, 5 Aug 2015 10:53:07 +0000 (12:53 +0200)]
Improve with_metaclass()
Armin Ronacher [Sun, 26 Jul 2015 17:51:08 +0000 (19:51 +0200)]
Improve release script to support new format and wheels.
Armin Ronacher [Sun, 26 Jul 2015 17:50:27 +0000 (19:50 +0200)]
This is 2.9.dev
Armin Ronacher [Sun, 26 Jul 2015 17:49:40 +0000 (19:49 +0200)]
Bump version number to 2.8
Armin Ronacher [Sun, 26 Jul 2015 17:49:32 +0000 (19:49 +0200)]
Hardcode version in setup.py again.
Armin Ronacher [Sun, 26 Jul 2015 17:48:17 +0000 (19:48 +0200)]
Release date is today.
Armin Ronacher [Sun, 26 Jul 2015 17:45:25 +0000 (19:45 +0200)]
Merge pull request #425 from highlyunavailable/master
Fix literal \ characters at the end of a string
Markus Unterwaditzer [Sun, 12 Jul 2015 16:35:49 +0000 (18:35 +0200)]
Merge pull request #461 from StevenMaude/patch-1
Fix typo: "the iterates" > "that iterates"
Steven Maude [Sat, 11 Jul 2015 22:01:08 +0000 (23:01 +0100)]
Fix typo: "the iterates" > "that iterates"
In filters.py.
Markus Unterwaditzer [Mon, 1 Jun 2015 16:58:06 +0000 (18:58 +0200)]
Fix syntax error
Markus Unterwaditzer [Mon, 1 Jun 2015 15:15:43 +0000 (17:15 +0200)]
Update FAQ about unsupported Python versions
Thanks to @ThomasWaldmann for the original patch. His fork is gone so I
can't apply the original commits.
Markus Unterwaditzer [Mon, 1 Jun 2015 15:12:56 +0000 (17:12 +0200)]
Add Python classifiers for all supported versions
Thanks to @ThomasWaldmann for the original patch. His fork is gone so I
can't apply the original commits.
Markus Unterwaditzer [Mon, 1 Jun 2015 15:08:28 +0000 (17:08 +0200)]
Changelog for #447
Markus Unterwaditzer [Mon, 1 Jun 2015 15:08:01 +0000 (17:08 +0200)]
Merge pull request #447 from bentimms/int-filter-base
Add 'base' parameter to 'int' filter
Markus Unterwaditzer [Mon, 1 Jun 2015 15:07:42 +0000 (17:07 +0200)]
Merge pull request #450 from jenisys/fixdoc.extension_example
FIX DOC-EXAMPLE: cache_extension.py
Markus Unterwaditzer [Mon, 1 Jun 2015 15:07:17 +0000 (17:07 +0200)]
Sort filters, remove dupes
Fix #454
Markus Unterwaditzer [Mon, 1 Jun 2015 15:05:36 +0000 (17:05 +0200)]
Merge branch 'merwok-patch-1'
Fix #455
Éric Araujo [Fri, 29 May 2015 20:57:10 +0000 (16:57 -0400)]
Fix typo
Armin Ronacher [Mon, 25 May 2015 11:40:47 +0000 (13:40 +0200)]
Escape slashes in query strings. This fixes #445
Armin Ronacher [Mon, 25 May 2015 10:25:02 +0000 (12:25 +0200)]
Merge branch 'pr/451'
Armin Ronacher [Mon, 25 May 2015 10:24:09 +0000 (12:24 +0200)]
Added decorator support for finalize. This fixes #431
Markus Unterwaditzer [Sun, 17 May 2015 15:58:09 +0000 (17:58 +0200)]
Amend to #453
Markus Unterwaditzer [Sun, 17 May 2015 15:55:23 +0000 (17:55 +0200)]
Merge pull request #453 from jeffwidman/patch-1
Fix typos and grammar in Readme
Jeff Widman [Sun, 17 May 2015 05:51:49 +0000 (22:51 -0700)]
Fix typos and grammar in Readme
Antti Haapala [Sun, 10 May 2015 07:04:15 +0000 (10:04 +0300)]
fix the fancy tracebacks on Python 3
jenisys [Sat, 9 May 2015 16:57:52 +0000 (18:57 +0200)]
FIX EXAMPLE:
No longer working with current code base
since the TokenStream.next() method was removed.
Ben Timms [Wed, 29 Apr 2015 15:45:46 +0000 (16:45 +0100)]
Add 'base' parameter to 'int' filter
Markus Unterwaditzer [Mon, 6 Apr 2015 12:28:25 +0000 (14:28 +0200)]
Merge branch 'override-codegen-context'
Markus Unterwaditzer [Mon, 6 Apr 2015 12:27:03 +0000 (14:27 +0200)]
Add changelog for #404
ThiefMaster [Mon, 6 Apr 2015 12:08:46 +0000 (14:08 +0200)]
Let the Environment override the Context
closes #404
ThiefMaster [Mon, 6 Apr 2015 11:54:14 +0000 (13:54 +0200)]
Let the Environment override the CodeGenerator
see #404
Markus Unterwaditzer [Mon, 6 Apr 2015 06:52:33 +0000 (08:52 +0200)]
Merge pull request #437 from alexwlchan/master
Fix a few small typos in the docs
Alex Chan [Sun, 5 Apr 2015 21:42:34 +0000 (22:42 +0100)]
Fix a few small typos in the docs
Markus Unterwaditzer [Thu, 2 Apr 2015 00:02:03 +0000 (02:02 +0200)]
Merge branch '2.7-maintenance'
Markus Unterwaditzer [Thu, 2 Apr 2015 00:01:35 +0000 (02:01 +0200)]
Fix syntax error
Markus Unterwaditzer [Wed, 1 Apr 2015 23:54:08 +0000 (01:54 +0200)]
Merge branch '2.7-maintenance'
Markus Unterwaditzer [Wed, 1 Apr 2015 23:52:52 +0000 (01:52 +0200)]
Fix #433
Markus Unterwaditzer [Sun, 22 Mar 2015 13:36:12 +0000 (14:36 +0100)]
Actually don't run doctests
Markus Unterwaditzer [Sun, 22 Mar 2015 13:32:16 +0000 (14:32 +0100)]
Fix travis
Markus Unterwaditzer [Sun, 22 Mar 2015 13:31:39 +0000 (14:31 +0100)]
Add build badges
Kartheek Lenkala [Sun, 22 Mar 2015 12:46:32 +0000 (18:16 +0530)]
change py2 print statements to py3
Markus Unterwaditzer [Sun, 22 Mar 2015 13:22:40 +0000 (14:22 +0100)]
Fix doctests
Fix #427
Markus Unterwaditzer [Sun, 22 Mar 2015 12:48:17 +0000 (13:48 +0100)]
Merge branch 'lkarthee-pytest_migration'
Markus Unterwaditzer [Sun, 22 Mar 2015 12:46:22 +0000 (13:46 +0100)]
Exclude examples
Markus Unterwaditzer [Sun, 22 Mar 2015 12:46:08 +0000 (13:46 +0100)]
Use tox in travis
Kartheek Lenkala [Sun, 22 Mar 2015 12:33:14 +0000 (18:03 +0530)]
Rename testsuite to tests and suggestions
Remove py.test from setup.py install_requires
Rename testsuite folder to tests.
Kartheek Lenkala [Sun, 22 Mar 2015 11:31:50 +0000 (17:01 +0530)]
Moving testsuite directory to root folder
Kartheek Lenkala [Sun, 22 Mar 2015 11:08:08 +0000 (16:38 +0530)]
fixing errors due to removal of init.py from test suite
Kartheek Lenkala [Sun, 22 Mar 2015 10:50:41 +0000 (16:20 +0530)]
Adding pytest references and dependencies in setup.py and Makefile
Kartheek Lenkala [Sun, 22 Mar 2015 10:08:05 +0000 (15:38 +0530)]
Pytest Initial Commit
Kartheek Lenkala [Sun, 22 Mar 2015 09:58:54 +0000 (15:28 +0530)]
Pytest migration initial commit
highlyunavailable [Fri, 20 Mar 2015 18:50:14 +0000 (11:50 -0700)]
Fix literal \ characters at the end of a string
Given a statement like `{% set sep = '\\' %}`, the syntax highlighter was considering the literal `'\\'` to be a literal quote inside the string by matching `\'` and thus highlighting the rest of the entire document as a string.
This change fixes that issue by adding some regex to ensure that an escaped quote is preceded by an uneven number of slashes (that is, `'\\\\\''` would accept the literal string `\\'` without issues). A`"` quoted string is modified the same way.
Markus Unterwaditzer [Wed, 11 Mar 2015 20:33:16 +0000 (21:33 +0100)]
Merge pull request #254 from yoloseem/master
Duplication of index and search links on main page of documentation.
Markus Unterwaditzer [Wed, 11 Mar 2015 20:32:16 +0000 (21:32 +0100)]
Merge branch '2.7-maintenance'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:29:33 +0000 (21:29 +0100)]
Import from correct location.
Fix #259
Markus Unterwaditzer [Wed, 11 Mar 2015 20:28:21 +0000 (21:28 +0100)]
Merge pull request #275 from yoloseem/patch-1
Fixed typos on docstrings of template filters.
Markus Unterwaditzer [Wed, 11 Mar 2015 20:28:01 +0000 (21:28 +0100)]
Merge pull request #343 from joernhees/patch-1
Custom Filters example inserts escaped <br>s
Markus Unterwaditzer [Wed, 11 Mar 2015 20:27:41 +0000 (21:27 +0100)]
Merge pull request #344 from walterl/master
Added ".. versionadded:: 2.8" to `equalto` test
Markus Unterwaditzer [Wed, 11 Mar 2015 20:27:25 +0000 (21:27 +0100)]
Merge pull request #345 from hszcg/patch-1
Fix missing " in docs/tricks.rst
Markus Unterwaditzer [Wed, 11 Mar 2015 20:26:50 +0000 (21:26 +0100)]
Merge branch 'adamchainz-master'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:26:24 +0000 (21:26 +0100)]
Clarify sentence
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:52 +0000 (21:19 +0100)]
Merge pull request #375 from zart/fix-relative-search-on-windows
Windows returns EINVAL on bogus filenames
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:34 +0000 (21:19 +0100)]
Merge pull request #370 from BillyWM/patch-1
fix typo "makes sense to defined" -> define
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:27 +0000 (21:19 +0100)]
Merge pull request #362 from topher86/patch-1
Update djangojinja2.py
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:10 +0000 (21:19 +0100)]
Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanup
Change attr filter example to match description
Markus Unterwaditzer [Wed, 11 Mar 2015 20:18:33 +0000 (21:18 +0100)]
Merge pull request #383 from rbtcollins/patch-1
fix trivial typo (side -> size)
Markus Unterwaditzer [Wed, 11 Mar 2015 20:18:01 +0000 (21:18 +0100)]
Merge pull request #381 from ubershmekel/patch-1
A double quote is missing
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:44 +0000 (21:17 +0100)]
Merge pull request #388 from olegpesok/truncateDocFix
Fix incorrect truncate filter docs
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:28 +0000 (21:17 +0100)]
Merge pull request #403 from whit537/patch-1
trim obsolete sentence re: i18n extension
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:01 +0000 (21:17 +0100)]
Merge pull request #400 from scavpy/scavpy-patch-1
Replace lambda for 'dict' in with dict itself
Markus Unterwaditzer [Wed, 11 Mar 2015 20:16:25 +0000 (21:16 +0100)]
Merge pull request #395 from esonderegger/master
Updated template documentation examples
Markus Unterwaditzer [Wed, 11 Mar 2015 20:16:10 +0000 (21:16 +0100)]
Merge pull request #397 from utzig/master
Fix typo
Markus Unterwaditzer [Wed, 11 Mar 2015 20:15:58 +0000 (21:15 +0100)]
Merge pull request #398 from cerivera/master
grammar fix
Markus Unterwaditzer [Wed, 11 Mar 2015 20:12:56 +0000 (21:12 +0100)]
Merge branch 'westurner-patch-1'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:12:47 +0000 (21:12 +0100)]
A few nitpicks
Markus Unterwaditzer [Wed, 11 Mar 2015 19:58:42 +0000 (20:58 +0100)]
We don't want to give a specific recommendation.
Markus Unterwaditzer [Wed, 11 Mar 2015 19:56:40 +0000 (20:56 +0100)]
Not only syntax is affected.
Tim Bray [Thu, 10 Jul 2014 10:43:53 +0000 (11:43 +0100)]
decimal is a number
Markus Unterwaditzer [Sat, 7 Mar 2015 12:26:10 +0000 (13:26 +0100)]
Merge pull request #418 from toanant/patch-1
Typo Fixed.
Abhishek Kumar Singh [Sat, 7 Mar 2015 12:08:32 +0000 (17:38 +0530)]
Typo Fixed.