p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,000 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

50 Commits

Author SHA1 Message Date
Aymeric Augustin f87457a460 [1.8.x] Fixed #24168 -- Allowed selecting a template engine in a few APIs. 
Specifically in rendering shortcuts, template responses, and class-based
views that return template responses.

Also added a test for render_to_response(status=...) which was missing
from fdbfc980.

Thanks Tim and Carl for the review.

Backport of 2133f31 from master.

Conflicts:
	docs/topics/http/shortcuts.txt
	tests/generic_views/test_base.py
 2015-02-03 08:32:14 +01:00
Keryn Knight 726a9550db Fixed #24143 -- Encouraged use of Http404 messages for debugging. 2015-01-16 09:41:01 -05:00
Aymeric Augustin ee8d5b91e9 Wrote main documentation for templates. 2015-01-10 20:16:19 +01:00
Aymeric Augustin cf1f36bb6e Deprecated current_app in TemplateResponse and render(_to_response). 2014-12-28 17:02:29 +01:00
Aymeric Augustin fdbfc98003 Deprecated some arguments of django.shortcuts.render(_to_response). 
dictionary and context_instance and superseded by context.

Refactored tests that relied context_instance with more modern idioms.
 2014-12-28 17:02:29 +01:00
Aymeric Augustin 17012b6936 Deprecated dirs argument to override TEMPLATE_DIRS. 
Cancels 2f0566fa. Refs #4278.
 2014-11-23 09:29:33 +01:00
Mohammed Attia 61ed959235 Removed a doc reference to the deprecated `mimetype` kwarg. 2014-08-06 22:15:54 -04:00
Antoine Catton e3d0790bd0 Fixed #21177 -- Made resolve_url support relative URLs. 
This fixes redirecting to relative URLs with django.shortcuts.redirect.
 2014-02-14 17:58:03 -05:00
johannes-gehrs f685f94c98 Fixed #21580 -- Clarified why render() does not return a TemplateResponse object. 2013-12-13 18:56:18 -05:00
Baptiste Mispelon ebfa508fa3 Added more examples to the get_object_or_404 documentation. 2013-11-19 19:23:44 +01:00
Tim Graham d011714002 Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt 
Thanks alasdair.
 2013-11-15 10:21:58 -05:00
Tim Graham 6e9e6ca071 Fixed #21440 -- Typo in topics/http/shortcuts.txt 
Thanks olof.bjarnason at gmail.com for the report.
 2013-11-15 07:09:46 -05:00
Bouke Haarsma 8fc63087f6 Fixed #21264 -- Incorrect RST usage in docs 2013-10-14 08:14:27 -04:00
Berker Peksag 2f0566fa61 Fixed #4278 -- Added a dirs parameter to a few functions to override TEMPLATE_DIRS. 
* django.template.loader.get_template()
* django.template.loader.select_template()
* django.shortcuts.render()
* django.shortcuts.render_to_response()

Thanks amcnabb for the suggestion.
 2013-09-18 07:37:08 -04:00
Tim Graham 7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Tim Graham 29255fcb4f Fixed some ReST errors regarding backticks 2013-08-15 07:14:10 -04:00
Tim Graham e161e4ff11 Clarified get_list_or_404 docs, refs #14150. 2013-06-24 07:00:53 -04:00
Juan Catalano 78c842a323 Adapted uses of versionchanged/versionadded to the new form. 
Refs #20104.
 2013-04-20 17:18:35 +02:00
Tim Graham 93cffc3b37 Added missing markup to docs. 2013-03-22 13:50:07 -04:00
Aymeric Augustin 89cb771be7 Fixed #19692 -- Completed deprecation of mimetype in favor of content_type. 
Thanks Tim for the report and initial patch.
 2013-01-31 13:54:40 +01:00
Aymeric Augustin f975c4857d Fixed #19225 -- Typo in shortcuts docs. 
Thanks SunPowered for the report.
 2012-11-02 09:29:55 +01:00
