Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: django/django
...
head fork: ptone/django
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Feb 24, 2010
@jkocherhans jkocherhans [1.1.X.] Blocked a few more revisions via svnmerge.py.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4006402
@jbronn jbronn [1.1.X] Fixed #11353 -- `GeometryProxy` descriptor no longer chokes w…
…hen accessed from a class rather than an instance, thanks yml and Tobu; removed unnecessary imports from `types` and cleaned up whitespace.

Backport of r12584 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
49194df
@jbronn jbronn [1.1.X] Fixed #12828 -- The table quoting function is now argument `g…
…et_geo_where_clause`.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
231eb1d
Commits on Feb 25, 2010
@jezdez jezdez [1.1.X] Fixed #12910 - Only test extracting translation strings if xg…
…ettext can be found on PATH.

Backport from r12475.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b711400
@jezdez jezdez [1.1.X] Added note to the contributing docs about requiring gettext t…
…o run the makemessages tests.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1a377a8
@kmtracey kmtracey [1.1.X] Updated svnmerge metadata to reflect changesets that have bee…
…n and should not be merged.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f18cf31
@kmtracey kmtracey [1.1.X] Added a few more blocked changesets I missed earlier.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5ac214b
@kmtracey kmtracey [1.1.X] Removed a couple of changesets from the blocked list that sho…
…uldn't have been blocked.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6c031fb
Commits on Feb 26, 2010
@kmtracey kmtracey [1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept …
…into the 1.1.X branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6ca3154
@freakboy3742 freakboy3742 [1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m re…
…lations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch.

Backport of r12489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a52f1dd
@freakboy3742 freakboy3742 [1.1.X] Fixed #6191, #11296 -- Modified the admin deletion confirmati…
…on page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.

Backport of r12598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3bda1f5
@kmtracey kmtracey [1.1.X] Python 2.3 compatibility: moved the fallback import for set t…
…o where set() is now used.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0c2d3ff
@freakboy3742 freakboy3742 [1.1.X] Fixed #1480 -- Added the ability to use the system timezone. …
…Thanks to Ramiro Morales for the patch.

Backport of r12602 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b6bd766
@freakboy3742 freakboy3742 Corrected a versionchanged marker added in r12603.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9405460
@freakboy3742 freakboy3742 [1.1.X] Corrected an edge case introduced in r12602. Thanks to Ramiro…
… Morales for the eagle eyes.

Backport of r12605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
121188e
@kmtracey kmtracey [1.1.X] Added force_unicode to a test (needed for Python 2.3 compatib…
…ility).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
14fbee6
@jbronn jbronn [1.1.X] Fixed #12585 -- Corrected typo in tutorial03. Thanks, fcsmith.
Backport of r12484 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b698d77
@jezdez jezdez [1.1.X] Fixed #11384 - Make sure translations in the project director…
…y really override translations in apps as specified in the docs.

Backport of r12447.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
079d9f3
@jezdez jezdez [1.1.X] Fixed #5971 - Fixed inconsistent behaviour of the TokenParser…
… when parsing filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales.

Backport of r12471.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7c23a53
@jbronn jbronn [1.1.X] Fixed #12608 -- No longer return inconsistent results when us…
…ing values and values_list in conjunction with annotate. Thanks, Charlie Leifer.

Backport of r12505 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
499c715
Commits on Feb 27, 2010
@kmtracey kmtracey [1.1.X] Fixed #12981 -- Removed some stray tabs. Thanks to loewis for…
… the report.

Backport of the applicable part of r12614 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
aa8a985
@kmtracey kmtracey [1.1.X] Removed more stray tabs in Python files.
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e0679ef
Commits on Feb 28, 2010
@kmtracey kmtracey [1.1.X] Fixed #12302: Modified force_unicode to avoid raising unicode…
… errors when

handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.

r12621 and r12622 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1b2b3b0
Commits on Mar 01, 2010
@jezdez jezdez [1.1.X] Fixed #12966 - Force unicode of verbose labels in admin chang…
…e messages.

Backport of r12627.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4871b65
@jezdez jezdez [1.1.X] Fixed #12987 - Added a few versionadded directives to the doc…
…s. Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f09eabf
@kmtracey kmtracey [1.1.X] Fixed #11791: Put hidden input elements in the change list in…
…side td elements so they're valid HTML. Thanks panni and mlavin.

r12631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5f3a530
@jacobian jacobian [1.1.X] Fixed #11457: tightened the security check for "next" redirec…
…ts after logins.

The new behavior still disallows redirects to off-site URLs, but now allows
redirects of the form `/some/other/view?foo=http://...`.

Thanks to brutasse.

Backport of [12635] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6b94c64
@jacobian jacobian [1.1.X] Fixed #11012: don't needless convert cache values to unicode.
This means you can now successfully store binary blogs, such as compressed data,
in the cache.

Thanks to Matt Croydon for the final patch.

