django.git/django/template/context.py, branch archive/attic/sqlalchemy django http://cgit.adnoto.dev/django.git/atom?h=archive%2Fattic%2Fsqlalchemy 2006-11-08T04:50:01Z sqlalchemy: Merged revisions 3918 to 4053 from trunk. 2006-11-08T04:50:01Z Robin Munn robin.munn@gmail.com 2006-11-08T04:50:01Z urn:sha1:dadfca08c0db567ce33284aaa8eb388cf667a836 git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@4054 bcc190cf-cafb-0310-a4f2-bffc1f526a37 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. 2006-07-04T03:21:44Z Russell Keith-Magee russell@keith-magee.com 2006-07-04T03:21:44Z urn:sha1:6b383afd39ee2e493a308cb5c70dfa880d27edf6 git-svn-id: http://code.djangoproject.com/svn/django/trunk@3268 bcc190cf-cafb-0310-a4f2-bffc1f526a37 Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa 2006-06-08T05:00:13Z Adrian Holovaty adrian@holovaty.com 2006-06-08T05:00:13Z urn:sha1:2abfd5dd586c4f6fb619de561b2194687021e256 git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 2006-05-02T01:31:56Z Adrian Holovaty adrian@holovaty.com 2006-05-02T01:31:56Z urn:sha1:f69cf70ed813a8cd7e1f963a14ae39103e8d5265 git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37