mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 17:46:27 +00:00
Code Issues 25 Releases Wiki Activity
1,907 Commits 28 Branches 426 Tags 666 MiB
4a324ba7ac
Commit Graph

54 Commits

Author SHA1 Message Date
Malcolm Tredinnick
239adf83d3 Fixed #2053 -- added an optional comparison argument to the "timesince" filter. 
Added a "timeuntil" filter that works analogously. Thanks, john@sneeu.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-21 06:56:08 +00:00
Malcolm Tredinnick
75a8a32f86 Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-18 04:12:55 +00:00
Adrian Holovaty
e5cd46d6d1 Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens of unit tests and updated docs. Thanks, ckknight 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-08 03:33:21 +00:00
Adrian Holovaty
fb537e177d Added django.contrib.humanize, a set of template tags for adding a 'human touch' to data. They're documented in add_ons.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-04 00:58:39 +00:00
Adrian Holovaty
75824ba82d Fixed more ReST errors in docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:59:39 +00:00
Adrian Holovaty
f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Adrian Holovaty
f2aa710f13 Added note to docs/templates.txt about {% extends %} needing to be the first tag in the template. Thanks, Chris Chamberlin 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-11 02:59:48 +00:00
Adrian Holovaty
e4b48a8b92 Fixed #1058 -- Fixed typo in wordwrap filter documentation. Thanks, kieranholland.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-02 05:53:58 +00:00
Adrian Holovaty
186b5ccb34 Fixed #1365 -- Improved docs/templates.txt to note location of admin documentation site. Thanks, Joseph Heck 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-17 17:25:01 +00:00
Adrian Holovaty
f732217c0a Added better docs for 'phone2numeric' template filter 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-13 15:33:25 +00:00
Adrian Holovaty
e0c915ec39 Added TEMPLATE_STRING_IF_INVALID setting, which specifies what the template system should output in case of invalid variables. Default is empty string (to match current behavior) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-09 00:31:51 +00:00
Adrian Holovaty
a07b704d8b Added 'Custom libraries and template inheritance' section to docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-21 22:29:55 +00:00
Adrian Holovaty
6f3f25e733 Fixed bug in spaceless template-tag documentation. Thanks, Esaj 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-16 21:44:10 +00:00
Adrian Holovaty
e449e5c805 Fixed #1227 -- Fixed problem with new {% spaceless %} tag. It now normalizes spaces to a single space rather than no spaces 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-15 05:18:17 +00:00
Adrian Holovaty
0eaee6f5d4 Fixed #1067 and #276 -- Added a {% spaceless %} tag, available in all templates 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-15 01:51:30 +00:00
Adrian Holovaty
786e5477b7 Removed 'Only in Django development version' messages from the docs, because frozen docs for version 0.90 are now available 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-11 00:11:29 +00:00
Adrian Holovaty
2863e09f2e Fixed typo in docs/templates.txt. Thanks, pbx 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-01 20:27:34 +00:00
Adrian Holovaty
3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-26 22:46:31 +00:00
Adrian Holovaty
bedf10a98d Fixed #598 -- Added {% include %} template tag. Added docs and unit tests. Thanks, rjwittams 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-22 05:44:04 +00:00
Adrian Holovaty
24b98280a5 Fixed bug in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-22 04:45:12 +00:00
Adrian Holovaty
3ae9542c24 Beefed up docs for floatformat template filter 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-22 04:44:21 +00:00
Adrian Holovaty
912ddb16bc Fixed formatting bug in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-22 04:42:26 +00:00
Adrian Holovaty
371f63c210 Fixed #742 -- Implemented 't' dateformat. Thanks, radek. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:53:13 +00:00
Adrian Holovaty
72547994c1 Fixed ReST bug in templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:37:20 +00:00
Adrian Holovaty
bd0d8a779e Fixed ReST bug in templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:36:28 +00:00
Adrian Holovaty
eb590d894d Changed headers in docs/templates.txt to match style from other documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:33:23 +00:00
Adrian Holovaty
aa89487fd0 Fixed ReST bug in [1110] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:32:22 +00:00
Adrian Holovaty
92241e21b8 Reformatted docs/templates.txt to put headings in filter and tag references, so each tag/filter gets a permalink 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:30:06 +00:00
Adrian Holovaty
17f62269c2 Fixed #479 -- Implemented time-zone formats in dateformat. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 21:37:59 +00:00
Adrian Holovaty
3e7ea41bbb Added note about ALLOWED_INCLUDE_ROOTS to docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 21:58:01 +00:00
Adrian Holovaty
62db7c5c94 Fixed another ReST bug in template docs from [969] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:32:49 +00:00
Adrian Holovaty
81fd300a4e Fixed ReST bug in template docs from [969] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:31:54 +00:00
Adrian Holovaty
4c327b9c86 Lightly refactored django.utils.dateformat to make it use less code. Also integrated some of Sune's improvements from the #479 patch, including support for backslash escaping. Also vastly improved template docs for the {% now %} tag 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:30:11 +00:00
Adrian Holovaty
91bd6eed06 Fixed typo in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-17 18:08:55 +00:00
Adrian Holovaty
63a3c72e19 Added note about multiple block tags to docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-17 14:26:20 +00:00
Adrian Holovaty
f2b8e85360 Fixed ReST bugs in docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 15:02:44 +00:00
Adrian Holovaty
ed1c9b2046 Fixed #622 -- Added default_if_none filter. Thanks, Eric 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 03:48:27 +00:00
Jacob Kaplan-Moss
27b1f69d79 Fixed #295 - added {{{forloop.revcounter}}} and {{{forloop.revcounter0}}} variables to for loops. Also updated the docs and added unit tests to verify correct behavior. Thanks, Clint. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-29 23:34:29 +00:00
Adrian Holovaty
2e8e256fe8 Improved docs/templates.txt to add example for slice filter. Thanks for the suggestion, Graham Higgins 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-24 17:39:20 +00:00
Adrian Holovaty
096ad32c84 Added docs/templates_python.txt, which isn't finished yet 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-05 23:38:46 +00:00
Adrian Holovaty
29c50bc0d4 Fixed #287 -- Clarified description for 'slugify' template filter. Thanks, emccoy@interland.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-01 22:58:58 +00:00
Adrian Holovaty
2577581808 Updated template docs to reflect [587] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-01 02:21:08 +00:00
Adrian Holovaty
02ebeec0dc Updated docs/templates.txt to add {% ifequal %} 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-29 21:58:21 +00:00
Adrian Holovaty
217c746789 Copy-edited docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-09 22:39:25 +00:00
Adrian Holovaty
32fe8e3863 Removed Janet Reno example from doc/templates.txt -- thanks, Bob 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-09 21:42:27 +00:00
Jacob Kaplan-Moss
18749c0060 Rolled a number of comments into documentation; thanks to all those who contributed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-21 19:05:10 +00:00
Adrian Holovaty
136d78b86e Fixed typo in template docs -- Thanks, Nicholas Riley and Robin Munn! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-17 15:15:26 +00:00
Jacob Kaplan-Moss
058c526ef9 Rolled comments from template page into FAQ 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-16 17:13:20 +00:00
Jacob Kaplan-Moss
7fcae93850 Fixed small indentation error in [73] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@74 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-15 21:46:44 +00:00
Wilson Miner
6b68559c9a Clarified template documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@73 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-15 21:44:19 +00:00