Backport of [12637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7e1c670
@jacobian jacobian [1.1.X] Fixed #10878, an error in the `Moderator` docstring.
Thanks, Travis Cline.

Backport of [12639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ac72c8d
@jacobian jacobian [1.1.X] Fixed #5605: only lowercase the domain portion of an email ad…
…dress in `UserManager.create_user`.

Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
34a3b7b
@jacobian jacobian [1.1.X] Fixed #1104: set `FormWizard.extra_context` in `__init__` to …
…avoid context leakage.

Backport of [12644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
60f4b7c
Commits on Mar 02, 2010
@jacobian jacobian [1.1.X] Fixed a silly bug in [12644].
Backport of [12646].

Of course, this sort of thing *does* do wonders for my commit count.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5f70a72
@kmtracey kmtracey [1.1.X] Fixed #11465: Ensure nonexistent pks enterd in an admin raw i…
…d field do not

cause a server error. Thanks for report and initial patch sacre@wp.pl. 

Backport of r12648 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
08a698e
@kmtracey kmtracey [1.1.X] Fixed #11710: Made a small test change to ensure utf-8 bytest…
…rings in verbose_names don't cause a server error when the admin change log message is built. The necessary code fix was made for #12966 in r12627. Thanks Rupe.

r12650 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
69fb5c2
@kmtracey kmtracey [1.1.X] Fixed #12946: Removed an invalid example of url tag usage fro…
…m the docs.

r12652 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a622539
@freakboy3742 freakboy3742 [1.1.X] Fixed #6510 -- Refactored the way child nodes are found in te…
…mplate nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch.

Backport of r12654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
755a0f6
@jezdez jezdez [1.1.X] Fixed Bosnian language code introduced in r12330.
Backport from r12657.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cea0374
@kmtracey kmtracey [1.1.X] Fixed #11522: Restored ability of http redirect responses to …
…correctly handle redirect locations with non-ASCII chars.

r12659 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b50b3cf
@kmtracey kmtracey [1.1.X] Fixed #12898: Reverted a change that assumed the file system …
…encoding was utf8, and changed a test to demonstrate how that assumption corrupted uploaded non-ASCII file names on systems that don't use utf8 as their file system encoding (Windows for one, specifically). Thanks for the report to vrehak.

r12661 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c6e662c
Commits on Mar 03, 2010
@ubernostrum ubernostrum [1.1.X] Fixed #12879: Declaring the same JS file multiple times in a …
…single Media instance now only includes that file once. Backport of [12663] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1d12aa2
@ubernostrum ubernostrum [1.1.X] Expanded the fix in [12663] to cover CSS declarations, which …
…were also affected by the bug. Refs #12879. Backport of [12665] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
faa341e
@ubernostrum ubernostrum [1.1.X] Fixed #11883: Documented how to set a custom template name on…
… a flatpage. Backport of [12667] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
bca50d2
@ubernostrum ubernostrum [1.1.X] Fixed #11889: Documented the fact that context processors wil…
…l overwrite pre-existing context variables of the same names. Backport of [12669] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7adae30
@ubernostrum ubernostrum [1.1.X] Fixed #12217: Documented the fact that serving flatpages from…
… the flatpage middleware does not apply view middleware methods. Backport of [12671] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
36e7739
@ubernostrum ubernostrum [1.1.X] Fixed #12601: Documented the slug field in the forms module. …
…Backport of [12673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1332b11
@kmtracey kmtracey [1.1.X] Fixed the files test to not care whether the names are report…
…ed as bytestrings or unicode. Refs #12898.

r12676 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cc65ac9
Commits on Mar 04, 2010
@kmtracey kmtracey [1.1.X] Made Python 2.3 compatibility fixes for some recent test addi…
…tions.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1fedc0b
Commits on Mar 05, 2010
@kmtracey kmtracey [1.1.X] Fixed #12083: Ensured generating debug 404 page won't raise a…
… key error. Thanks pigletto.

r12679 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b5a2f64
@kmtracey kmtracey [1.1.X] Fixed #12151: Ensured the comments code does not cause a serv…
…er error when a request comes in for a comment specifying an invalid primary key value. Thanks thejaswi_puthraya.

r12681 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
215615a
Commits on Mar 06, 2010
@ubernostrum ubernostrum [1.1.X] Fixed #11680: Added a note in the error-reporting documentati…
…on about basic e-mail configuration. Backport of [12686] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b3c2ae9
@kmtracey kmtracey [1.1.X] Fixed #6918, #12791: If an email message has an encoding, act…
…ually use that encoding to encode body and headers. Thanks for patch with tests oyvind.

Backport of r12683 and r12688 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
daec734
@jkocherhans jkocherhans [1.1.X] Fixed #12734. Deferred fields will now be properly converted …
…to python when accessed. Backport of r12579 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
55bcc8a
Commits on Mar 07, 2010
@ubernostrum ubernostrum [1.1.X] Fixed #13048: Corrected typo in email documentation. Backport…
… of [12694] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8a8366d
@jkocherhans jkocherhans [1.1.X] Fixed #12913. Fields with choices now respect show_hidden_ini…
…tial as a keyword argument to formfield. Backport of r12696 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e8c7689
@jkocherhans jkocherhans [1.1.X] Fixed #12858. DateTime related widgets now handle custom form…
…ats properly in _has_changed. Backport of r12698 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
72a659f
@freakboy3742 freakboy3742 [1.1.X] Fixed #12876 -- Corrected a problem with recursive relations …
…under deepcopy. Thanks to elachuni for the patch.

Backport of r12700 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
24b969d
@kmtracey kmtracey [1.1.X] snvmerge metadata housekeeping.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
90e1266
@kmtracey kmtracey [1.1.X] Fixed #6228: Changed common middleware to respect request-spe…
…cific urlconf. Thanks trey, skevy, and mikexstudios.

r12704 and r12705 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b86b38f
Commits on Mar 08, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12811 -- Modified Tutorial 2 to indicate that the temp…
…lating language will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text.

Backport of r12710 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ec6f705
@freakboy3742 freakboy3742 [1.1.X] Fixed #12114 -- Clarified the existence of the reverse relati…
…on _set in the tutorial. Thanks to panfist for the suggestion, and dwillis for the patch.

Backport of r12711 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fdbf6c8
@freakboy3742 freakboy3742 [1.1.X] Fixed #12097 -- Cleaned up the documentation for ModelChoiceF…
…ield and MultipleModelChoiceField. Thanks to JasonYosinski for the patch.

Backport of r12712 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1adc88f
@kmtracey kmtracey [1.1.X] Made a few Python 2.3 compatibility test fixes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9b2ac2a
@spookylukey spookylukey [1.1.X] Fixed #12240 - select_related doesn't work correctly when mix…
…ing nullable and non-nullable keys

  
Thanks to embe for report and Alex for fix.

Backport of 12719 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6c507a5
@spookylukey spookylukey [1.1.X] Fixed #11940 - ModelForm evaluates callable default values on…
… form class creation

  
Thanks to Harm Geerts for the report and initial patch.

Backport of [12721] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
55c71d3
@kmtracey kmtracey [1.1.X] Move the tests added for #12302 to where some other tests for…
… debug page responses already existed.

r12723 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9bdfe17
@kmtracey kmtracey [1.1.X] Fixed #11461: Ensured complete traceback is available on the …
…debug page when an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn.

r12725 and r12726 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
758123a
@kmtracey kmtracey [1.1.X] Fixed #12024: Changed admin code to avoid raising an exceptio…
…n when a field listed

in raw_id_fields has limit_choices_to specified as a Q object.

Tweaked a test to trigger the condition and verify the fix.

Finally, documented that limit_choices_to specified as a Q object has no effect
on the choices available for fields listed in raw_id_fields, and removed another
incorrect note that claimed limit_choices_to had no effect on inlines in the admin. 

r12728 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
75b10c9
@kmtracey kmtracey [1.1.X] Updated svnmerge metadata to reflect changesets that have bee…
…n and should not be merged.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0cac2cb
Commits on Mar 09, 2010
@kmtracey kmtracey [1.1.X] Fixed #12689: Fixed admin validation to report an error on in…
…valid exclude specification. Thanks for report to bparker and for patch with tests to ramiro.

r12734 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f13b17a
@spookylukey spookylukey [1.1.X] Fixed #11183 - BaseForm init leaves pointers pointing back to…
… base_fields

  
Thanks to margieroginski for the report

Backport of [12733] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
89c2639
@kmtracey kmtracey [1.1.X] Changed last_executed_query to avoid raising exceptions on no…
…n-utf8-encoded parameter data.

r12737 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0a7ec91
@spookylukey spookylukey [1.1.X] Fixed #12048 - MultiWidget does not define `__deepcopy__`
  
Thanks to powderflask for report, test case and initial patch.

Backport of [12739] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
693dcd9
Commits on Mar 11, 2010
@ubernostrum ubernostrum [1.1.X] Fixed #13084: Corrected typo in error-reporting docs. Backpor…
…t of [12757] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
47bdb67
@ubernostrum ubernostrum [1.1.X] Corrected a markup error in middleware docs. Backport of appl…
…icable bits of [12759] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0b78ce8
@kmtracey kmtracey [1.1.X] Python 2.3 doesn't do decorators.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
705d6cc
Commits on Mar 12, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13093 -- Updated some decorators and the decorator_fro…
…m_middleware function to allow callable classes to be decorated. Thanks to Brian Neal for the report.

Backport of r12762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9137c54
@freakboy3742 freakboy3742 [1.1.X] Fixed #11900 -- Corrected an edge case of transaction handlin…
…g in the commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.

Backport of r12764 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1e1b57b
@freakboy3742 freakboy3742 [1.1.X] Fixed #11891 -- Ensured that attributes of get_absolute_url a…
…re preserved through the metaclass. Thanks to nfg for the report and patch.

Backport of r12766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d1b889e
@freakboy3742 freakboy3742 [1.1.X] Fixed #12404 -- Improved model validation for CharField and D…
…ecimalField. Thanks to tiliv for the report, josh for the patch, and Leo for the tests.

Backport of r12768 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3f7fcdd
@freakboy3742 freakboy3742 [1.1.X] Fixed #11801 -- Corrected form validation to ensure you can s…
…till get deleted_forms and ordered_forms when a form that is being deleted doesn't validate. Thanks to dantallis for the report and patch.

Backport of r12771 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e969c27
Commits on Mar 13, 2010
@kmtracey kmtracey [1.1.X] Fixed #13107: Adjusted decimal_places validation to accept 0 …
…as a valid value. Thanks to loewis for report.

r12774 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c94de07
Commits on Mar 14, 2010
@kmtracey kmtracey [1.1.X] Revert r12763 until we figure out what's wrong with it on 1.1…
….X. Refs #13111.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7d3846a
@kmtracey kmtracey [1.1.X] Made a Python 2.3 compatibility test fix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ef92f4f
Commits on Mar 15, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13108 -- Corrected an ambiguity in test data with the …
…potential to cause test failures out of the box. Thanks to benreynwar for the report.

Backport of r12778 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d3ee556
@freakboy3742 freakboy3742 [1.1.X] Fixed #13114 -- Modified escapejs to produce output that is J…
…SON compliant. Thanks to David Danier for the report.

Backport of r12780 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c64669a
@freakboy3742 freakboy3742 [1.1.X] Fixed #12339 -- Made content type deletion an interactive pro…
…cess to prevent accidentally cascade deleting content from a production database. Thanks to kcarnold for the report and patch.

Backport of r12782 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
322a50a
@freakboy3742 freakboy3742 [1.1.X] Added a transaction rollback needed to clean up after the tes…
…t introduced by r12764.

Backport of r12788 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9b85ef2
Commits on Mar 16, 2010
@kmtracey kmtracey [1.1.X] Fixed #12105: Corrected handling of isnull=False lookups in a…
…dmin. Thanks marcob, Travis Cline, gabrielhurley.

r12795 backport from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e15c850
@gdub gdub [1.1.X] Fixed #10361 -- Added documentation for ComboField and MultiV…
…alueField form fields, patch from timo.

Backport of r12798 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
58d72d4
@kmtracey kmtracey [1.1.X] Changed the comments post view code to avoid raising an excep…
…tion if handed invalid data for the object pk. Thanks to Leo for the test.

r12800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1685085
Commits on Mar 19, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13152 -- Ensure the test client saves the session befo…
…re writing the session key to the cookie, in case the session engine changes the session key.

Backport of r12806 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9d5fb83
Commits on Mar 20, 2010
@jbronn jbronn [1.1.X] Fixed `fieldlookup` docs cross-reference directive, and added…
… it to the queryset reference. Refs #12930.

Backport of r12808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6943950
@freakboy3742 freakboy3742 [1.1.X] Fixed #12850 -- Ensured that constraint names are quoted when…
… they are removed. Thanks to Tim Kersten for the report and patch.

Backport of r12811 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3213498
@kmtracey kmtracey [1.1.X] Fixed #12707. Admin action messages are no longer displayed w…
…hen submitting list_editable content. Thanks, copelco.

and 

Fixed #12962: Made admin delete action work again. Thanks ptone, skevy, mlavin and anyone else I've missed. 

r12525 and r12813 from trunk, together to avoid the regression introduced by r12525 alone.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
eb1c7b0
@freakboy3742 freakboy3742 [1.1.X] Fixed #12851 -- Corrected the interaction of defer() with sel…
…ect_related(). Thanks to ruosteinen for the report.

Backport of r12817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4d00ac8
@kmtracey kmtracey [1.1.X] Fixed #12239: Fixed results of gte and lt queries when compar…
…ing floats to integer field values.

Thanks waverider, aroy, SmileyChris, and pmclanahan. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8badb75
@kmtracey kmtracey [1.1.X] Fixed #12239, again: Refined the original fix to avoid the te…
…st errors introduced. Thanks pmclanahan.

r12821 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d5336b2
@kmtracey kmtracey [1.1.X] Fixed #12554: Silence exceptions that have specified silent_v…
…ariable_failure=True. Thanks Thomas Steinacher, copelco, mlavin.

r12823 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
df010f0
Commits on Mar 21, 2010
@kmtracey kmtracey [1.1.X] Fixed #12286: Ensure proxied model's table is created.
Thanks to telenieko for the report and flyingfred0 for test and fix.

Test is r12828 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3a55a2f
@kmtracey kmtracey [1.1.X] Fixed #12822: Don't copy the _aggregate_select_cache when clo…
…ning a query set,

as that can lead to incorrect SQL being generated for the query. Thanks to mat
for the report and test, tobias for the fix, and Alex for review. 

r12830 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
740c974
Commits on Mar 22, 2010
@kmtracey kmtracey [1.1.X] Fixed #12764: Avoid exceeding psycopg1 limits in the views te…
…sts.

r12832 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c226760
@kmtracey kmtracey [1.1.X] Fixed #12554 again: Corrected regression in silencing attribu…
…te lookups introduced in r12824, plus added a test for this so it doesn't regress again.

r12834 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ef41bd4
Commits on Mar 23, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12612 -- Corrected handling of parameter formatting in…
… SQLite backend so that executemany raises exceptions when bad parameter counts are provided. Thanks to Niels <niels@pythonheads.nl> for the report, and Gabriel Hurley for the help narrowing down the problem.

Backport of r12836 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7528565
@freakboy3742 freakboy3742 [1.1.X] Fixed #13171 -- Corrected the field_subclassing unit test. Th…
…anks to Gabriel Hurley for the report and patch.

Backport of r12838 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6e60c8b
@freakboy3742 freakboy3742 [1.1.X] Fixed #13177 -- Corrected usage of firstof in admin templates…
…. Thanks to nomulous for the report and patch.

Backport of r12840 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
21a1a21
@kmtracey kmtracey [1.1.X] Fixed #13173: Made the admin_scripts tests pass when the runn…
…ing python executable has a space in its pathname. Thanks gabrielhurley.

r12842 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f0ed1ce
Commits on Mar 25, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12286 -- Modified the test case added in r12828 so tha…
…t it passes under Postgres.

Backport of r12846 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b74e6c3
@freakboy3742 freakboy3742 [1.1.X] Fixed #12766 -- Only set the psycopg1 client encoding when th…
…e connection is first created. This allows the custom_pk test to pass under psycopg1.

Backport of r12848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
93b5edd
@freakboy3742 freakboy3742 [1.1.X] Modified the delete test to clean up after itself properly, s…
…o that the proxy_model_inheritance test can run without requiring manual confirmation.

Backport of r12850 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
373daf5
@jbronn jbronn [1.1.X] Peform smarter version detection of GDAL so development versi…
…ons are supported.

Backport of r12852 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
917fb7c
Commits on Mar 26, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised…
… when the urlconf_module is None. Thanks to buriy for the report and patch.

Backport of r12854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7733895
@gdub gdub [1.1.X] Removed out-of-date statement in markdown templatetags docstr…
…ing (refs #1204).

Backport of r12858 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
52e2e5c
Commits on Mar 27, 2010
@gdub gdub [1.1.X] Fixed #13202 -- Documented required libraries for markup temp…
…late tags, based on patch from steveed.

Backport of r12860 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
87e40f8
@gdub gdub [1.1.X] Fixed #13189 -- Fixed typo in code example, thanks to gabriel…
…hurley for patch.

Backport of r12862 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5fab617
@jezdez jezdez [1.1.X] Fixed #12778 - Added media handling abilities to admin inline…
…s. Thanks for the patch, pmclanahan.

Backport from trunk, r12825.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5a6446b
@gdub gdub [1.1.X] Fixed #13103 -- A bit of re-organization to the custom templa…
…te `ModelAdmin` options documentation section to remove some duplication and fix some confusing wording.

Backport of r12868 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
434b5d5
Commits on Mar 29, 2010
@jbronn jbronn [1.1.X] Fixed a brittle test case that was failing on PostGIS version…
…s < 1.4.

Backport of r11729 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
127d46e
@jbronn jbronn [1.1.X] `OGRGeomType` now recognizes 2.5D types, and removes need for…
… unnecessary workaround in `Layer.geom_type`; corrected geometry type in test VRT file. Refs #11433.

Backport of r11739 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e53de43
@jbronn jbronn [1.1.X] Fixed #12312 -- Set the coordinate dimension on each componen…
…t of geometry collections after transform (refines GDAL bug workaround introduced in r11629). Thanks, yourcelf for bug report.

Backport of r12878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ceb5261
@jbronn jbronn [1.1.X] Fixed #11785 -- Clarified error message when the layer geomet…
…ry type doesn't match the model field. Thanks, esizikov for bug report and initial patch.

Backport of r12880 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
08d0094
@jbronn jbronn [1.1.X] Added another GDAL bug workaround for retrieving the correct …
…coordinate dimension on geometry collections. Refs #12312.

Backport of r12883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8ef5dae
@jbronn jbronn [1.1.X] Fixed #10594 -- `GeoQuerySet` measurment methods no longer cr…
…ash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch.

Backport of r12885 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2613872
Commits on Mar 31, 2010
@brosner brosner [1.1.X] Restored pre-r10062 behavior allowing None from formfield_cal…
…lback to exclude itself from the form

Backported from r12891 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
64e4ffc
@freakboy3742 freakboy3742 [1.1.X] Fixed #13253 -- Updated the help message for dumpdata to indi…
…cate that individual models can be serialized. Thanks to arowla for the report.

Backport of r12893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f0fa080
@freakboy3742 freakboy3742 [1.1.X] Fixed #11916 -- Corrected handling of aggregation when there …
…is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix.

Backport of r12896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7a7b9a0
@jbronn jbronn [1.1.X] No longer use the deprecated GEOS C API function `GEOSGeomFro…
…mWKB_buf` when unpickling `GEOSGeometry` objects.

Backport of r12898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fa11430
Commits on Apr 01, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't…
… corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix.

Backport of r12901 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3305245
@jbronn jbronn [1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception w…
…hen compared to instances of different types. Thanks, ninowalker for the bug report.

Backport of r12905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
adfeb96
Commits on Apr 02, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #11956 -- Modified the handling of m2m relationships be…
…tween subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem.

Backport of r12908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ac0aea8
Commits on Apr 03, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12247 -- Corrected the way update queries are processe…
…d when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.

Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
17636ef
Commits on Apr 04, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ord…
…ering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report.

This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

Backport of r12912 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0d6a776
Commits on Apr 05, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customizatio…
…n of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.

Backport of r12916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c01735d
@freakboy3742 freakboy3742 [1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on …
…a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.

Backport of r12918 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
985c764
@freakboy3742 freakboy3742 [1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist…
… has admin actions and is filtered. Thanks to mksoft for the report and patch.

Backport of r12920 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
dce7515
@freakboy3742 freakboy3742 [1.1.X] Added file mistakenly ommitted from r12917
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2e8f0a8
@jbronn jbronn [1.1.X] Fixed #13271 -- Corrected a typo in the signals documentation…
…. Thanks, chtito.

Backport of r12924 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b262752
@jbronn jbronn [1.1.X] Fixed #13263 -- Corrected field name typo in queries document…
…ation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch.

Backport of r12926 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cd3370c
Commits on Apr 06, 2010
@spookylukey spookylukey [1.1.X] Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt
  
Thanks piquadrat for report and patch.

Backport of r12928 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c3bc648
@spookylukey spookylukey [1.1.X] Fixed #13035 - Incorrect documentation regarding admin and de…
…fault managers

  
Thanks to rasca for report and gabrielhurley for patch.

Backport of r12930 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c65dd48
@spookylukey spookylukey Fixed test failure that was occurring since r12909
  
The tests were relying on being able to do
ManyToManyField("NameOfThisModel") instead of the only documented method for
recursive relationships, namely ManyToManyField("self").  The former stopped
working when the fix in r12909 was applied.

Backport of r12932 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0819c29
@spookylukey spookylukey [1.1.X] Fixed #13270 - typos in documentation
  
Thanks to cmbeelby for the report and patch

Backport of r12934 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b2ecfe8
Commits on Apr 11, 2010
@jbronn jbronn [1.1.X] Fixed #9437 -- Now close the connection after getting the Pos…
…tGIS version during spatial backend initialization.

Backport of r12948 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
bf5d71f
Commits on Apr 12, 2010
@kmtracey kmtracey [1.1.X] Fixed #11696: Changed app loading code so that it does not sw…
…allow import errors that used to be (prior to r10088) raised.

r12950 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
46b9dd3
@kmtracey kmtracey [1.1.X] Fixed two small doc markup errors.
Partial merge of r12741 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6dc0499
@kmtracey kmtracey [1.1.X] Fixed #11711 -- clarified that ValuesQuerySets are not lists …
…per se.

It rarely hurts to think of the returned result from a values() or
values_list() call as a list, but it's really an iterable and sometimes
the difference matters. 

r12743 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a67b35a
@freakboy3742 freakboy3742 [1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it sh…
…ould delete(). Thanks to craig.kimerer@gmail.com for the report

Backport of r12941 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
38056e8
@brosner brosner Fixed #11957 -- exceptions in admin.py are no longer hidden after sec…
…ond request

Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

Backport of r12956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f45e39b
@kmtracey kmtracey [1.1.X] svnmerge.py metatdata housekeeping.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4771790
@kmtracey kmtracey [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all …
…rows in the database

r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
eca89ea
@kmtracey kmtracey [1.1.X] Added Pyton 2.3 compatibility import for use of set by some n…
…ew tests.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ee2b07c
Commits on Apr 13, 2010
@freakboy3742 freakboy3742 [1.1.X] Refs #13227 -- Partial backport of r12865; backported the cha…
…nges to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cf08ea4
@freakboy3742 freakboy3742 [1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client…
… to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch.

Backport of r12964 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
65a9d73
Commits on Apr 14, 2010
@kmtracey kmtracey [1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle impo…
…rt errors resulting from nested calls to load_app.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ef6308d
@kmtracey kmtracey [1.1.X] Fixed Python 2.4 incompatibility introduced in r12973.
r12947 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a33c767
Commits on Apr 15, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13184 -- Document the requirement that custom model fi…
…elds using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution.

Backport of r12979 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a56b232
@kmtracey kmtracey [1.1.X] Fixed #13348: Restored ability to load models from apps in eg…
…gs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule.

r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ce8367f
@kmtracey kmtracey [1.1.X] Fixed #13353: Corrected a couple of tests that were dependent…
… on dictionary ordering. Thanks Alex.

r12984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8092d3b
@kmtracey kmtracey [1.1.X] Fixed #13345: Don't attempt to load the locale regressiontest…
…s subdirectory as a Django app. Thanks ramiro.

r12971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
231e452
@kmtracey kmtracey [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules fro…
…m apps in eggs. Thanks clint and metzen.

r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
534dc44
Commits on Apr 16, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyP…
…y. Thanks to Alex Gaynor for the patch.

Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e7ef1b2
@kmtracey kmtracey [1.1.X] Fixed #13360: For Python2.3 compatbility, don't pass iterator…
…s to sorted.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f6b6e0f
@jbronn jbronn [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifia…
…ble` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504.

Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
be167b8
Commits on Apr 19, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing prob…
…lems for PyPy. Thanks to Alex Gaynor for the report and patch.

Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f282099
Commits on Apr 20, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13382 -- Modified a message used for testing purposes …
…to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch.

Backport of r13003 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4807b02
@freakboy3742 freakboy3742 [1.1.X] Fixed #13387 -- Removed some duplicated departments in the Fr…
…ench localflavor. Thanks to Pinaraf for the report.

Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2f6317f
@kmtracey kmtracey [1.1.X] Adjust the fr.py localflavor tests to account for r13007.
Merge of applicable part of r13008.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1982c8b
Commits on Apr 21, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13389 -- Ensured that the app_loading test clears out …
…the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints.

Backport of r13011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0e99698
@freakboy3742 freakboy3742 [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avo…
…id a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix.

Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
af48cad
Commits on Apr 22, 2010
@kmtracey kmtracey [1.1.X] Python 2.3 compatibility: we still need the special sets impo…
…rt here.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c8576fa
Commits on Apr 23, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call …
…calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch.

Backport of r13019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
58c1a67
Commits on Apr 24, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13362 -- Disabled the test for bug #8245 under Python …
…2.3 due to differences in exception handling.

Backport of r13021 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5226525
Commits on Apr 25, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it t…
…o work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help.

Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a43464d
Commits on Apr 27, 2010
@kmtracey kmtracey Python 2.3 compatibility: replaced rsplit with something that works o…
…n 2.3.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
33f097e
@kmtracey kmtracey Python 2.3 compatibility: Fixed a test to only run under 2.4+, since …
…it fails due to a Ptyhon problem under 2.3.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5f1ecdc
Commits on Apr 28, 2010
@ikelly ikelly [1.1.X] Fixed a bug preventing cursor variables from being passed as …
…bind parameters in the oracle backend. Backport of r13042 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6f4563a
Commits on Apr 30, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12851 -- Corrected the loading of values when select_r…
…elated() is used on inherited models. Thanks to phxx for the report and test case.

Backport of r13054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2eb832a
@freakboy3742 freakboy3742 [1.1.X] Fixed #13431 -- Corrected a unicode literal in select widgets…
…. Thanks to gutworth for the report.

Backport of r13036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
868acb3
@freakboy3742 freakboy3742 [1.1.X] Fixed #12851 -- Another attempt at fixing select_related() wi…
…th inherited models, this time with only(). Thanks to phxx for the test case.

Backport of r13059 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fe3b75e
Commits on May 01, 2010
@kmtracey kmtracey [1.1.X] Fixed #13453: Corrected typo in template syntax error message…
…. Thanks jheasly.

r13061 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ef0e10c
Commits on May 02, 2010
@jezdez jezdez [1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScri…
…pt i18n admin view.

Backport of r13069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
99a5123
Commits on May 03, 2010
Nicola Larosa [1.1.X] Italian translation updated by makemessages, to be fixed
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9c14f23
Nicola Larosa [1.1.X] Updated the Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0265a81
@kmtracey kmtracey [1.1.X] Fixed #12688 -- Removed typo in manager docs. Thanks, orokusa…
…ki for the report and timo for the patch.

r12485 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
820bcd0
@kmtracey kmtracey [1.1.X] Fixed #13099 - incorrect SQL for exclude() example
Thanks to istruble for the report. 

r12936 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5c5c25e
@kmtracey kmtracey [1.1.X] Updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a263d3b
Commits on May 04, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the re…
…quirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach.

Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
bc97087
@freakboy3742 freakboy3742 [1.1.X] Fixed #13467 -- Corrected Japanese translation for password r…
…eset emails. Thanks to cdeyoung for the report.

Backport of r13084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c7fc889
@kmtracey kmtracey [1.1.X] Fixed some Python 2.3 incompatibilities in new tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e28c0ed
@freakboy3742 freakboy3742 [1.1.X] Fixed #13469 -- Cleaned up the test case from r13085, and add…
…ed some cache cleanup that matters for Python 2.3. Thanks to Karen and Alex for their help.

Backport of r13095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
125ea94
Commits on May 06, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13420 -- Clarified grammar in the email docs. Thanks t…
…o Dominic Rodger for the report.

Backport of r13104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1d7c4a9
@freakboy3742 freakboy3742 [1.1.X] Fixed #12609 -- Updated FAQ on which version users should ins…
…tall. Thanks to shanx for the report.

Backport of r13109 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
760ed99
@freakboy3742 freakboy3742 [1.1.X] Fixed #8357 -- Clarified what constitutes activity when calcu…
…lating session expiry. Thanks to timo for the patch.

Backport of r13113 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d034374
Commits on May 07, 2010
@spookylukey spookylukey [1.1.X] Fixed typo and small formatting mistake in docs
Backport of [13118] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
027ba07
Commits on May 08, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13471 -- Added example of send_mass_mail usage. Thanks…
… to gtaylor for the report and patch.

Backport of r13127 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e6167e5
@freakboy3742 freakboy3742 [1.1.X] Fixed #13336 -- Corrected an incorrect example of cache heade…
…r usage. Thanks to dnjuls for the report, and claudep for the patch.

Backport of r13129 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
176f1c1
@freakboy3742 freakboy3742 [1.1.X] Fixed #13484 -- Added some newly available targets to the doc…
…umentation makefile. Thanks to Alex for the patch.

Backport of r13126 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e8e87e0
@spookylukey spookylukey [1.1.X] Added hyperlinks for builtin template tags and filters to cod…
…e samples in docs.

  
Implemented in javascript because doing it 'properly' is pretty much impossible with Sphinx and Pygments.
  
Refs #12249

Backport of [13135] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d5ed030
Commits on May 09, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13499 -- Corrected typo in l10n docs. Thanks to selwin…
… for the report and patch.

Backport of r13143 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
947c8ce
@freakboy3742 freakboy3742 [1.1.X] Fixed #13497 -- Corrected various typos and markup problems i…
…n docs. Thanks to Ramiro Morales for the report and patch.

Backport of r13144 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0711e10
@freakboy3742 freakboy3742 [1.1.X] Fixed #13455 -- Clarified the interaction of values() and ext…
…ra(). Thanks to Rupe for the report and draft text.

Backport of r13145 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a142133
@freakboy3742 freakboy3742 [1.1.X] Fixed #13417 -- Clarified the use of the djangojs domain for …
…translation. Thanks to stephaner for the report and initial patch, and Ramiro Morales for his additional markup.

Backport of r13147 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e3389f9
@freakboy3742 freakboy3742 [1.1.X] Fixed #13310 -- Documented the RESTRUCTUREDTEXT_FORMAT_SETTIN…
…GS setting. Thanks to Wraithan for the patch.

Backport of r13154 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
95693cc
@freakboy3742 freakboy3742 [1.1.X] Fixed #13282 -- Clarified documentation around week_day filte…
…ring in querysets. Thanks to wangchun, Ramiro Morales and timo.

Backport of r13155 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d529963
@freakboy3742 freakboy3742 [1.1.X] Fixed #13051 -- Corrected the documentation of URL namespacin…
…g to match the tested implementation behavior. Thanks to apollo13 for the report, and Gabriel Hurley for the patch.

Backport of r13161 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3981355
@freakboy3742 freakboy3742 [1.1.X] Fixed #12997 -- Added markup for methods in the queryset docs…
…. Thanks to Ramiro Morales for the patch.

Backport of r13162 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6df4ffd
@freakboy3742 freakboy3742 [1.1.X] Fixed #12412 -- Clarified the documentation around file handl…
…ing by the test client. Thanks to Gabriel Hurley for the draft patch.

Backport of r13166 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5be6c7f
@freakboy3742 freakboy3742 [1.1.X] Fixed #12278 -- Corrected an example usage of string_concat. …
…Thanks to loumz for the report, and timo for the patch.

Backport of r13167 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3b9a827
@freakboy3742 freakboy3742 [1.1.X] Fixed #12040 -- Cleaned up the documentation describing how C…
…urrentSiteManager works. Thanks to elpaso66 for the report, and Gabriel Hurley for the draft patch.

Backport of r13168 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
814268f
@freakboy3742 freakboy3742 [1.1.X] Fixed #11933 -- Corrected the naming of the cached_db session…
… backend. Thanks to mb0@mb0.org for the report and Gabriel Hurley for the patch.

Backport of r13169 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5d75102
@freakboy3742 freakboy3742 [1.1.X] Fixed #10712 -- Added documentation for the queryset() method…
… on ModelAdmin. Thanks to mrts for the report, and timo for the patch.

Backport of r13170 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2ee73c2
@freakboy3742 freakboy3742 [1.1.X] 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.

Backport of r13171 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c772e39
@freakboy3742 freakboy3742 [1.1.X] Fixed #6039 -- Modified Atom example to be standard compliant…
…. Thanks to ion.morega@gmail.com for the report, and arien for the patch.

Backport of r13179 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e10f546
@freakboy3742 freakboy3742 [1.1.X] Fixed #6842 -- Added reference documentation on Django's exce…
…ptions. Thanks to timo for the patch.

Backport of r13180 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9fb195f
@jezdez jezdez [1.1.X] Fixed #13317 - Clarified documentation about how the blocktra…
…ns and trans template tags work with regard to variables. Thanks for the initial patch, Ramiro Morales.

Backport from trunk, r13184.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4a97875
Commits on May 10, 2010
@freakboy3742 freakboy3742 [1.1.X] Added exceptions reference page to the API reference index.
Backport of r13187 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f7215ce
@jezdez jezdez [1.1.X] Fixed #13168 - Corrected the alignment of the admin inline he…
…aders for rtl languages. Thanks for the report and patch, benc.

Backport from trunk, r13191

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
868cf80
@jezdez jezdez [1.1.X] Fixed #12892 - Fixed unicode related bug in a utility functio…
…n of the admindocs app that prevented it to be used in non-English environments together with certain versions of docutils.

Backport from trunk, r13192

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8099fec
@freakboy3742 freakboy3742 [1.1.X] Fixed #13333 -- Corrected typo in whatsnew docs. Thanks to ci…
…catrix1 for the report.

Backport of r13195 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b66d597
@freakboy3742 freakboy3742 [1.1.X] Fixed #13329 -- Corrected markup problem with URL pattern in …
…generic views docs. Thanks to LaundroMat for the report.

Backport of r13196 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
45c409f
@freakboy3742 freakboy3742 [1.1.X] Fixed #13158 -- Clarified that OneToOneField is a better opti…
…on for User profile classes. Thanks to hvdklauw for the report and patch.

Backport of r13197 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0765d4b
@freakboy3742 freakboy3742 [1.1.X] Fixed #12229 -- Added documentation of the FieldFile methods …
…that are exposed by FileField and ImageField. Thanks to Gabriel Hurley for the draft patch.

Backport of r13202 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6bc070b
@freakboy3742 freakboy3742 [1.1.X] Fixed #13509 -- Modified the comment tests so that signal cle…
…anup doesn't rely on garbage collection. Thanks to Alex Gaynor for the report and patch.

Backport of r13204 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5a43a33
@freakboy3742 freakboy3742 [1.1.X] Fixed #13002 -- Corrected description of the default form bas…
…e class in InlineModelAdmin classes. Thanks to stijn@typograaf.be for the report, and timo for the patch.

Backport of r13209 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a858374
@freakboy3742 freakboy3742 [1.1.X] Fixed #12984 -- Corrected typo in signals docs. Thanks to kch…
…arvey for the report.

Backport of r13210 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5627b26
@freakboy3742 freakboy3742 [1.1.X] Fixed #12678 -- Corrected a few references to Queryset into Q…
…uerySet. Thanks to ChrisMorgan for the report, and timo for the patch.

Backport of r13211 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b7b0ebb
@freakboy3742 freakboy3742 [1.1.X] Fixed #12621 -- Corrected grammar error in custom template ta…
…g docs. Thanks to beemzet for the report.

Backport of r13212 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c51284f
@freakboy3742 freakboy3742 [1.1.X] Fixed #12505 -- Clarified the use of the extra argument in fo…
…rmsets. Thanks to Andreas for the report, and timo for the draft patch.

Backport of r13218 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9ca0a33
@freakboy3742 freakboy3742 [1.1.X] Refs #12288 -- Clarified that application names must be uniqu…
…e. Thanks to Piotr Czachur for the report.

Backport of r13219 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
61beb45
@freakboy3742 freakboy3742 [1.1.X] Fixed #12135 -- Clarified custom template tag example. Thanks…
… to EvilDMP for the report, and timo for the patch.

Backport of r13220 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
45f5e0c
@freakboy3742 freakboy3742 [1.1.X] Fixed #12001 -- Modified the example of form validation to us…
…e the form's error class, rather than assuming ErrorList. Thanks to Suor for the report, and timo for the patch.

Backport of r13221 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a0ea98e
@freakboy3742 freakboy3742 [1.1.X] Fixed #11908 -- Clarified the role and usage of the Managemen…
…tForm in formsets. Thanks to timo for the draft patch.

Backport of r13222 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
08de7a3
Commits on May 11, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #12997 -- Corrected the module markup for QuerySet meth…
…ods. Thanks to timo for the report.

Backport of r13235 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6f2a844
Commits on May 12, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13529 -- Corrected ModelAdmin example. Thanks to steph…
…ane@actinetwork.com for the report.

Backport of r13242 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
242c7f3
@kmtracey kmtracey [1.1.X] Fixed doc markup error that resulted in no anchor tag for the…
… model admin queryset method.

r13245 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
87fd458
@kmtracey kmtracey [1.1.X] Fixed #13530: Corrected a handful of doc typos. Thanks Ramiro.
Merge of the applicable bits of r13247.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2f8bb4e
Commits on May 13, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13514 -- Corrected the process of loading multiple jav…
…ascript translation catalogs. Thanks to jtiai for the report, to Ramiro Morales for working out the test case, and to Ramiro and Jannis for their help on the fix.

Backport of r13250 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c179bd5
Commits on May 14, 2010
@freakboy3742 freakboy3742 [1.1.X] Fixed #13532 -- Corrected and clarified examples in F() docs.…
… Thanks to erw for the report and patch.

Backport of r13254 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f077492
@ubernostrum ubernostrum [1.1.X] Bump to 1.1.2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4333ca5
@ubernostrum ubernostrum [1.1.X] This branch is now 1.1.3 pre-alpha.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5d6b296
@freakboy3742 freakboy3742 [1.1.X] Removed the 'under development' marker from the 1.1.2 release…
… notes; a little too late, but better than never.

Backport of r13263 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
934dc9e
Commits on Dec 23, 2010
@alex alex [1.1.X] Fix a security issue in the admin. Disclosure and new release…
… forthcoming.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1708483
@alex alex [1.1.X] Fix a security issue in the auth system. Disclosure and new r…
…elease forthcoming.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
7f8dd9c
@ubernostrum ubernostrum [1.1.X] Bump to 1.1.3 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
334654f
@ubernostrum ubernostrum [1.1.X] Update download_url for 1.1.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cbbfe11
Commits on Jan 12, 2011
@ramiro ramiro [1.1.X] Fixed #14999 -- Ensure that filters on local fields are allow…
…ed, and aren't caught as a security problem. Thanks to medhat for the report.

Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
703dc82
Commits on Jan 28, 2011
@spookylukey spookylukey [1.1.X] Fixed #15103 - SuspiciousOperation with limit_choices_to and …
…raw_id_fields

Thanks to natrius for the report.

This patch also fixes some unicode bugs in affected code.

Backport of [15347] from trunk. Backported to 1.1.X because this was
a regression caused by a security fix backported to 1.1.X.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
274bd67
Commits on Feb 09, 2011
@alex alex [1.1.X] Fixed a security issue in the CSRF component. Disclosure and …
…new release forthcoming.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
408c5c8
@alex alex [1.1.X] Fixed a security issue in the file session backend. Disclosur…
…e and new release forthcoming.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
570a32a
@carljm carljm [1.1.X] Fixed security issue in AdminFileWidget. Release and disclosu…
…re forthcoming.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1966786
@ubernostrum ubernostrum [1.1.X] Bump version number for impending security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
24f2898