Tim Graham 837425b425 Fixed #18934 - Removed versionadded/changed annotations for Django 1.3 2012-09-20 19:06:55 -04:00
Tim Graham 1cf8287e3a Fixed #18369 - Fixed argument name in render() function; thanks qsolo825@ for the report. 2012-06-27 17:40:29 -04:00
Alex Gaynor bc8b9bd438 Fixed #18159 -- added an import statement to the docs. Thanks to Jeff Hui for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-22 15:58:53 +00:00
Luke Plant d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +00:00
Ramiro Morales 932b1b8d6d Converted links to external topics so they use intersphinx extension markup. 
This allows to make these links more resilent to changes in the target URLs.
Thanks Jannis for the report and Aymeric Augustin for the patch.

Fixes #16586.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-04 21:17:30 +00:00
Jannis Leidel bc56c76a17 Fixed #16344 -- Fixed typo in render() docs. Thanks, Jure Cuhalev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-26 16:52:50 +00:00
Gabriel Hurley 9f02d80b58 Fixed #16036 -- corrected the argument name for render_to_response in the reference docs. Thanks to msabramo for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 20:33:12 +00:00
Simon Meers 5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 04:33:42 +00:00
Timo Graham 99b2728b74 Fixed #15710 - removed "that that" typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-29 10:24:42 +00:00
Gabriel Hurley 409435440a Fixed #15558 -- Improved QuerySet reference docs and cleaned up numerous reST/sphinx problems. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 19:51:19 +00:00
Gabriel Hurley 32255c20a5 Fixed #15557 -- removed an extra backtick from the `topics/http/shortcuts`. Thanks to johnthedebs for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 21:13:42 +00:00
Jannis Leidel a3894945b6 Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-05 22:41:43 +00:00
Timo Graham 2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-26 00:37:14 +00:00
Russell Keith-Magee 0fef92f6f0 Fixed #14936 -- Tweaked the new render shortcut to reflect non-legacy arguments. Thanks to adamv for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 04:54:10 +00:00
Karen Tracey 6e75ee2b32 Added versionadded marker in doc for render function. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 04:12:32 +00:00
Russell Keith-Magee b3d2091681 Fixed #12816 -- Added a render() shortcut. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 17:18:41 +00:00
Timo Graham 4800b46746 Fixed #14745 - add links to topics/http/shortucts.txt. thanks adamv for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 16:47:39 +00:00
Timo Graham 76c2c30daf Fixed #14811 - Add clarifying note to render_to_response - thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 20:20:54 +00:00
Jacob Kaplan-Moss 728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Russell Keith-Magee f9c8615e1f Fixed #12799 -- Added an extra newline to help with PDF generation of documentation. Thanks to Ivan Savov for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 13:22:52 +00:00
Russell Keith-Magee 1ed9d29db8 Modified r11531 to use the original suggested text from the patch (which was better). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-12 22:41:12 +00:00
Russell Keith-Magee 15f3610747 Fixed #11589 -- Corrected an argument in the shortcuts documentation. Thanks to tsaylor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-12 22:32:07 +00:00
Jacob Kaplan-Moss 516051bfd2 A whole lotta documentation fixes: Fixes #8704, #8826, #8980, #9243, #9343, #9529, 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 23:34:03 +00:00
Gary Wilson Jr 86d772bb2a Fixed #10120 -- Added a `return` to a doc example, patch from andrews. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 16:49:54 +00:00
Gary Wilson Jr e389234201 Added a versionadded directive to new redirect shortcut (refs #10194). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-21 15:26:56 +00:00
Jacob Kaplan-Moss d7e8127524 Fixed #10194: added `django.shortcuts.redirect`, a do-what-I-mean redirect shortcut. See the docs at topics/http/shortcuts for details. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-21 13:09:13 +00:00
Russell Keith-Magee 16d67a11ac Fixed #10298 -- Corrected the example for the get_list_or_404 shortcut. Thanks to Dagur for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-22 06:06:56 +00:00
Jacob Kaplan-Moss 64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:40:42 +00:00
Jacob Kaplan-Moss 97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 22:25:40 +00:00