Commit Graph

427 Commits

Author SHA1 Message Date
Claude Paroz 3a97f992fb Fixed #22313 -- Removed 'u' prefixes from documentation 2014-03-22 21:32:20 +01:00
Claude Paroz bc315266c8 Fixed #22294 -- Prevented converting length filter output to string
Thanks Steve Pike for the report.
2014-03-22 16:39:46 +01:00
Claude Paroz 6ca6c36f82 Improved strip_tags and clarified documentation
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
2014-03-22 10:59:18 +01:00
Tim Graham 1ea44a3abd Switched {% cycle %} and {% firstof %} tags to auto-escape their variables per deprecation timeline.
refs #17906.
2014-03-21 13:17:10 -04:00
Tim Graham 8b81dee60c Removed fix_ampersands template filter per deprecation timeline.
Also removed related utility functions:
* django.utils.html.fix_ampersands
* django.utils.html.clean_html
2014-03-21 08:50:43 -04:00
Rodolfo Carvalho 2b6436e2d5 Fixed some typos and formatting issues in docs. 2014-03-03 08:37:17 -05:00
Erik Romijn 775975f15d Fixed #22130 -- Deprecated fix_ampersands, removed utils.clean_html() 2014-03-01 14:07:57 +01:00
Tim Graham 7f2505ad9e Fixed doc typos. 2014-02-28 11:44:03 -05:00
Baptiste Mispelon 072fb923e1 Fixed #21881 -- Clarify behavior of {% ssi %} template tag.
When using the `parsed` option, {% ssi %} has the same limitation
as {% include %}, namely that the rendering of the included
template is done separately.

Thanks to trac user nagyv for the report and to alextreme for
the patch.
2014-02-23 12:00:24 +01:00
Marek Wywiał 8274fa60f8 Made the new template.Context.flatten() method a public API.
That method was introduced in 9db4271bd1.

