1
0
mirror of https://github.com/django/django.git synced 2025-10-21 04:39:17 +00:00

8 Commits

Author SHA1 Message Date
Robert Wittams
e84be6ffa3 Merged to r880. Fixed lexing bug in DebugLexer.
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-15 23:10:35 +00:00
Robert Wittams
930f8ee99f Merged to r670. Moved decorators.
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 23:53:03 +00:00
Robert Wittams
eb07d93938 Merged trunk changes, and converted submit lines to use a template
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 13:39:24 +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