1
0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Commit Graph

212 Commits

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