mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
5,298 Commits 28 Branches 426 Tags 667 MiB
3d918f41f5
Commit Graph

133 Commits

Author SHA1 Message Date
Russell Keith-Magee
8880fdd9ee Fixed #7935 -- Corrected typo in template docs, plus slightly clarified the language. Thanks to jturnbull for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-30 12:37:38 +00:00
Malcolm Tredinnick
e29aece743 Fixed #4534 -- Added an "else" option to the "ifchanged" template tag. 
Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 22:09:43 +00:00
Malcolm Tredinnick
4ec2b8904b Fixed #7948 -- Fixed a typo in the linebreaks filter documentation, pointed out 
by Joel Kitching.

While I was in the neighbourhood, made one other example a little more
consistent.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 03:08:53 +00:00
Adrian Holovaty
bfcecfee91 Fixed #7814 -- Fixed a number of style inconsistencies in the docs. Thanks, uzi and programmerq 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 03:01:21 +00:00
Malcolm Tredinnick
a75de3f342 Changed a documentation example that wasn't wrong to stop complaints. 
Fixed #7544.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-01 02:17:24 +00:00
Russell Keith-Magee
e4fc327890 Fixed #7470 -- Corrected typo in template docs. Thanks to cbmeeks@gmail.com for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-17 11:19:08 +00:00
Adrian Holovaty
fbeec87b62 Fixed #6993 -- Fixed a grammar error in docs/templates.txt. Thanks, Ionut Ciocirlan 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 03:38:43 +00:00
James Bennett
df225aee18 Fixed #6166: Improved example of autoescaping with template inheritance. Based on a patch from PJCrosier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 18:41:52 +00:00
Adrian Holovaty
e5342282cc Edited docs/templates.txt changes from [7276] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 04:21:08 +00:00
Jacob Kaplan-Moss
8e14a4e6d7 Fixed #6351: added more examples to template filters. Thanks, David Tulig and atlithorn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 00:14:41 +00:00
Adrian Holovaty
8b3f36029f Made a bunch of small doc rewordings from changes over the past couple of weeks 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-16 05:15:09 +00:00
Malcolm Tredinnick
3760e7a1e0 Fixed #6345 -- Django supports week numbers all the way up to 53, not just 23. 
Thanks, djoume.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-09 07:32:05 +00:00
Gary Wilson Jr
8775c17930 Fixed #6330 -- Fixed reST error in templates documentation, thanks SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-06 22:09:16 +00:00
Malcolm Tredinnick
a7da12d320 Fixed #5567 -- Added a "last" filter. Based on a patch from darkpixel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-06 03:53:33 +00:00
Gary Wilson Jr
f9410dc40d Fixed #6151 -- Added some code formatting to the floatformat template filter doc section. Thanks, adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-11 06:55:25 +00:00
Jacob Kaplan-Moss
b65fce6595 Fixed #4131: added an "escapejs" filter for use in JavaScript strings, and updated the documentation on addslashes to point to the new ticket. Featuring contributions from Ned Batchelder, Jeremy Dunck, and Andy Durdin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-04 21:08:29 +00:00
Adrian Holovaty
b34b1a89b2 Removed some 'behaviour's from the docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-04 06:01:00 +00:00
Malcolm Tredinnick
04a20c0226 Fixed #6097 -- Fixed some broken RST markup. Thanks, Simeon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 15:03:36 +00:00
Adrian Holovaty
4a3084f3fc Edited templates.txt and templates_python.txt auto-escaping changes from [6671] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 18:38:12 +00:00
Adrian Holovaty
b3b8a2e9b3 Edited docs/custom_model_fields.txt from [6652] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 17:29:45 +00:00
Adrian Holovaty
bfa742b6ea Edited docs/templates.txt changes from [6533]. Let's not smash people over the head with an only marginally important piece of information in the very first paragraph of the document. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-30 05:18:57 +00:00
Malcolm Tredinnick
0928fa5566 Fixed #5945 -- Treat string literals in template filter arguments as safe 
strings for auto-escaping purposes.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 12:11:26 +00:00
Malcolm Tredinnick
bdb0b903c2 Content coming via {{ block.super }} is always going to be correctly escaped 
already. We mark it as safe so that template authors don't need to.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 21:07:27 +00:00
Malcolm Tredinnick
356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Gary Wilson Jr
6f7fd897bc Added pretty tables for floatformat documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-04 02:48:44 +00:00
Gary Wilson Jr
0e59bf42cf Fixed #5869 -- Corrected documentation for now template tag's "r" format character. Thanks, xavier.morel@masklinn.net. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-04 01:14:58 +00:00
Malcolm Tredinnick
b678601df3 Fixed #4123 -- Changed the firstof template tag to correctly handle a literal 
string as its last argument. Thanks, Wesley Fok and Matt Boersma.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-20 15:01:31 +00:00
Malcolm Tredinnick
22ee68961a Added a section to the template documentation to clarify the arbitrary Python 
code should not be expected to work. The might help balance expectations.
Thanks, James Bennett. Fixed #5125.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-20 11:05:15 +00:00
Gary Wilson Jr
40f1c923e2 Fixed #5658 -- Added a note to the top of the "for template authors" template documentation that states the scope of the document, along with a link to the "for Python programmers" documentation. Removed the link to the "for Python programmers" documentation at the bottom since it would be redundant. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-19 05:07:47 +00:00
Gary Wilson Jr
66203fc9ee Fixed #2675 -- Changed the timeuntil and timesince template filters to display "0 minutes" when passed a past or future date respectively instead of "-1 years, 12 months". Thanks to nickefford for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-17 04:50:12 +00:00
Malcolm Tredinnick
8a17181b58 Fixed #5477 -- Added links from the markup filters to the more extensive documentation in the add-ons file. Patch from mitja. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 09:51:57 +00:00
Adrian Holovaty
cadc6e8c9f Fixed #4658 -- Improved documentation of linebreaks and linebreaksbr. Thanks, ubernostrum and Gary Wilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 21:46:38 +00:00
Malcolm Tredinnick
0f03d9b6cb Fixed #5340 -- Fixed a broken link. Thanks, Justin Lilly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 10:11:02 +00:00
Russell Keith-Magee
09145d2e5f Fixed #208 -- Modernized the syntax of the cycle tag to allow for spaces and variables in cycle values. Thanks to SmileyChris and Chris McAvoy for their work on this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 02:49:21 +00:00
Adrian Holovaty
9b07806aa1 Fixed #5340 -- Linked docs/templates.txt to docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-09 17:18:36 +00:00
Gary Wilson Jr
1a1a58c9f8 Fixed #3184 -- Changed the unordered_list template filter to use a more simple format, while maintaining backwards compatibility with the old format. unordered_list now works with a simple list of items. Thanks for the patch, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-26 01:11:20 +00:00
Adrian Holovaty
77a9b0cb1d Edited docs/templates.txt change from [5938] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 21:02:36 +00:00
Malcolm Tredinnick
79801f504f Added a note that the development version supports named URL patterns in the url template tag. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 10:14:58 +00:00
Malcolm Tredinnick
cfd5b184fb Clarified that urlize and urlizetrunc should only be applied to plain text. Refs #5202. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 08:50:51 +00:00
Adrian Holovaty
0d9f21bb75 Improved docs/templates.txt section on the 'regroup' tag 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-15 21:16:32 +00:00
Russell Keith-Magee
0f10867519 Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 14:11:41 +00:00
Malcolm Tredinnick
953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Malcolm Tredinnick
284c6ba44b Fixed #4657 -- Fixed an error in an edge case of the urlizetrunc filter. 
Thanks, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-23 03:10:32 +00:00
Russell Keith-Magee
16269c4d0a Fixed #3523 -- Added list unpacking to for loops in templates. Thanks to SmileyChris and Honza Kral for their work. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-08 11:58:03 +00:00
Jacob Kaplan-Moss
f6491bf984 Fixed #4000 - changed documentation to note that filter arguments no longer need to be quoted (and added a test to that effect). Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-07 18:18:44 +00:00
Malcolm Tredinnick
451cbfe894 Added a clarification that {#...#} is only for single-line comments. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-27 10:44:42 +00:00
Malcolm Tredinnick
aae36cfc8e Fixed #4355 -- Clarified a confusing example in the use of the url template 
tag. Based on a patch from Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-26 09:43:32 +00:00
Russell Keith-Magee
83c4c53120 Fixed #4038 -- Added reference to django.contrib.webdesign in the template docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-16 11:26:07 +00:00
Russell Keith-Magee
49ae68925c Fixed #3956 -- Minor typo in template docs. Thanks, Nick Fishman. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-12 11:12:45 +00:00
Russell Keith-Magee
9191fa1f64 Fixed #3532 -- Made spaceless template tag remove all spaces, rather than preserving a single space. Thanks for the suggestion, ampaze@gmx.net. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 01:09:21 +00:00