django1

Author	SHA1	Message	Date
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	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
Jacob Kaplan-Moss	8e2d275390	Fixed #241 -- added django.contrib.markup app with markup templatetags for Textile, ReST and Markdown git-svn-id: http://code.djangoproject.com/svn/django/trunk@467 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2005-08-10 18:31:33 +00:00