summaryrefslogtreecommitdiff
path: root/django/template
AgeCommit message (Collapse)Author
2010-08-16Fixed #14002 -- Modified filesize filter to ensure strings are translatable. ↵Russell Keith-Magee
Thanks to claudep for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14Fixed #14002 -- Updated filesize filter to support terabyte and petabyte ↵Russell Keith-Magee
file sizes. Thanks to Aaron T. Myers for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07Fixed #11021 -- Clarified newline stripping behavior in the truncatewords ↵Russell Keith-Magee
and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03Fixed #11377: the template join filter now correctly escapes the joiner, too.Jacob Kaplan-Moss
Thanks, Stephen Kelly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21Refs #13573 -- Modified the key technique added in r13295 to be more robust ↵Russell Keith-Magee
against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21Fixed #13573 -- Corrected problem with template caching when template ↵Russell Keith-Magee
directories are provided. Thanks to lamby for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04Fixed #12164 -- Removed the Python 2.3 compatibility imports and ↵Russell Keith-Magee
workarounds. Thanks to timo and claudep for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19Fixed #13373 -- Ensured that {% if %} statements will short circuit template ↵Russell Keith-Magee
logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15Fixed #13334: Restored ability to load template tags from eggs. Again thanks ↵Karen Tracey
Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12Refs #13167 -- Corrected a regression in the way non-existent variables are ↵Russell Keith-Magee
handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11Fixed #13311 -- Modified the tag library import process so it doesn't mask ↵Russell Keith-Magee
import errors in the tag library itself. Thanks to amccurdy for the report, and Alex Gaynor for the suggested fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-10Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid ↵Russell Keith-Magee
catastrophic backtracking. Thanks to SmileyChris for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the ↵Russell Keith-Magee
argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22Fixed #12554 again: Corrected regression in silencing attribute lookups ↵Karen Tracey
introduced in r12823, plus added a test for this so it doesn't regress again. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20Fixed #12554: Silence exceptions that have specified ↵Karen Tracey
silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-18Fixed #13123 -- Cleaned up template loader for PyPy compatibility. Thanks to ↵Russell Keith-Magee
avostryakov for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16Fixed #12787: Correctly identify the template that does not exist when a ↵Karen Tracey
template being extended includes another template that does not exist. Thanks to trigeek38 for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. ↵Russell Keith-Magee
Thanks to David Danier for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08Fixed #13058 - "smart if" template tag doesn't support "if not in ..." ↵Luke Plant
condition Thanks to ramusus for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08Fixed #11461: Ensured complete traceback is available on the debug page when ↵Karen Tracey
an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02Fixed #6510 -- Refactored the way child nodes are found in template nodes to ↵Russell Keith-Magee
avoid potential inconsistencies. Thanks to SmileyChris for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01Fixed #12992: Adjusted the new template loader code so that the templateKaren Tracey
file name is correctly reported on the debug page when a template syntax error is raised. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27Removed more stray tabs in Python files.Karen Tracey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27Fixed #12981 -- Removed some stray tabs. Thanks to loewis for the report.Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23Fixed #12070. Fixed a case where var._whatever wasn't raising a ↵Joseph Kocherhans
TemplateSyntaxError. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23Fixed #12072 -- Certain characters no longer break url tag. Thanks, ↵Justin Bronn
Alexander Dutton. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22Fixed #11687: the `add` filter is now less failsome when faced with things ↵Jacob Kaplan-Moss
that can't be coerced to integers. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21Fixed #5972 - Allow the template filters to be used with the trans tag. ↵Jannis Leidel
Thanks for the initial patch, Dmitri Fedortchenko. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing ↵Jannis Leidel
filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21Fixed #7876 - Improved template error message to include expected end tag. ↵Jannis Leidel
Thanks to Matthias Kestenholz for the initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13Fixed #11944 -- Improved exception handling for the filesizeformat filter. ↵Russell Keith-Magee
Thanks to rfk for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-26Fixed #6587 -- Removed nasty __path__ hacking in templatetag loading. Thanks ↵Russell Keith-Magee
to Øyvind Satvik and Andrew Badr for their work on this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10Changed a whole bunch of places to raise exception instances instead of ↵Adrian Holovaty
old-style raising exception classes plus a comma. Good for the future Python 3 conversion git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01Fixed #12472 - Correctly show TimeFields values when using locale-aware ↵Jannis Leidel
formatting. Thanks to Ramiro Morales for providing the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22Fixed #7980 - Improved i18n framework to support locale aware formatting ↵Jannis Leidel
(dates and numbers) and form processing. Thanks to Marc Garcia for working on this during his Google Summer of Code 2009! Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-20Fixed a broken ImproperlyConfigured error messageSimon Willison
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14Fixed #6262 -- Added a cached template loader, and modified existing ↵Russell Keith-Magee
template loaders and tag to be cacheable. Thanks to Mike Malone for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12Fixed #11972: Corrected title filter handling of numbers followed by ↵Karen Tracey
letters. Thanks schwank@gmail.com and Randy Barlow. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09Implemented 'smart if' template tag, allowing filters and various operators ↵Luke Plant
to be used in the 'if' tag Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis of the parser methodology and Russell Keith-Magee for code reviews. There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if you were using the keywords 'and', 'or' or 'not' as variable names within the 'if' expression, which was previously allowed in some cases. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27Fixed #12095 - login and other contrib views failing if template rendered ↵Luke Plant
using inclusion tag. The {% csrf_token %} tag is unable to get its value if a template is rendered using an inclusion_tag, since that creates a brand new Context, rather than using the existing one. Since this is a common pattern, and we need CSRF protection to be as simple and easy as possible, we special case the csrf_token and copy it from the parent context to the new context. A more elegant and general solution may appear in future, but this is good enough for now. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27Moved contrib.csrf.* to core code.Luke Plant
There is stub code for backwards compatiblity with Django 1.1 imports. The documentation has been updated, but has been left in docs/contrib/csrf.txt for now, in order to avoid dead links to documentation on the website. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26Fixed #9977 - CsrfMiddleware gets template tag added, session dependency ↵Luke Plant
removed, and turned on by default. This is a large change to CSRF protection for Django. It includes: * removing the dependency on the session framework. * deprecating CsrfResponseMiddleware, and replacing with a core template tag. * turning on CSRF protection by default by adding CsrfViewMiddleware to the default value of MIDDLEWARE_CLASSES. * protecting all contrib apps (whatever is in settings.py) using a decorator. For existing users of the CSRF functionality, it should be a seamless update, but please note that it includes DEPRECATION of features in Django 1.1, and there are upgrade steps which are detailed in the docs. Many thanks to 'Glenn' and 'bthomas', who did a lot of the thinking and work on the patch, and to lots of other people including Simon Willison and Russell Keith-Magee who refined the ideas. Details of the rationale for these changes is found here: http://code.djangoproject.com/wiki/CsrfProtection As of this commit, the CSRF code is mainly in 'contrib'. The code will be moved to core in a separate commit, to make the changeset as readable as possible. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-12Fixed #11993: fixed the the `floatformat` filter on `NaN` values in Python ↵Jacob Kaplan-Moss
2.6.3. Thanks, kklimonda. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16Fixed #10061 -- Added namespacing for named URLs - most importantly, for the ↵Russell Keith-Magee
admin site, where the absence of this facility was causing problems. Thanks to the many people who contributed to and helped review this patch. This change is backwards incompatible for anyone that is using the named URLs introduced in [9739]. Any usage of the old admin_XXX names need to be modified to use the new namespaced format; in many cases this will be as simple as a search & replace for "admin_" -> "admin:". See the docs for more details on the new URL names, and the namespace resolution strategy. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03Fixed #11413 -- Added notes on the cycle and firstof tag detailing that ↵Russell Keith-Magee
variables output by those tags will not be escaped by default. Thanks to krystal for the report and draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code ↵Karen Tracey
comments. Thanks kaikuehne. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-07Fixed #11026, a small typo in the regroup template tag docstring. Thanks,Jacob Kaplan-Moss
mitsuhiko. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-12Fixed #10675 -- Added unicode paragraph and line-sep handling to escapejs.Malcolm Tredinnick
There were a couple of line breaking Unicode characters (\u2028 and \u2029) that cause Javascript errors, at least in Firefox, if not escaped. So now we do so. Based on a patch from rleland. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11Fixed #10369 -- Fixed auto-escaping inside "tran" and "blocktrans" tags.Malcolm Tredinnick
Patch from Andrew Badr. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10Fixed #9315 -- Handle spaces in URL tag arguments.Malcolm Tredinnick
Thanks Natalia Bidart and Matías Bordese for most of this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
generated by cgit v1.3 (git 2.53.0) at 2026-07-10 01:58:31 +0000