Jacob Kaplan-Moss
|
847b1ed54e
|
Fixed #1650: the {% extends %} tag now can extend a Template object passed 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-27 23:23:55 +00:00 |
|
Malcolm Tredinnick
|
4537cf3dd4
|
Fixed the timeuntil and timesince filter tests to not fail if the system clock
ticks over during the tests. Also fixed the template tests to be able to run in
standalone mode again.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-07-15 12:32:14 +00:00 |
|
Russell Keith-Magee
|
6b383afd39
|
Fixes #1338, Refs #1400, #2237 -- Modified variable resolution to allow 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-07-04 03:21:44 +00:00 |
|
Malcolm Tredinnick
|
68cfd446a3
|
Fixed the "timeuntil" and "timesince" tests so that they don't fail on a
machine under heavy load.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-06-21 12:11:00 +00:00 |
|
Malcolm Tredinnick
|
ae1234f2a2
|
Fixed #2163 -- Corrected typo when handling datetimes with timezones in the timesince filter. Thanks, Alex Dedul.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-06-21 11:11:03 +00:00 |
|
Malcolm Tredinnick
|
239adf83d3
|
Fixed #2053 -- added an optional comparison argument to the "timesince" filter.
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-21 06:56:08 +00:00 |
|
Malcolm Tredinnick
|
75a8a32f86
|
Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-06-18 04:12:55 +00:00 |
|
Adrian Holovaty
|
2abfd5dd58
|
Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-06-08 05:00:13 +00:00 |
|
Adrian Holovaty
|
5edd1335b2
|
Added django.template.Token.split_contents() and used it to add support for strings with spaces in {% ifchanged %}
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-06-08 04:29:10 +00:00 |
|
Adrian Holovaty
|
e5cd46d6d1
|
Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens 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-08 03:33:21 +00:00 |
|
Adrian Holovaty
|
c643e12faf
|
Fixed #1321 -- Made DJANGO_SETTINGS_MODULE optional. You can now call 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-16 21:28:06 +00:00 |
|
Adrian Holovaty
|
f69cf70ed8
|
MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly 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
|
2006-05-02 01:31:56 +00:00 |
|
Adrian Holovaty
|
8f54a225a5
|
Fixed spaceless template-tag tests in trunk (from magic-removal [2030])
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-01-17 17:59:31 +00:00 |
|
Adrian Holovaty
|
0eaee6f5d4
|
Fixed #1067 and #276 -- Added a {% spaceless %} tag, available in all templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-01-15 01:51:30 +00:00 |
|
Adrian Holovaty
|
39639cfd22
|
Fixed #1176 -- Changed {% comment %} template tag not to generate a nodelist, so it's now possible to comment-out broken template tags. Thanks, Kieran Holland
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2006-01-15 00:48:23 +00:00 |
|
Adrian Holovaty
|
e296de5500
|
Changed resolve_variable to resolve integers and floats as integers and floats. Added ifequal unit tests. Refs #959
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-12-16 05:33:24 +00:00 |
|
Adrian Holovaty
|
63cf85b64d
|
Moved custom unit-test templatetag library into the unit test module itself, to fix errors when running the test module directly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-12-09 04:29:20 +00:00 |
|
Adrian Holovaty
|
3ede006fc9
|
Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-26 22:46:31 +00:00 |
|
Adrian Holovaty
|
473eabc447
|
Negligible spacing change in tests/othertests/templates.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-25 01:54:17 +00:00 |
|
Adrian Holovaty
|
5d863f1fbd
|
Fixed #603 -- Added template debugging errors to pretty error-page output, if TEMPLATE_DEBUG setting is True. Also refactored FilterParser for a significant speed increase and changed the template_loader interface so that it returns information about the loader. Taken from new-admin. Thanks rjwittams and crew
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-23 23:10:17 +00:00 |
|
Adrian Holovaty
|
bedf10a98d
|
Fixed #598 -- Added {% include %} template tag. Added docs and unit tests. Thanks, rjwittams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-22 05:44:04 +00:00 |
|
Georg Bauer
|
3478fb51d6
|
fixed two failing i18n tests - they only failed when using ./runtests, now they work both ways. And template tests give tracebacks when they fail.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-17 15:55:04 +00:00 |
|
Jacob Kaplan-Moss
|
5cf8f68423
|
Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-11-04 04:59:46 +00:00 |
|
Adrian Holovaty
|
6ee014725e
|
Changed template unit test runner to use new template-loader framework from [870]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-10-14 22:28:38 +00:00 |
|
Adrian Holovaty
|
f71f854628
|
Fixed #626 -- Moved template modules to django.core.template package. django.core.template_loader is deprecated, in favor of django.core.template.loader.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-10-14 20:10:13 +00:00 |
|
Jacob Kaplan-Moss
|
27b1f69d79
|
Fixed #295 - added {{{forloop.revcounter}}} and {{{forloop.revcounter0}}} variables to for loops. Also updated the docs and added unit tests to verify correct behavior. Thanks, Clint.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-09-29 23:34:29 +00:00 |
|
Adrian Holovaty
|
8a7189f38f
|
Fixed #501 -- Fixed block.super in multi-level templates, and added unit tests to confirm. Thanks for the patch, django@kieranholland.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-09-29 04:22:09 +00:00 |
|
Adrian Holovaty
|
095305cb44
|
Fixed #486 -- Fixed bug in template filter parsing in edge cases, and added unit tests. Thanks, Simon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-09-11 15:18:04 +00:00 |
|
Adrian Holovaty
|
def5d10ffc
|
Fixed #365 -- Changed template.resolve_variable to resolve hard-coded strings. Thanks, davidschein
git-svn-id: http://code.djangoproject.com/svn/django/trunk@587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-09-01 02:18:04 +00:00 |
|
Adrian Holovaty
|
d80ac5ac25
|
Fixed #256 and #334 -- Added {% ifequal %} template tag. Also, {% ifequal %} and {% ifnotequal %} now both accept an optional {% else %} clause. Unit tests included.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-08-29 21:11:41 +00:00 |
|
Jacob Kaplan-Moss
|
440a2a97e9
|
Added framework for writing non-model-based tests, and added tests for cache and templates
from the old django/tests location (which has been removed).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
2005-08-01 19:09:07 +00:00 |
|