Refs #21765.
2014-02-16 15:18:45 +01:00
Jeremy f94f466cd3 Fixed #19496 -- Added truncatechars_html filter.
Thanks esevece for the suggestion and  Nick Sandford and Martin Warne
for the inital work on the patch.
2014-02-13 10:27:27 -05:00
Tim Graham dfc092622e Fixed #21529 -- Noted that {% url %} encodes its output (refs #13260). 2014-01-22 10:44:50 -05:00
Tim Graham bc7668eb51 Fixed #18942 -- Clarified usage of {% get_static_prefix %}.
Thanks Aymeric for the suggestion.
2014-01-17 16:06:11 -05:00
Tim Graham 4a5aac47a6 Fixed #13116 -- Described scope of variables created by {% url ... as var %} syntax.
Thanks leif_p for the suggestion.
2014-01-17 14:50:47 -05:00
Baptiste Mispelon 1689744aee Added some internal links to render_to_string documentation. 2013-12-15 23:02:20 +01:00
Baptiste Mispelon 077af42139 Fixed #21515 -- Corrected example of template.Context in documentation.
Thanks to trac user oubiga for the report.
2013-11-28 00:57:13 +01:00
Julia Antokhine 3c3be2e8ec fixed typo in builtins.txt 2013-11-19 12:53:28 -05:00
Baptiste Mispelon 3c4832214f Fixed another typo introduced by b914991b37.
Thanks Claude for catching it.
2013-11-06 10:22:29 +01:00
Simon Charette 87908b4fc2 Fixed a documentation typo introduced by b914991b37. 2013-11-05 19:38:46 -05:00
Baptiste Mispelon b914991b37 Added more tests and documentation for dictsort.
It's possible to use something like {{ foo|dictsort:'bar.baz' }}
but this wasn't tested or documented.
2013-11-06 00:26:58 +01:00
Tim Graham 090315f5df Fixed spelling ("dependant" -> "dependent")
Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.
2013-11-01 21:29:39 -04:00
Tim Graham eafe279120 Fixed #21306 -- Documented lower-casing behavior of title filter. 2013-10-30 09:33:28 -04:00
Ramiro Morales bebb449ac3 Added docs for changes in commit dd3a883894.
Refs #20693.
2013-09-22 15:43:27 -03:00
Curtis Maloney 43a2ec7999 Fixed #21133 --Clarifed documentation about strftime formatting. 2013-09-21 06:42:11 -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
Goetz 39b49fd339 Fixed #21101 -- Updated urlize documentation to mention email addresses 2013-09-13 12:42:06 -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
Paul C. Anagnostopoulos 1ccdc08189 Clarified docs for some tags and filters 2013-09-04 12:32:05 -04:00
Curtis Maloney 5cdacbda03 Fixed #17356 -- Allowed {% include %} to render compiled templates
Reviewed by Loic Bistuer and Tim Graham.
2013-08-29 10:22:24 +03:00
Tim Graham 7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Jonathan Slenders ff410565bf Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter.
Thanks clay.evil@ for the suggestion.
2013-08-14 12:40:19 -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
Baptiste Darthenay 39b245fd76 Fixed #20614 -- Typo in documentation. 2013-06-17 11:35:07 +02:00
Claude Paroz bf9975b0eb Fixed #20606 -- Fixed 'for' example in template tag docs
Thanks batisteo for the report.
2013-06-15 12:02:25 +02:00
Gavin Wahl e6ff238431 Fixed regroup example.
Chicago was missing.
2013-05-29 21:46:58 -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
Aymeric Augustin ce45240df4 Fixed #20336 -- Removed obsolete paragraph from the docs.
Thanks Baptiste Mispelon.
2013-04-30 21:40:16 +02:00
Thomas Thurman b47b0211f5 Corrected "it's" to "its" when used possessively.
Fixed #20327.
2013-04-29 17:21:37 +02:00
Juan Catalano 78c842a323 Adapted uses of versionchanged/versionadded to the new form.
Refs #20104.
2013-04-20 17:18:35 +02:00
Andrew Brown 17be12df47 Removed a trailing space in the template name on line 174.
This trailing space may seem innocuous, but can be easily copied-and-pasted from the docs.
This can lead to bizarre File Not Found errors where the checked paths look correct, but actually aren't because
the trailing space is hard to see in an error message.
2013-04-05 01:52:12 -04:00
Claude Paroz 2bcbca3451 Updated some 'Dive Into Python' links 2013-04-01 14:04:41 +02:00
Tim Graham 6c730da1f6 Fixed #19897 - Updated static files howto.
Thanks Jan Murre, Reinout van Rees and Wim Feijen,
plus Remco Wendt for reviewing.
2013-03-29 19:15:19 -04:00
Vladimir A Filonov f49e9a517f Fixed #17906 - Autoescaping {% cycle %} and {% firstof %} templatetags.
This commit adds "future" version of these two tags with auto-escaping
enabled.
2013-02-23 16:16:39 +01: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
Aymeric Augustin ebd2598596 Removed django.contrib.markup. 2012-12-29 21:59:07 +01:00
Tim Graham b3a8c9dab8 Fixed broken links, round 3. refs #19516 2012-12-26 19:07:22 -05:00
Tim Graham 6534a95ac3 Fixed #19470 - Clarified widthratio example.
Thanks orblivion for the suggestion.
2012-12-18 08:20:01 -05:00
Claude Paroz 0eeae15056 Fixed #19354 -- Do not assume usermodel.pk == usermodel.id
Thanks markteisman at hotmail.com for the report.
2012-11-29 21:45:43 +01:00
Aymeric Augustin f89901dc05 Fixed two typos. 2012-11-25 19:31:53 +01:00
Aymeric Augustin d266919584 Fixed #19280 -- Raised an explicit exception for the old {% url %} syntax. 2012-11-24 22:10:51 +01:00
Tim Graham 63e6cd1bb3 Fixed #19348 - Clarified the units of filesizeformat.
Thanks george_edison for the report and Claude Paroz for the patch.
2012-11-23 07:00:08 -05:00
Tim Graham 2564e31014 Fixed #19308 - Clarified stringformat filter example
Thanks Shabda Raaj.
2012-11-17 19:29:31 -05:00
Daniel Greenfeld 3f65f751a0 Converted <paragraph> to <p> per #aaugustin's request 2012-11-12 16:12:27 -08:00
Daniel Greenfeld 1db5d88273 Added examples for comment, templatetag, escape, force_escape, timesince, and timeuntil 2012-11-08 16:35:39 -08:00
Preston Holmes 2cb48fffd4 Removed redundant docs addition across two commits
d5c3c45f2f

