mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 19:46:22 +00:00
Code Issues 30 Releases Wiki Activity
4,343 Commits 28 Branches 426 Tags 677 MiB
5e06c129c6
Commit Graph

115 Commits

Author SHA1 Message Date
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
Adrian Holovaty
d22e39c10d Fixed #3799 -- Added django.contrib.webdesign and moved 'lorem' template tag into there 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-30 01:50:06 +00:00
Russell Keith-Magee
5f68a26ff4 Fixes #3799 -- Oops - ran last checkin from the wrong directory. Checked in the rest of the lorem templatetag implementation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 11:43:24 +00:00
Adrian Holovaty
e2937ef6a0 Fixed #3814 -- Fixed HTML typo in docs/templates.txt regroup section. Thanks, djangorat@shitsoftware.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 22:30:59 +00:00
Adrian Holovaty
932928a1e2 Edited docs/templates.txt changes from [4830] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 19:02:32 +00:00
Jacob Kaplan-Moss
45f9217cbd Cleaned up the docs from [4830] a bit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 17:30:57 +00:00
Jacob Kaplan-Moss
d6fd9fb22b Fixed #3826: added a {% with %}. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 17:25:56 +00:00
James Bennett
1c13d05043 Remove notes about things added/removed in development version, since the development version is about to become 0.96 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:45:30 +00:00
Jacob Kaplan-Moss
28ad156f10 Fixed #3488: Added "b" option to date format filter. Thanks, Gary Wilson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 16:18:55 +00:00
Adrian Holovaty
5bed563edf Cleaned up docs/templates.txt 'url' tag documentation from [4494] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 06:13:06 +00:00
Malcolm Tredinnick
0fabbf8ce8 Fixed #2606 -- Added tag for working out the URL of a particular view function. 
All work done by Ivan Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 04:24:58 +00:00
Adrian Holovaty
b9677848f5 Small formatting tweaks to named-end-blocks change from [4489] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-12 17:13:08 +00:00
Malcolm Tredinnick
a0c354ee4e Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure 
correct nesting. Thanks for the patch, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-12 00:22:22 +00:00
Malcolm Tredinnick
1aa1c4672c Added some documentation for truncatewords_html (added in [4468]). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 05:22:12 +00:00
Adrian Holovaty
8e54c49784 Fixed #3333 -- Docs now use relative links, not hard-coded djangoproject.com links. Thanks for the patch, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-24 20:08:47 +00:00
Russell Keith-Magee
c3f891210a Fixes #3176, #3004 -- Added an argument to the floatfilter to allow users to specify precision of floats, Thanks, Eric Floehr. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-03 05:29:34 +00:00
Adrian Holovaty
7cce717f34 Fixed typo in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-10 03:30:00 +00:00
Adrian Holovaty
fdb3b738a8 Fixed typo in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 23:42:27 +00:00
Adrian Holovaty
a84404c190 Formatting fixes from the past round of checkins 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 19:07:27 +00:00