Commit Graph

3368 Commits

Author SHA1 Message Date
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
Adrian Holovaty 99742d8d73 Fixed it's -> its in multi-db.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-16 22:37:29 +00:00
Timo Graham dc2a3f8280 Fixed #14848 - change example verbose name to match convention. thanks madisv for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 23:43:36 +00:00
Timo Graham c3143783ca Fixed #14901 - Typo in class-based views paginator doc. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 23:34:47 +00:00
Alex Gaynor 68548c3eff Fixed #14897 -- fixed some synax highlighting in the formset documentation. Thanks to marcusf for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 19:37:18 +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
Jannis Leidel 05eb53603c Fixed #14187 -- Added support for bpython to shell management command. Thanks, Jeremy Dunck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:03:24 +00:00
Jannis Leidel 9ab85e05e2 Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:02:45 +00:00
Jannis Leidel a03a8adb3e Fixed #14268 -- Start the deprecation of the reset and sqlreset management command. Thanks, Carl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:58:25 +00:00
Jannis Leidel dad28e8557 Fixed #14103 -- Take USE_ETAGS setting into account when patching the response headers. Thanks, trbs and Eric Holscher.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:57:17 +00:00
Jannis Leidel 8dfd3dfd49 Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:52 +00:00
Jannis Leidel d0257a1558 Fixed #14041 -- Added ability to override the template of the sitemaps views. Thanks, julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:29 +00:00
Jannis Leidel b3520da9ac Fixed #13862 -- Added an ordering option to InlineModelAdmin and cleaned up documentation for it a bit. Thanks, Simon Meers, rasca and cogat.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:01 +00:00
Jannis Leidel 2c2209b473 Fixed #13607 -- Auto-initialize admin's date hierarchy links intelligently. Thanks, Simon Meers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:54:50 +00:00
Timo Graham 9af06cbb63 Fixed #14863 - Add contrib.messages and staticfiles to list of default INSTALLED_APPS in tutorial. thanks tgm for report and adamv for patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 15:04:25 +00:00
Timo Graham 82f2daaf45 Fixed #11470 - add documentation for ModelAdmin.message_user. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:51:14 +00:00
Timo Graham f0753ef211 Fixed #14875 - moved mention of `email_re` in 1.2 release notes from features deprecated to backwards incompatible changes. thanks galund for the report and elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:29:47 +00:00
Chris Beaven 2e909489d7 Add FormMixin.get_form_kwargs method to abstract some common logic in a tidier
way. Tidy up (and amend) documentation about FormMixin and ModelFormMixin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-10 03:51:30 +00:00
Chris Beaven ff8711a825 Fixes #14873 -- A paginated ListView with a List instead of queryset produces an error.
Additional minor change in functionality: the page is now not considered paginated if the objects do not span multiple pages according to the paginator. This will only affect views with a custom paginator method which uses orphans.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 02:34:14 +00:00
Russell Keith-Magee b37d867929 Fixed #14867 -- Corrected references to baking in the new TemplateResponse docs. Thanks to marcusf for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 00:47:37 +00:00
Ramiro Morales c58d25cf8d Fixed a couple of typos and small errors from r14696 and r14822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 00:26:59 +00:00
Gabriel Hurley 68a04f2d62 Fixed #14855 -- General cleanup of the new TemplateResponse docs (grammar, spelling, reST). Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 00:27:07 +00:00
Russell Keith-Magee 061a9cad67 Corrected typo in middleware docs. Thanks to matt_c for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07 14:59:57 +00:00
Russell Keith-Magee e0dcd7666a Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07 13:57:01 +00:00
Simon Meers 22fc30be5a Fixed #8975 -- documented related order methods -- thanks to Leo for the report and dwillis for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 23:08:44 +00:00
Gabriel Hurley 4a1fd44c0f Fixed #14846 -- Corrected a tiny typo in from [14832]. Thanks to elbarto for catching the mistake.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 23:07:46 +00:00
Russell Keith-Magee 29c4a578af Fixed #10863 -- Added HTML support to mail_managers() and mail_admins(), and used this to provide more and prettier detail in error emails. Thanks to boxed for the suggestion, and to Rob Hudson and Brodie Rao for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 14:21:51 +00:00
Gabriel Hurley b407de3bc5 Fixed #14840 -- Added crossrefs to related objects reference docs. Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 11:49:31 +00:00
Timo Graham 0f5a7e0775 Fixed #14746 - Add links to docs/ref/request-response.txt. Thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 01:55:16 +00:00
Simon Meers 06850baefa Fixed syntax error in ref/contrib/localflavor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 00:01:52 +00:00
Simon Meers ffa4badbd8 Fixed #14841 -- added xrefs to topics/db/models. Thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 23:52:23 +00:00
Timo Graham 4800b46746 Fixed #14745 - add links to topics/http/shortucts.txt. thanks adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 16:47:39 +00:00
Gabriel Hurley 2dd594dff4 Fixed #13162 and #11597 -- Improved the file handling documentation: Removed documentation of methods on django.core.files.File that did not exist, added documentation for undocumented methods and attributes that did exist, did a general cleanup of the text and organization, and added more metadata targets. Thanks to amenasse and tyrion.mx for the reports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 07:35:10 +00:00
Gabriel Hurley 0ab50aad36 Fixed #13605 -- Improved documentation of the django.core.files.storage module. Added documentation for DefaultStorage, get_storage_class, FileSystemStorage, and some missing public methods on Storage. New metadata targets included for everything. Thanks to kopernikus for the report and elbarto for contributing to the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 06:45:34 +00:00
Gabriel Hurley 01f2081bb6 Fixed #14835 -- Corrected a lack of indentation in the reST markup for docs/ref/contrib/admin/index.txt and reflowed the text accordingly. Thanks to cogat for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 04:52:31 +00:00
Russell Keith-Magee 4a1f2129d0 Fixed #12398 -- Added a TypedMultipleChoiceField. Thanks to Tai Lee.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 04:47:19 +00:00
Russell Keith-Magee ee48da2405 Fixed #14773 -- Modified MultipleObjectMixin to allow for custom paginators. Thanks to piquadrat for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 04:32:36 +00:00
Russell Keith-Magee 50e3b9d028 Added versionadded markup to the TEST_DEPENDENCIES setting.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 01:23:23 +00:00
Russell Keith-Magee d53fd71acb Corrected incomplete and incorrect docs from r14822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 01:03:39 +00:00
Russell Keith-Magee b11c21d69a Fixed #14799 -- Provided a full solution for test database creation order problems.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 00:44:34 +00:00
Timo Graham 111ed0195e Fixed #14120 - Document get() in Making Queries - thanks danielr and adamv for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 22:32:01 +00:00
Timo Graham 097072aee4 Fixed #12407 - Document 'call_command' - thanks UloPe for the suggestion and adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:58:07 +00:00
Timo Graham 00f36e0ebf Fixed #9033 - Add bullets to QuerySet extra() arguments. thanks julien for the suggestion and dwillis for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:41:35 +00:00
Timo Graham 76c2c30daf Fixed #14811 - Add clarifying note to render_to_response - thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:20:54 +00:00
Simon Meers 5a7af25c7a Fixed #12812 -- added warning about cyclic imports in contrib.comments. Thanks to Beetle_B, bjourne and philgyford for the reports, and Russ for the wording.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:35:22 +00:00
Russell Keith-Magee 324658ef26 Fixed #14803 -- Corrected an inconsistency in redirection handling between old-style generic views and class-based views. Thanks to gg for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:20:30 +00:00
Russell Keith-Magee ae7213b593 Fixed #14563 -- Added Turkish localflavor. Thanks to serkank for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 05:25:24 +00:00
Simon Meers 174f222b39 Fixed #14764 -- specified that a set is returned by User.get_..._permissions methods. Thanks MostAwesomeDude for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 00:50:49 +00:00
Ramiro Morales bb10a5ba79 Fixed grammar and tweaked notes about MySQL database/table collation interaction with text fields. Refs #14417.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 22:37:15 +00:00
Luke Plant 300a5b32e6 Updated example login template to be best-practice and use the url tag from 'future'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 14:27:03 +00:00