summaryrefslogtreecommitdiff
path: root/django/template
AgeCommit message (Collapse)Author
2006-10-27Fixed #2961 -- Added 'opencomment' and 'closecomment' options to {% ↵Adrian Holovaty
templatetag %} templatetag. Thanks for the patch, Jeong-Min Lee git-svn-id: http://code.djangoproject.com/svn/django/trunk@3938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the ↵Adrian Holovaty
patch, mccutchen@gmail.com and Hawkeye git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26Fixed #2208 -- Allow empty arguments to be passed to filters. Thanks, mattmcc.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23Fixed #2454 -- Make "ifchanged" tag work more predictably inside nestedMalcolm Tredinnick
for-loops. Thanks, dummy@habmalnefrage.de. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23Fixed #2456 -- Added backslash escaping to addslashes, which is necessary onceMalcolm Tredinnick
you start escaping other things. Thanks, tom@eggdrop.ch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-21Fixed #2743 -- Made the value of a cycle tag accessible through the context.Malcolm Tredinnick
Patch from Martin Glueck. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-05Fixed #2645 -- Fixed format-string error in exception call in ↵Adrian Holovaty
template/__init__.py. Thanks for the patch, md@hudora.de git-svn-id: http://code.djangoproject.com/svn/django/trunk@3720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-04Added small comment to django.template.loader_tags, to clarify change from ↵Adrian Holovaty
[3465] git-svn-id: http://code.djangoproject.com/svn/django/trunk@3719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-04Fixes #2637 -- Clarified handling of TEMPLATE_STRING_IF_INVALID, especially ↵Russell Keith-Magee
with regards to filtering of invalid values. Modified unit tests to test both empty and non-empty values for TEMPLATE_STRING_IF_INVALID. Thanks to SmileyChris for identifying and helping to resolve this bug. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-03Refs #2333 - Added documentation for the test Client, and removed a stray ↵Russell Keith-Magee
import. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-02Refs #2333 - Removed a call to the signal dispatcher that was mistakenly ↵Russell Keith-Magee
merged in. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-02Refs #2333 - Re-added the template rendering signal for testing purposes; ↵Russell Keith-Magee
however, the signal is not available during normal operation. It is only added as part of an instrumentation step that occurs during test framework setup. Previous attempt (r3659) was reverted (r3666) due to performance concerns. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-30Refs #1400 - Reverted r3269. Template variable evalution should follow ↵Russell Keith-Magee
Python norms. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-27Reverted [3659], the 'name' field on Template objects and the signal emitted ↵Adrian Holovaty
whenever a template is rendered. Refs #2333. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-27Refs #2333 - Added a signal that is emitted whenever a template is rendered, ↵Russell Keith-Magee
and added a 'name' field to Template to allow easy identification of templates. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-13Fixed incorrect error message in django.template.loaders.filesystem if you ↵Adrian Holovaty
pass in template_dirs=None. Thanks, Martin Glueck git-svn-id: http://code.djangoproject.com/svn/django/trunk@3575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-12Fixed #2528 -- Fixed 'time' template filter for midnight time value. Thanks, ↵Adrian Holovaty
django@dougma.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@3563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-27Fixed #1650: the {% extends %} tag now can extend a Template object passed ↵Jacob Kaplan-Moss
into the context. Thanks, clelland@gmail.com. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-25Made correction to a comment in django/template/loader_tags.pyAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-25Negligible formatting change to django/template/__init__.pyAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-21Part 3 of pedant day: replaced all tabs in Django with spaces. Python the ↵Jacob Kaplan-Moss
way Guido intended it, baby! git-svn-id: http://code.djangoproject.com/svn/django/trunk@3415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-21Second half of little cleanup tweaks suggested by pyflakes.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-19Fixed #1647 -- Included slightly more information in template syntax errorMalcolm Tredinnick
displays in DebugNodeList. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-15Fixed a small typo in the wordwrap filter's docstring.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10Fixed #2320 -- corrected numerous errors in the custom tag examples inMalcolm Tredinnick
python_templates.txt. Also fixed an argument parsing error for such tags. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07Fixed #2303 -- Fixed bug in [3269] with regard to True and False ↵Adrian Holovaty
special-casing in template system git-svn-id: http://code.djangoproject.com/svn/django/trunk@3294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04Refs #2202 -- Cleaned up technique of splitting arguments, based upon a ↵Russell Keith-Magee
suggestion from SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04Fixes #2202 -- Added ability to customize output of pluralize filter to ↵Russell Keith-Magee
handle irregular cases (walrus/walruses, cherry/cherries). Thanks to gid for the suggestion and the initial patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@3272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04Refs #1400 -- Variable resolver now converts literal strings 'False' and ↵Russell Keith-Magee
'True' into booleans when used as template arguments. This is point 2 from ticket #1400. Thanks Kieren Holland. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04Fixes #1338, Refs #1400, #2237 -- Modified variable resolution to allow ↵Russell Keith-Magee
template 'if' statements to work if TEMPLATE_STRING_IF_INVALID is set. Modified unit tests to force the use of this variable, so that returning '' isn't confused with an actual failure. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21Fixed #2053 -- added an optional comparison argument to the "timesince" filter.Malcolm Tredinnick
Added a "timeuntil" filter that works analogously. Thanks, john@sneeu.com. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20Fixed #2102 -- Template system 'for' loops now support generators. Thanks, ↵Adrian Holovaty
dbm-django@mclachlan.com.au git-svn-id: http://code.djangoproject.com/svn/django/trunk@3165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-11Fixed #2127 -- Made datetime filters fail silently when passed empty strings orMalcolm Tredinnick
None. Thanks, Gary Wilson. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08Fixed #2109 -- Convert old-style classes to new-style classes throughout ↵Adrian Holovaty
Django. Thanks, Nicola Larosa git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08Added django.template.Token.split_contents() and used it to add support for ↵Adrian Holovaty
strings with spaces in {% ifchanged %} git-svn-id: http://code.djangoproject.com/svn/django/trunk@3112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens ↵Adrian Holovaty
of unit tests and updated docs. Thanks, ckknight git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07Small improvement to django.template.resolve_variable -- isdigit() instead ↵Adrian Holovaty
of 0123456789 git-svn-id: http://code.djangoproject.com/svn/django/trunk@3098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-03Eliminated lots of mutable default arguments (since they are bugsLuke Plant
waiting to happen and are memory leaks too). git-svn-id: http://code.djangoproject.com/svn/django/trunk@3070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-16Fixed #1321 -- Made DJANGO_SETTINGS_MODULE optional. You can now call ↵Adrian Holovaty
django.conf.settings.configure() to set settings manually if you don't have a settings module. Thanks, Malcolm Tredinnick, Luke Plant, Fredrik Lundh git-svn-id: http://code.djangoproject.com/svn/django/trunk@2927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-15Fixed #1852 -- Improved TemplateSyntaxError to display the original ↵Adrian Holovaty
exception if str() of the exception raises an exception in itself. Thanks, nnorwitz@google.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@2906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-15Fixed #1849 -- Slugifying now collapses consecutive hyphens to a single ↵Adrian Holovaty
hyphen. Thanks, Tom Insam git-svn-id: http://code.djangoproject.com/svn/django/trunk@2905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly ↵Adrian Holovaty
backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37