mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 01:55:49 +00:00
Code Issues 25 Releases Wiki Activity
19,526 Commits 28 Branches 426 Tags 666 MiB
9eb4f28e89
Commit Graph

268 Commits

Author SHA1 Message Date
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