mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Code Issues 25 Releases Wiki Activity
16,391 Commits 28 Branches 426 Tags 666 MiB
1d2dd3b9fa
Commit Graph

63 Commits

Author SHA1 Message Date
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
Preston Timmons
8625c7aab3 Fixed #16096 -- Added origin attribute to template instances. 
Thanks jdunck for the suggestion.
 2013-09-06 09:14:52 -04:00
Tim Graham
7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Dominic Rodger
c33d1ca1d9 Fixed #20852 - Fixed incorrectly generated left quotes in docs. 
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.

Instances of the problem were found by looking for
">‘" in the generated HTML.
 2013-08-06 07:13:17 -04:00
Curtis Maloney
a3e7d73ed7 Allowed Context.push to behave as a context mananger. 
Thanks Loic Bistuer for the review.
 2013-07-17 13:32:32 -04:00
Tim Graham
862a04a56d Fixed some markup in docs/ref/templates/api.txt 2013-07-15 11:31:06 -04:00
Silvan Spross
7264e5c661 Add missing imports and models to the examples in the template layer documentation 2013-05-19 13:29:38 +02: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
9b5f64cc6e Fixed #19516 - Fixed remaining broken links. 
Added -n to sphinx builds to catch issues going forward.
 2013-01-02 18:32:57 -05:00
Aymeric Augustin
7ee7599ab3 Removed versionadded/changed annotations dating back to 1.4. 2012-12-29 21:59:08 +01:00
Andrew Badr
29cd3d6c01 Fix docs for context_processors.auth 
Copy said it created three context variables, but only lists two. ("messages" was removed.)
 2012-09-24 17:14:11 -07:00
Tim Graham
837425b425 Fixed #18934 - Removed versionadded/changed annotations for Django 1.3 2012-09-20 19:06:55 -04:00
Tim Graham
74c025d028 Fixed #13608 - Noted that template lookups use literal values. 2012-09-01 09:24:39 -04:00
Tim Graham
f99ecaff06 Fixed #18642 - Added a note suggesting the use of render() rather than render_to_response() if you need RequestContext in your template. 2012-08-31 20:24:33 -04:00
Marc Tamlyn
58683e9c82 Fixed #16744 -- Class based view should have the view object in the context 
Updated the most recent patch from @claudep to apply again and updated
the documentation location.
 2012-08-18 15:07:21 +01:00
Aymeric Augustin
8c670ee347 Fixed #18617 -- Highlighted that the app_directories template loader depends on the order of INSTALLED_APPS. 
Thanks evildmp for the patch.
 2012-07-12 23:02:58 +02:00
Claude Paroz
8a5d1a6b93 Updated obsolete links in the documentation 2012-06-28 10:49:07 +02:00
jnns
c864b36ba1 Updated TEMPLATE_CONTEXT_PROCESSORS defaults in the docs. 
django.core.context_processors.tz was missing from default
TEMPLATE_CONTEXT_PROCESSORS in the template api documentation.
 2012-06-23 16:02:15 +02:00
Aymeric Augustin
c28e700c7e Removed references to changes made in 1.2. 
Thanks Florian Apolloner for the patch.
 2012-06-07 15:02:35 +02:00
Claude Paroz
f65e412abd Fixed #18259 -- Specified that ROOT_URLCONF might be needed. 
When using the template system in standalone mode and if the url
template tag is used, ROOT_URLCONF has to be defined.
Thanks techtonik for the report.
 2012-06-02 11:38:23 +02:00
Claude Paroz
596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Chris Beaven
a901654a96 Very minor Python formatting change to template documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-20 01:31:07 +00:00
Aymeric Augustin
93240b7d90 Fixed #17229 -- Allow 'True', 'False' and 'None' to resolve to the corresponding Python objects in templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 20:49:45 +00:00
Timo Graham
44452b11eb Fixed #17618 - Documented that variable names in template must not start with an underscore; thanks guillemette and krzysiumed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 12:47:35 +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
Julien Phalip
c2b9f6496e Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-03 08:06:01 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Ramiro Morales
50ad59527c Tweaked some render_to_response links in the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 18:36:01 +00:00
Luke Plant
1286d78311 Fixed #15791 - method to signal that callable objects should not be called in templates 
Thanks to ejucovy for the suggestion and patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-19 22:06:19 +00:00
Luke Plant
8d4b414760 Fixed #15757 - removed remaining instances of get_and_delete_messages 
Thanks to void for the report, and julien for the bulk of the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-07 22:01:23 +00:00
Ramiro Morales
413ceb57b2 Changed 'raise' statements to new style syntax in documentation. Thanks DaNmarner. Refs #15635. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-17 20:49:31 +00:00
Russell Keith-Magee
7aa84917a4 Fixed #15299 -- Started the process of migrating the auth context processor support classes into the auth context processor module. Thanks to shailesh for the report, and v1v3kn for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-23 13:36:58 +00:00
Ramiro Morales
f81d4ba5b3 Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-25 15:42:24 +00:00
Luke Plant
7b8c38250c Fixed #15057 - documented change in [14992] 
Thanks to Tai Lee for the patch.

Refs #15025, #7153

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-13 13:47:21 +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
Timo Graham
08daa3df47 Fixed #11152 - Add some classes to the template docs. Thanks adamv for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-29 00:55:04 +00:00
Chris Beaven
4c51986790 Fixes #3529 -- more explicit documentation about Context.update. Thanks for the patch, ggetzie. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-24 00:36:36 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings. 
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:26 +00:00
Jannis Leidel
70edd4e103 Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:44:33 +00:00
Russell Keith-Magee
ded416bc7e Corrected to markup problems with docs added for recent features. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-28 12:56:44 +00:00
Jannis Leidel
cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 01:33:24 +00:00
Russell Keith-Magee
a323fd3c5e Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-23 08:07:35 +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
James Bennett
5c256ddeec Fixed #13072: Corrected a few markup and formatting errors in the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-11 09:41:29 +00:00
Malcolm Tredinnick
ff2d0ebdb8 Fixed three small doc markup errors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-10 00:58:05 +00:00
James Bennett
cdd95077a6 Fixed #11889: Documented the fact that context processors will overwrite pre-existing context variables of the same names. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:43:05 +00:00
Jannis Leidel
c9151bcba1 Fixed #12968 - Added missing versionadded/-changed doc markers for r12466. Thanks, Karen and Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 17:06:09 +00:00
Jannis Leidel
67d4289c2e Fixed #12066 - Moved auth context processor from core to the auth app. Thanks, Rob Hudson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:40:47 +00:00
Adrian Holovaty
6502965d17 Fixed #10800 -- Made a small improvement to render_to_string() docs. Thanks, p.patruno@iperbole.bologna.it and timo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 17:22:30 +00:00