a70492e6b5
2012-11-04 19:12:44 -08:00
Bryan Veloso 79a484fc8e Merge pull request #496 from pydanny/ticket_19241
Demonstrate how to round to integers using floatformat templatetag
2012-11-04 18:19:56 -08:00
Daniel Greenfeld a70492e6b5 Fixed #19241 -- Improved floatformat docs
Demonstrate how to round to integers using floatformat templatetag
2012-11-04 17:40:21 -08:00
Daniel Greenfeld d5c3c45f2f Demonstrate how to round to integers using floatformat templatetag 2012-11-04 16:35:40 -08:00
Aymeric Augustin 24b2aad8e3 Fixed #19209 -- Documented |date:"I".
Thanks mitar for the report.
2012-10-29 23:12:20 +01:00
Ramiro Morales ec1aad1671 Added section about URL reversion to URL mapper document. 2012-10-07 20:21:07 -03: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
Aymeric Augustin 822cfce3df Fixed #18951 -- Formatting of microseconds.
Thanks olofom at gmail com for the report.
2012-09-22 12:02:21 +02: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
Florian Apolloner 62ae711cec Added a missing space to the description of the `cut` filter. 2012-08-04 23:58:31 +02:00
Kevin McCarthy c3a05d8794 Changed the word "brackets" to "parentheses"
I want to change the word "brackets" to "parentheses" because when I think
of brackets, I think of [], and when I think of parentheses, I think of (),
and when I originally read this, I found the word confusing.
2012-07-24 16:55:08 -10: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
Jannis Leidel 0a68a2994b Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch. 2012-07-07 15:30:25 +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
Chris Beaven c57ba67331 Fixed #14502 again -- saner verbatim closing token
Previously, the closing token for the verbatim tag was specified as the
first argument of the opening token. As pointed out by Jannis, this is
a rather major departure from the core tag standard.

