Commit Graph

6909 Commits

Author SHA1 Message Date
Justin Bronn 1ff9ec9f12 [1.0.X] Fixed support for GDAL 1.6 on Windows. Thanks to jtia for spotting this.
Backport of r10985 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-12 17:19:19 +00:00
Luke Plant b9952794c3 [1.0.X] Fixed #9367 - EmailMultiAlternatives does not properly handle attachments.
Thanks to Loek Engels for the bulk of the patch.

Backport of r10983 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-12 14:09:36 +00:00
Brian Rosner bbe034a74f [1.0.X] Fixed #11302 -- Avoid unnesscary (and possibly unintentional) queries/results from generic inline formsets.
When an instance with no primary key value is passed in to a generic inline
formset we ensure no queries/results occur. Thanks Alex Gaynor.

Backport of [10981] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-11 19:06:12 +00:00
Justin Bronn ea5e5a20a9 [1.0.X] Fixed #11245, #11246 -- Fixed validity check of `GeoIP` pointers and leaking of their references; also clarified initialization, fixed a stale test, added comments about version compatibility, and did some whitespace cleanup.
Backport of r10979 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-11 02:53:32 +00:00
Russell Keith-Magee 3f28be2b65 [1.0.X] Fixed #11056 -- Corrected reference to File class in storage docs. Thanks to wam for the report.
Merge of r10970 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 13:00:28 +00:00
Russell Keith-Magee a7f109d50f [1.0.X] Fixed #10801 -- Reverted a portion of [10371]. Practicality beats purity in this case. Thanks to bruce@z2a.org for the report. Refs #9771.
Merge of r10973 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 12:57:06 +00:00
Russell Keith-Magee 922aed5465 [1.0.X] Fixed #10845 -- Clarified the examples for using ModelForms with fields or exclude specified. Thanks to Andrew Durdin for the suggestion.
Merge of r10972 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 12:54:15 +00:00
Russell Keith-Magee 383c46dc8d [1.0.X] Fixed #10981 -- Clarified documentation regarding lazy cross-application relationships. Thanks to Ramiro for the suggestion.
Merge of r10971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 12:51:35 +00:00
Russell Keith-Magee 0a4890466c [1.0.X] Blocked recent updates from merge.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-09 14:04:27 +00:00
Russell Keith-Magee 7ee3d0cd4d [1.0.X] Block recent trunk revisions from merge
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-08 14:51:44 +00:00
Russell Keith-Magee 8092c67d51 [1.0.X] Fixed #10785 -- Corrected a case for foreign key lookup where the related object is a custom primary key. Thanks to Alex Gaynor for the patch.
Merge of r10952 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-08 05:29:47 +00:00
Russell Keith-Magee a827ba72a1 [1.0.X] Blocked recent trunk update from merge to branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06 13:48:00 +00:00
Russell Keith-Magee 7560497a50 [1.0.X] Blocked recent trunk updates from merge to branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06 13:39:13 +00:00
Russell Keith-Magee a6db5f229b [1.0.X] Blocked update from merge to branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06 08:36:13 +00:00
Russell Keith-Magee 056796b74d [1.0.X] Fixed #9479 -- Corrected an edge case in bulk queryset deletion that could cause an infinite loop when using MySQL InnoDB.
Merge of 10913-10914 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-03 13:43:05 +00:00
Gary Wilson Jr 53b0436102 [1.0.X] Fixed a few Python 2.3 incompatibilities that were causing test failures.
Backport of [10863] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-29 05:28:40 +00:00
Gary Wilson Jr 0871c87b77 [1.0.X] Fixed #11216 and #11218 -- Corrected a few typos, thanks buriy.
Backport of [10861] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-29 04:39:59 +00:00
Karen Tracey e2e092cff9 [1.0.X] Fixed #11204 -- Corrected typo in the pluralize doc. Thanks martin and SmileyChris.
r10849 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:28:38 +00:00
Karen Tracey 28380f48ca [1.0.X] Fixed #11209 -- Added a note to doc on connection.queries that the logged sql may not inlude parameter quoting.
r10847 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:21:49 +00:00
Karen Tracey 18feaead04 [1.0.X] Fixed #11215 -- Replaced erroneous catch with except in testing doc. Thanks jgomo3.
r10845 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:06:35 +00:00
Karen Tracey b9db62ee60 [1.0.X] Fixed #11205 -- Made the links to the str method description look the same as the links to the unicode method description in the tutorial part 1. Having one be fully qualified while the other was not was odd-looking.
r10843 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-26 16:48:49 +00:00
Karen Tracey f37a02ec03 [1.0.X] Fixed #11202 -- Removed mod_python information from FAQ, as it is no longer the recommended deployment option, in favor of more general pointers to the docs and wiki where deployment is discussed in depth.
r10841 from trunk.  Also updated svnmerge-integrated to indicate r10837 has been merged to the branch.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-26 16:33:10 +00:00
Brian Rosner 82f9f74821 [1.0.X] Fixed #8857 -- Corrected ref in modelforms documentation and added ref to file upload documentation in form documentation. Thanks Kyle Fox and prairiedogg.
Backport of [10837] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-24 06:48:43 +00:00
Karen Tracey 24108801b6 [1.0.X] Fixed #11188 -- Removed incorrect doc note about step being unsupported when slicing query sets.
r10835 from trunk.  Also updated svnmerge metadata for some other recent commits.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-23 13:06:26 +00:00
Jacob Kaplan-Moss 19e2585a38 [1.0.X] Fixed #10867: make the makemessages command ignore files and only process directories. Thanks, diegobz. Backport of [10833] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-20 20:05:49 +00:00
Jacob Kaplan-Moss 10637a94cb [1.0.X] Fixed #11134: signals recievers that disconnect during their processing no longer mess things up for other handlers. Thanks, Honza Kral. Backport of [10831] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-20 16:19:24 +00:00
Russell Keith-Magee e001738063 [1.0.X] Modified a test from r10787 so that the comparison order is reliable. Thanks to Alex Gaynor and Tom Tobin for the report via IRC.
Merge of r10828 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-20 00:26:07 +00:00
Karen Tracey 3cd3df814d [1.0.X] Blocked r10826 from merge to branch as it's a fix to code added in a blocked changeset. Also replaced r10824 with r10822 in svnmerge-integrated as I believe that was the intent of r10825.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-19 23:39:35 +00:00
Russell Keith-Magee cb73fe916e [1.0.X] Updated svnmerge properties for recent commits
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-19 15:05:22 +00:00
Russell Keith-Magee 593bcc155a [1.0.X] Fixed #9308 -- Corrected the updated of nullable foreign key fields when deleting objects. Thanks to Bob Thomas for the fix, and markshep for the improvements on the test case.
Merge of r10822 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-19 13:10:35 +00:00
Karen Tracey c6f7f2f092 [1.0.X] Blocked new function doc fix changesets from merge to branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-18 16:06:04 +00:00
Karen Tracey ad2efbdd61 [1.0.X] Fixed #11138 -- Corrected the description of behavior related to the max_num parameter for model formsets.
r10819 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-18 16:02:43 +00:00
Karen Tracey efbe48cfcb [1.0.X] Fixed #10400: Added a note in the file uploads doc about the correct form type needed for file uploads to work. Thanks claudep and timo.
r10816 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 18:47:32 +00:00
Karen Tracey 65966cebd3 [1.0.X] Fixed #10817 -- Corrected some grammar in the forms doc. Thanks nickretallack@gmail.com.
r10814 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 18:11:58 +00:00
Karen Tracey d4e44699aa [1.0.X] Fixed #10846: Corrected typo in modwsgi.txt and updated reference to deployment in The Django Book. Thanks timo.
r10812 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 18:06:12 +00:00
Karen Tracey fc24a69028 [1.0.X] Fixed #10855: Reference doc on creating superusers in the tutorial at the point where an account is needed, so that readers who neglected to create one earlier (or who forgot the password) don't get stuck or think they have to start all over. Thanks cwolf127 and timo.
r10810 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:57:41 +00:00
Karen Tracey e2189f6d24 [1.0.X] Fixed #10925 -- Clarified the location of some code referenced in the tutorial. Thanks rm and timo.
r10808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:45:12 +00:00
Karen Tracey 509dfdd3a7 [1.0.X] Fixed #11031 -- Added doc for some additional roles needed when testing Oracle. Thanks JirkaV and Matt Boersma.
r10805 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:28:34 +00:00
Karen Tracey 02b6f16422 [1.0.X] Fixed #11066 -- Corrected 11 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
Merge of applicable parts of r10801 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:53:38 +00:00
Karen Tracey 1f5626d087 [1.0.X] Fixed #11130 -- Corrected code example in custom template tag doc. Thanks phyfus.
r10799 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:33:00 +00:00
Karen Tracey e6a6ce4f07 [1.0.X] Fixed #11106 -- Corrected typo in models doc. Thanks mnieber.
r10797 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:22:44 +00:00
Karen Tracey ebd74921bb [1.0.X] Fixed #11128 -- Misc. fixes and improvements to the model forms doc. Thanks Ramiro and Alex.
r10795 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:15:16 +00:00
Karen Tracey a04fd1ef30 [1.0.X] Updated blocked and merged metadata for svnmerge.py.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-16 19:01:51 +00:00
Russell Keith-Magee e21c85c58e [1.0.X] Updated svnmerge properties for recent commits
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-16 06:30:12 +00:00
Russell Keith-Magee f5dcd07977 [1.0.X] Fixed #9206 -- Added documentation on savepoints, and how to use them to recover from errors in PostgreSQL. Thanks to Richard Davies for the draft text.
Merge of r10791 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-16 06:27:44 +00:00
Matt Boersma 985c939dd0 [1.0.X] Fixed import statement in admin_views test to work with Python 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-15 15:06:57 +00:00
Russell Keith-Magee 55f1c3e176 [1.0.X] Fixed #11120 -- Corrected handling of inlines attached to inherited classes, broken by r10756. Thanks to George Song and Michael Strickland for the simultaneous reports.
Merge of r10787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-15 13:06:57 +00:00
Jacob Kaplan-Moss 7f90dc1ba2 [1.0.X] Fixed #10348: ChangeList no longer overwrites a select_related provided by `ModelAdmin.queryset()`. Backport of [10782] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 15:13:49 +00:00
Jacob Kaplan-Moss c293450173 [1.0.X] Fixed #10992: fixed a bug saving inlines with custom primary key fields. Thanks, Zain. Backport of [10777] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:30:25 +00:00
Jacob Kaplan-Moss 5015860ebf [1.0.X] Fixed a weird intentation glitch in `django/forms/models.py`. Five spaces!?
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:28:56 +00:00