1
0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Commit Graph

591 Commits

Author SHA1 Message Date
Gabriel Hurley
66312066a0 Fixed #14861 -- Added an admonition about the potential for circular imports with custom logging handlers (which produces an extremely confusing error message) to the logging docs. Thanks to donspaulding for the report and adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 23:56:39 +00:00
Gabriel Hurley
327d69de73 Fixed #15134 -- Placed formset documentation before modelform documentation in the forms topic index to improve the logical flow of information being presented. Thanks to Aryeh Leib Taurog for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 23:39:29 +00:00
Gabriel Hurley
0f50ef12bf Fixed #15055 -- added information about (and an example of) the csrf_token template tag to the forms documentation. Thanks to sneakyness for the report and bpeschier for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 22:52:39 +00:00
Gabriel Hurley
1bac26b9a8 Fixed #15236 -- corrected a typo and added a versionadded directive for the user_logged_in and user_logged_out signals. Thanks to claudep for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 22:32:16 +00:00
Ramiro Morales
f6e38f3800 Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime.
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).

Translations are now read in the following order (from lower to higher priority):

For the 'django' gettext domain:

 * Django translations
 * INSTALLED_APPS apps translations (with the ones listed first having higher priority)
 * settings/project path translations (deprecated, see below)
 * LOCALE_PATHS translations (with the ones listed first having higher priority)

For the 'djangojs' gettext domain:

 * Python modules whose names are passed to the javascript_catalog view
 * LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)

Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.

Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis  Leidel and Claude for review and discussion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 18:48:40 +00:00
Timo Graham
0737307e8c Fixed #15222 - FileCache -> FileBasedCache typo; thanks Serp.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-06 17:28:01 +00:00
Timo Graham
a9ebf9ec24 Fixed #7325 -- Broken links for model documentation; thanks Justin Lilly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:39:54 +00:00
Jannis Leidel
8fe42053bc Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:25 +00:00
Russell Keith-Magee
14c082646d Fixed #15134 -- Removed a duplicate TOC entry for modelforms docs. Thanks to Aryeh Leib Taurog for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:33:27 +00:00
Timo Graham
a981f5b988 Fixed #15163 - typo in email docs; thanks metal for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 00:37:08 +00:00
Timo Graham
a757b5b8ca Fixed #15133 - Some markup issues in the docs; thanks Aryeh Leib Taurog for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 12:43:50 +00:00
Alex Gaynor
5fcce5e10f Fixed a typo in the docs, thanks to sunoano for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 20:16:38 +00:00
Carl Meyer
f399f8bd71 Corrected an outdated reference to cmemcache in contributing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-19 20:37:58 +00:00
Timo Graham
457aaca7fa Fixed #15109 - typo in middleware docs; thanks colinsullivan for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 23:25:38 +00:00
Russell Keith-Magee
b31a1b9926 Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:43:01 +00:00
Timo Graham
5fd93e1c36 Fixed #13628 - Discourage the use of doctests; thanks d0ugal for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 19:22:36 +00:00
Russell Keith-Magee
1ca9e95d4e Fixed #15062 -- Documented the fact that managers must be able to be shallow copied. Thanks to Ian Clelland for the report, and Łukasz Rekucki for the help diagnosing the problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 06:44:23 +00:00
Timo Graham
6c361ecb17 Fixed #15085 - Fix LOCATION for FileCache example. Thanks abdelazer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 18:52:59 +00:00
Chris Beaven
faa4a98f27 Change the lack of supports_inactive_user on an auth backend to a
!PendingDeprecationWarning (refs #14249), fixing some bad links in the
1.3 release docs and a typo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 08:31:14 +00:00
Jannis Leidel
a3894945b6 Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:41:43 +00:00
Timo Graham
d41bd3f7f2 Fixed #14994 - Add attributes to example auth backend which would emit DeprecationWarning otherwise. Thanks kmike for the report and ojii for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:46:28 +00:00
Timo Graham
07ef43082d Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:29:17 +00:00
Russell Keith-Magee
a00e8d4e42 Fixed #14878 -- Clarified the way verbose_name_plural is used in generic list views as a context variable. Thanks to diegueus9 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:15:58 +00:00
Luke Plant
5a36b43c27 Some small fixes to DB optimization docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 15:47:46 +00:00
Timo Graham
f2c4c63cdc Fixed #14997 - A typo in "Overriding delete". thanks phunehehe for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 13:09:20 +00:00
Timo Graham
ec38c88dfb Fixed #12193 - Add details to the i18n documentation for translation of model classes (relations and methods). Thanks Maxime Petazzoni and Ramiro for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:39:12 +00:00
Timo Graham
aa1b537b11 Fixed #13961 - note that reverse URL lookups can't be done within a blocktrans tag. Thanks garrison for the report and richardb and zerok for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 14:19:38 +00:00
Timo Graham
d3d345576d Fixed #14682 - Add a note with an example of the explicit template location for class based views. Thanks PaulM for the suggestion, adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 01:04:43 +00:00
Timo Graham
08cec1f508 Fixed #12313 - Add a note that QuerySet.delete() doesn't necessarily call obj.delete(). thanks FunkyELF for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:46:06 +00:00
Timo Graham
ee5fb7d18c Fixed #6181 - Document django.views.decorators.http - thanks adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:27:26 +00:00
Timo Graham
38d60c3941 Fixed #13949 - Note that readonly fields can't be modified via custom clean methods. thanks alk for the suggestion and elbarto and Gabriel Hurley whose language I used in the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 21:50:16 +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
00c554f89e Fixed #13020 - add clarifying note to SessionStore. thanks elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:46:15 +00:00
Russell Keith-Magee
0fef92f6f0 Fixed #14936 -- Tweaked the new render shortcut to reflect non-legacy arguments. Thanks to adamv for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 04:54:10 +00:00
Karen Tracey
6e75ee2b32 Added versionadded marker in doc for render function.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 04:12:32 +00:00
Karen Tracey
b1f6a4d66f Fixed #10154: Allow combining F expressions with timedelta values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 03:34:04 +00:00
Jannis Leidel
745c255a19 Fixed #14249 -- Added support for inactive users to the auth backend system. Thanks, Harro van der Klauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 19:18:12 +00:00
Russell Keith-Magee
b3d2091681 Fixed #12816 -- Added a render() shortcut.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 17:18:41 +00:00
Russell Keith-Magee
673e6fc7fb Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:19:19 +00:00
Jannis Leidel
b224b05304 Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 14:57:57 +00:00
Russell Keith-Magee
e299ac0cae Reverting r14994 (at request of SmileyChris) because of some backwards compatibility issues that need to be resolved.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 06:05:40 +00:00
Chris Beaven
b60d5df072 Fixes #13252 -- Use the natural key instead of the primary key when serializing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 04:40:08 +00:00
Alex Gaynor
6fc7d829dc Fixed #14923 -- corrected a typo in the logging documentation. Thanks to David Foerster for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 19:20:25 +00:00
Russell Keith-Magee
877963f541 Corrected a markup error introduced in r14986.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 15:01:12 +00:00
Russell Keith-Magee
7adffaeaf6 Fixed #14655 -- Made formsets iterable. This allows a slightly more natural iteration API (for form in formsets), and allows you to easily override the form rendering order. Thanks to Kent Hauser for the suggestion and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 13:41:43 +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
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
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
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