The new method reflects how you can give a specific closing name to
{% block %} tags.
2012-06-19 10:49:33 +12: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
Aymeric Augustin 4464bbba15 Fixed #14502 -- Added a verbatim template tag.
Thanks SmileyChris for the patch.
2012-06-07 09:59:14 +02:00
Jacob Kaplan-Moss 7edf231d46 Replaced documentation snippets using "gender" with less sensitive examples. 2012-06-06 13:52:53 +02:00
Aymeric Augustin 29a80354ab Added alt attribute to img tags in docs.
This is a good practice for accessibility.
Thanks Jessica McKellar for the report.
2012-06-06 10:32:03 +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
Claude Paroz eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-24 19:55:52 +00: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
Chris Beaven 5ccc6f17b8 Fixed #16939 -- Inaccurate implementation of {% comment %} presented in custom template tag 'howto' guide. Thanks sebastian for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 03:25:27 +00:00
Jannis Leidel bd13cfa917 Added a note to the release notes about the new format strings added in r17473.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-13 20:57:44 +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
Jannis Leidel a6b6c6e171 Fixed #16416 -- Added two new date formatting options for timezones and ISO week numbers. Thanks, poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:57:31 +00:00
Adrian Holovaty 6ecadcbdd2 Made a bunch more edits up until [17418]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:45:45 +00:00
Aymeric Augustin 62766f4248 Reverted parts of r17359 that could cause false positives in URL detection, especially on file names.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-08 21:36:22 +00:00
Aymeric Augustin 05a3ecbf96 Fixed #16656 -- Changed the urlize filter to accept more top-level domains.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-08 16:08:43 +00:00
Aymeric Augustin 4403ce10b7 Removed a redundant paragraph from the templates builtins doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 20:48:19 +00:00
Aymeric Augustin 4c445fdfaa Fixed #17110 -- Mentionned that the {% filter %} tag doesn't support the 'safe' and 'escape' filters. Thanks benspaulding.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 20:45:58 +00:00
Timo Graham fe876f0119 Fixed #17442 - Broken link in refs/templates/builtins.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 11:58:49 +00:00
Aymeric Augustin 19cbdf8c8f Fixed #17348 -- Implemented {% elif %}. Refs #3100.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 22:13:27 +00:00
Adrian Holovaty 346324f131 Tweaked templates/builtins.txt to make it clearer that cycle and firstof filters don't auto-escape. Refs #10912
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 19:53:06 +00:00
Aymeric Augustin c5a899b190 Fixed #16787 -- Restored the ability to {% load %} template tags libraries within packages. Thanks Ivan Sagalaev for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 10:28:12 +00:00
Timo Graham 9b8e211dd3 Fixed #17028 - Changed diveintopython.org -> diveintopython.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 22:57:20 +00:00
Aymeric Augustin 9b1cb755a2 Added support for time zones. Thanks Luke Plant for the review. Fixed #2626.
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
Luke Plant 543984f462 Fixed some ReST errors in 'regroup' template tag docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-17 22:00:08 +00:00
Karen Tracey 3fa49c4e6e Fix #17179: Document that yesno filter's default argument is "yes,no,maybe". Thanks CarlFK and calvinspealman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 18:47:51 +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
Julien Phalip 482388cd61 Fixed #16927 -- Corrected the `{% ifchanged %}` template tag's documentation. Thanks to sebastian for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-25 05:21:29 +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
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
Ramiro Morales f4d93f6eb8 Two very simple docs fixes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-03 17:46:16 +00:00
Jannis Leidel 1d32bdd3c9 Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app.
Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-11 14:07:39 +00:00
Jannis Leidel 3b77458371 Fixed #5025 -- Add a "truncatechars" template filter. Many thanks to Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-14 13:47:10 +00:00
Jannis Leidel 8066fced33 Fixed #16392 -- Clarified docs of the "c" date format with regard to naive datetime objects. Thanks, ybon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-04 16:20:22 +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
Chris Beaven 0e27c49210 More accurate documentation for how the urlize template works. Refs #9189.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-27 03:32:10 +00:00
Simon Meers bda5ed5700 Fixed #16297 -- make_list documentation error regarding integers. Thanks ned and teraom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-26 21:27:44 +00:00
Jannis Leidel 1dfa567a23 Fixed typos introduced in r16430 and r16431. Thanks, magopian.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-18 08:48:25 +00:00
Jannis Leidel f8a3d87a19 Fixed #16071 -- Added note to fix_ampersands documentation about its limitations. Many thanks to jerry and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 15:39:35 +00:00
Jannis Leidel 44b03484ec Fixed #15908 -- Mention blocktrans in the pluralize filter documentation section. Thanks, Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:20 +00:00
Jannis Leidel 4970ef07c2 Fixed #9189 -- Added not about urlize only covering .com, .net, and .org domains. Thanks, dArignac.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 15:45:14 +00:00
Ramiro Morales 0638ba5bba Enhanced a bit the documentation and docstring for the url template tag. Also, added a test for it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-05 23:44:34 +00:00
Jannis Leidel 49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-29 17:41:04 +00:00
Timo Graham 6443adc9a9 Fixed #16067 - Couple reST fixes in ref/templates/builtins.txt; thanks julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-22 16:43:50 +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
Jannis Leidel 0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:45 +00:00
Alex Gaynor c21d3afaef Fixed #15952 -- fixed an error in the template builtins docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 03:15:28 +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
Gabriel Hurley 6f84e520e5 Fixed #15843 -- removed an extraneous quotation mark in the template tag docs. Thanks to Titan, Jer-ming Lin for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-18 23:15:28 +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 c260c533e1 Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 13:43:53 +00:00
Gabriel Hurley 9428c23869 Fixed #15528 -- Added versionchanged directive to load template tag docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:35:27 +00:00
Gabriel Hurley 20b940614e Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:31:10 +00:00
Ramiro Morales 5aca35329c Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 03:05:57 +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
Gabriel Hurley 1d4640a58f Fixed #15351 -- Corrected a missing word in the template reference docs. Thanks to issackelly for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 22:28:39 +00:00
Timo Graham 6eacbfd411 Fixed "the the" typos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:18:30 +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 032aac72c4 Fixed #13452 - Document that regroup can be used with any template lookup. Thanks shacker for the suggestion and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:20:53 +00:00
Timo Graham 4243d49700 Fixed #14987 - Alpha sort date filter arguments. Thanks Peter for the report; adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:05:51 +00:00
Gabriel Hurley 645323155b Fixed #14912 -- Expanded documentation for the urlize template filter. Thanks to adamv for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 22:53:28 +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 78f0ab7eb0 Fixed #14676 - Document that the removetags filter is case-sensitive. Thanks peterh32 for the report and elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 15:37:12 +00:00
Chris Beaven 3ae9117c46 Fixes #7817 and #9456.
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 02:50:26 +00:00
Jannis Leidel 7292af8542 Fixed #14570 -- Added new date format character for alternative month names using the new context capabilities. Also add context to Associated Press style month names (refs #9988). Thanks to Claude and shell_dweller.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:51:28 +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
Gabriel Hurley 6482dec295 Fixed #14736 -- corrected an ungrammatical sentence in the template tags docs. Thanks to DD for the report and adamv for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 06:44:19 +00:00
Russell Keith-Magee 790f0eb7fe Corrected a typo in the docs for {% load %}. Thanks to Jannis for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 11:16:43 +00:00
Russell Keith-Magee 7ff5580d95 Fixed #14389, #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 06:22:28 +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
Gabriel Hurley 682f4cf9ed Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 09:21:55 +00:00
Gabriel Hurley 7f2b36050e Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:42:55 +00:00
Russell Keith-Magee a89e02637b Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 13:42:30 +00:00
Russell Keith-Magee ccc49029b8 Fixed #14181 -- Added a template tag and filters to allow localization to be disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-29 16:48:58 +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
Ramiro Morales 248b1dea3d Removed obsolete 'date' filter -> 'now' tag link.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 12:48:56 +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
Chris Beaven dfcb814a87 Fix the version which the safe argument for the urlencode filter was added. Thanks eternicode for pointing this out.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 00:41:37 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Russell Keith-Magee 127a25ac27 Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:37:16 +00:00
Jannis Leidel 70e7e082fc Fixed #13188 -- Moved date format documentation from the now template tag to the date filter. Thanks, dwillis and timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:33:11 +00:00
Jannis Leidel 2c9f0b75fb Fixed #14122 -- Added example for builtin yesno template filter. Thanks, idahogray.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 20:52:36 +00:00
Luke Plant 6fb4f6e299 Fixed #13765 - 'safe' parameter for urlencode filter
Thanks to KyleMac for the suggestion and SmileyChris for the patch

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:01:34 +00:00
Luke Plant e5d30c7001 Fixed #13350 - Documentation on autoescape should mention endautoescape
Thanks to mountainpaul@gmail.com for report and to dwillis patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:49:32 +00:00
Russell Keith-Magee 23e85ef25f Refactored markup documentation to give it it's own home.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:40:17 +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
Russell Keith-Magee 806f3b26f8 Fixed #11021 -- Clarified newline stripping behavior in the truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:57:24 +00:00
Jannis Leidel 06ab9eeaf5 Added notes about the two new date format specifiers (``c`` and ``u``) added in 1.2. Thanks for the patch, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-16 20:48:19 +00:00
Jannis Leidel 34ddcd9939 Fixed #13547 -- Made sure the ISO 8601 date formatting introduced in r12058 uses "T" as the separator between the date and the time value to increase real world usefulness.
While the ISO standard permits the use of a space instead of "T" for readability, it does have an impact on standards like HTML5 which rely on specific rules made in RFC 3339.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-16 15:54:10 +00:00
Jannis Leidel c796fc7e36 Fixed #13317 - Clarified documentation about how the blocktrans and trans template tags work with regard to variables. Thanks for the initial patch, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 13:55:15 +00:00
Russell Keith-Magee ced4dd2aad Fixed #6752 -- Corrected the interaction of the safe template filter with other filters. Thanks to Rupe and Alex Gaynor for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:45:21 +00:00
Luke Plant 533b5c9324 Fixed typo and small formatting mistake in docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-07 00:57:17 +00:00
Russell Keith-Magee 84df3554d0 Fixed #13287 -- Corrected the advice on argument formatting in the {% url %} tag. Thanks to Gabriel Hurley for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:19:21 +00:00
Russell Keith-Magee b26aa18c5c Fixed #13444 -- Improved the documentation around the backwards compatibility quirks of the cycle and include tags. Thanks to awmcclain for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-01 14:27:10 +00:00
Russell Keith-Magee dafc077e4a Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 12:44:30 +00:00
Russell Keith-Magee 8dbd8b1c29 Fixed #13177 -- Corrected usage of firstof in admin templates. Thanks to nomulous for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:52:51 +00:00
Russell Keith-Magee beca4b8109 Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 07:22:20 +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
Luke Plant 960af90279 Fixed #13058 - "smart if" template tag doesn't support "if not in ..." condition
Thanks to ramusus for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 23:25:37 +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
Karen Tracey ecb56cecbd Fixed #12946: Removed an invalid example of url tag usage from the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 04:04:23 +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 5787925cdb Fixed #12967 - Added missing versionadded/-changed doc markers for r11964. Thanks, Karen and Ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:05:52 +00:00
Jacob Kaplan-Moss 49d6a82261 Fixed #11687: the `add` filter is now less failsome when faced with things that can't be coerced to integers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:34:33 +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
Jannis Leidel e752d4984a Fixed #12496 - Added code examples to built-in filter documentation. Thanks, Arthur Koziel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:36:19 +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
Adrian Holovaty 88265d4a73 Fixed #12497 -- Fixed Sphinx errors in docs. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:11:41 +00:00
Jannis Leidel d981cb4e66 Fixed #7262 - Added ISO 8601 and microsecond format string to utils.dateformat. Thanks zegor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:39:26 +00:00
Gary Wilson Jr c6fa4936b3 Fixed #9465 -- Simplified API Reference documentation titles for easier lookup and made first-level heading styles consistent. Thanks, adamnelson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 03:44:21 +00:00
Gary Wilson Jr b4f5e80cd1 Added a few Sphinx directives to the form API and template API docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 20:51:30 +00:00
Jannis Leidel 9233d04265 Fixed #7980 - Improved i18n framework to support locale aware formatting (dates and numbers) and form processing.
Thanks to Marc Garcia for working on this during his Google Summer of Code 2009!

Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:58:49 +00:00
Russell Keith-Magee 44b9076bbe Fixed #6262 -- Added a cached template loader, and modified existing template loaders and tag to be cacheable. Thanks to Mike Malone for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 12:08:23 +00:00
Luke Plant 2c2f5aee4d Implemented 'smart if' template tag, allowing filters and various operators to be used in the 'if' tag
Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis
of the parser methodology and Russell Keith-Magee for code reviews.

