summaryrefslogtreecommitdiff
path: root/django/contrib/markup
AgeCommit message (Collapse)Author
2012-12-29Removed django.contrib.markup.Aymeric Augustin
2012-09-08Fixed #18054 -- Deprecated contrib.markup. Thanks to simukis for the initial ↵Preston Holmes
patch.
2012-08-29Replaced many smart_bytes by force_bytesClaude Paroz
In all those occurrences, we didn't care about preserving the lazy status of the strings, but we really wanted to obtain a real bytestring.
2012-08-07[py3] Ported django.utils.encoding.Aymeric Augustin
* Renamed smart_unicode to smart_text (but kept the old name under Python 2 for backwards compatibility). * Renamed smart_str to smart_bytes. * Re-introduced smart_str as an alias for smart_text under Python 3 and smart_bytes under Python 2 (which is backwards compatible). Thus smart_str always returns a str objects. * Used the new smart_str in a few places where both Python 2 and 3 want a str.
2012-04-29Fixed #18013 -- Use the new 'as' syntax for exceptions.Claude Paroz
Thanks Clueless for the initial patch. Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-14Fixed #18041 -- Removed support for Markdown versions < 2.1, following the ↵Claude Paroz
1.5 deprecation timeline. Thanks Ramiro Morales for the review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-16Fixed #17908 -- Made some `contrib.markup` tests be skipped so they don't ↵Julien Phalip
fail on old versions of Markdown. Thanks to Preston Holmes for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14Fixed #17837. Improved markdown safety.Paul McMillan
Markdown enable_attributes is now False when safe_mode is enabled. Documented the markdown "safe" argument. Added warnings when the safe argument is passed to versions of markdown which cannot be made safe. Deprecated versions of markdown < 2.1. Many thanks to ptone for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-01Corrected contrib.markup filter errors to not use misleading template syntax.Carl Meyer
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-30Fixed #17135 -- Made it possible to use decorators (like stringfilter) on ↵Aymeric Augustin
template filter functions in combination with auto-escaping. Refs #16726. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-29Used the decorator syntax consistently to register template filters.Aymeric Augustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-26Removed remains from times when tests could be run outside of runtests.py.Aymeric Augustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-24Fixed #17086 -- Removed pollution of global template-builtins from markup ↵Carl Meyer
and humanize tests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft ↵Russell Keith-Magee
patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to ↵Russell Keith-Magee
timo for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-19Fixed #10843: the textile tests now pass against the latest textile library.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26Removed out-of-date statement in markdown templatetags docstring (refs #1204).Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10Changed a whole bunch of places to raise exception instances instead of ↵Adrian Holovaty
old-style raising exception classes plus a comma. Good for the future Python 3 conversion git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09Fixed #12495 -- Fixed broken link in django.contrib.markup docstringAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-15Fixed #6387 -- Updated markdown filter to handle markdown-1.7 as well asMalcolm Tredinnick
earlier versions. Patch from cogg, jedie and Dmitri Fedortchenko. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-02Fixed #5362: markup tests no longer fail under SVN versions of docutils. ↵Jacob Kaplan-Moss
Thanks, keithb. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-02Fixed #2910 -- Added support for markdown extensions to the markdown markupMalcolm Tredinnick
filter (try saying that ten times quickly!). Thanks, Waylan Limberg. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14Implemented auto-escaping of variable output in templates. Fully ↵Malcolm Tredinnick
controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 See documentation in templates.txt and templates_python.txt for how everything works. Backwards incompatible if you're inserting raw HTML output via template variables. Based on an original design from Simon Willison and with debugging help from Michael Radziej. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04Merged Unicode branch into trunk (r4952:5608). This should be fullyMalcolm Tredinnick
backwards compatible for all practical purposes. Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702 git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-20Moved markup tests into their contrib directory.Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30restructuredtext filter now passes settings from ↵Jacob Kaplan-Moss
{{{RESTRUCTUREDTEXT_FILTER_SETTINGS}}} into docutils. See http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer for what these settings are. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28Fixed #2246 -- Changed textile templatetag in contrib.markup to use ↵Adrian Holovaty
DEFAULT_CHARSET setting git-svn-id: http://code.djangoproject.com/svn/django/trunk@3218 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
2005-11-26Fixed #911 -- Made template system scoped to the parser instead of the ↵Adrian Holovaty
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-08-10Fixed #241 -- added django.contrib.markup app with markup templatetags for ↵Jacob Kaplan-Moss
Textile, ReST and Markdown git-svn-id: http://code.djangoproject.com/svn/django/trunk@467 bcc190cf-cafb-0310-a4f2-bffc1f526a37