There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if
you were using the keywords 'and', 'or' or 'not' as variable names within
the 'if' expression, which was previously allowed in some cases.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 22:40:36 +00:00
Luke Plant 25020ddb05 Fixed #4604 - Configurable message passing system, supporting anonymous users
This deprecates User.message_set in favour of a configurable messaging
system, with backends provided for cookie storage, session storage and
backward compatibility.

Many thanks to Tobias McNulty for the bulk of the work here, with
contributions from Chris Beaven (SmileyChris) and lots of code review from
Russell Keith-Magee, and input from many others.  Also credit to the authors
of various messaging systems for Django whose ideas may have been pinched
:-)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 16:57:23 +00:00
Russell Keith-Magee cf169d9e12 Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 13:44:24 +00:00
Luke Plant 9dc9770736 Documented the presence of {% csrf_token %} in Django 1.1.2 in trunk docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:52:25 +00:00
Luke Plant 7230a995ce Moved contrib.csrf.* to core code.
There is stub code for backwards compatiblity with Django 1.1 imports.

The documentation has been updated, but has been left in
docs/contrib/csrf.txt for now, in order to avoid dead links to
documentation on the website.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:36:34 +00:00
Luke Plant 8e70cef9b6 Fixed #9977 - CsrfMiddleware gets template tag added, session dependency removed, and turned on by default.
This is a large change to CSRF protection for Django.  It includes:

 * removing the dependency on the session framework.
 * deprecating CsrfResponseMiddleware, and replacing with a core template tag.
 * turning on CSRF protection by default by adding CsrfViewMiddleware to
   the default value of MIDDLEWARE_CLASSES.
 * protecting all contrib apps (whatever is in settings.py)
   using a decorator.

For existing users of the CSRF functionality, it should be a seamless update,
but please note that it includes DEPRECATION of features in Django 1.1,
and there are upgrade steps which are detailed in the docs.

Many thanks to 'Glenn' and 'bthomas', who did a lot of the thinking and work
on the patch, and to lots of other people including Simon Willison and
Russell Keith-Magee who refined the ideas.

Details of the rationale for these changes is found here:

http://code.djangoproject.com/wiki/CsrfProtection

As of this commit, the CSRF code is mainly in 'contrib'.  The code will be
moved to core in a separate commit, to make the changeset as readable as
possible.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 23:23:07 +00:00
Russell Keith-Magee 8d48eaa064 Fixed #10061 -- Added namespacing for named URLs - most importantly, for the admin site, where the absence of this facility was causing problems. Thanks to the many people who contributed to and helped review this patch.
This change is backwards incompatible for anyone that is using the named URLs
introduced in [9739]. Any usage of the old admin_XXX names need to be modified
to use the new namespaced format; in many cases this will be as simple as a
search & replace for "admin_" -> "admin:". See the docs for more details on
the new URL names, and the namespace resolution strategy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 16:16:13 +00:00
Russell Keith-Magee 6ed0345092 Fixed #11413 -- Added notes on the cycle and firstof tag detailing that variables output by those tags will not be escaped by default. Thanks to krystal for the report and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 05:41:36 +00:00
Karen Tracey 7638651cc3 Fixed #11204 -- Corrected typo in the pluralize doc. Thanks martin and SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:26:56 +00:00
Jacob Kaplan-Moss 66ff7db385 Fixed #11046: fixed a use of the deprecated cycle tag syntax in the template documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 01:53:57 +00:00
Jacob Kaplan-Moss 2af75b485d Fixed #10825: fixed the 'U' format code to dateformat (and the date/now filter/tag). Thanks to gsong and mir.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-08 13:39:37 +00:00
Russell Keith-Magee f3c3aa232c Fixed #10704 -- Resurrected documentation for {% else %} clause on {% ifchanged %}, lost during docs refactor. Thanks to Tarken for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 12:46:15 +00:00
Jacob Kaplan-Moss c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions.
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-03 18:30:54 +00:00
Gary Wilson Jr d8bffb3969 Fixed #10375 -- Added documentation about the default format strings used for the `date` and `time` filters when no format string is passed to the filter, based on patch from kgrandis.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 16:34:24 +00:00
Malcolm Tredinnick dfddf129f0 Fixed #9701 -- Added a "safeseq" template filter.
This is like "safe", except it operates on the individual elements of a
sequence, rather than treating the whole argument as a string.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 08:16:33 +00:00
Russell Keith-Magee af346081e3 Fixed #10007 -- Corrected (and narrowed) a reference to the Python standard library documentation. Thanks to d00gs for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:09:28 +00:00
Adrian Holovaty 641853331d Fixed #10177 -- Fixed typo in docs/ref/templates/builtins.txt. Thanks, bmjames
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-21 08:43:35 +00:00
Malcolm Tredinnick 4bdbd1401d Fixed #9735 -- Documentation typo fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-03 05:50:46 +00:00
Jacob Kaplan-Moss 4aa97f5c18 Fixed #6398: added an optional `{% empty %}` clause to the `{% for %}` template tag. The contents of this clause are rendered if the list iterated over turns out to be empty. Thanks, Jannis Leidel.
Astute readers will notice that the patch originally called this `default`; after consideration I decided that `empty` is a very slightly better color for this particular bikeshed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24 22:01:48 +00:00
Jacob Kaplan-Moss 136c4f8549 Fixed a small reST header glitch in docs/ref/templates/builtins.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24 22:01:24 +00:00
Karen Tracey c483583023 Fixed #9497 - Doc typos. Many thanks ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 20:43:20 +00:00
Karen Tracey d4f4ab8535 Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:02:09 +00:00
Adrian Holovaty 97087962b1 Rewrote bits of the cycle tag documentation, which was confusing -- it implied 'rowvar' was required
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-30 17:45:58 +00:00
Malcolm Tredinnick edabc4aca1 Fied #9169 -- Fixed a typo in a docs example. Thanks, jeremyb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-27 03:25:42 +00:00
Adrian Holovaty 74f386dba2 Fixed #8979 -- Made a bunch of typo/formatting fixes to the docs. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-09 01:54:20 +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 c068bc184c Merge branch 'url-tag-asvar'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29 19:28:03 +00:00
Russell Keith-Magee 3442821836 Fixed #8595: Removed a note about possible changes to the syntax of the {% url %} template tag. Thanks to julien for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28 11:29:00 +00:00
Malcolm Tredinnick 3111d7f60b Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-aware
times. Patch from Jeremy Carbaugh.

This is backwards incompatible in the sense that previously, if you tried to
compare timezone-aware and timezone-naive values, you got an incorrect result.
Now you get an empty string. So your previously incorrect code returns a
different incorrect result.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 08:08:55 +00:00
Russell Keith-Magee 06d49768bd Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 12:31:10 +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