6892 Commits

Author SHA1 Message Date
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
Jacob Kaplan-Moss
91a17a843f [1.0.X] Fixed #10795: added a link to model formsets docs from the formsets docs. Backport of [10774] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:15:53 +00:00
Jacob Kaplan-Moss
ce369dce13 [1.0.X] Fixed #10273: added an explanation of SetPasswordForm and UserChangeForm to the docs. Thanks, Tarken. Backport of [10772] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:03:35 +00:00
Jacob Kaplan-Moss
cefeb13f91 [1.0.X] Fixed #10272: documented the signatures for the contrib.auth views. Thanks, Idan Gazit. Backport of [10770] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:01:54 +00:00
Jacob Kaplan-Moss
bcda65e991 [1.0.X] Fixed #11046: fixed a use of the deprecated cycle tag syntax in the template documentation. Backport of [10768] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 01:54:41 +00:00
Karen Tracey
86c278f2a5 [1.0.X] Blocked a few more changesets and added a couple more that have been integrated.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 19:14:02 +00:00
Jacob Kaplan-Moss
4c79ef99c2 [1.0.X] Fixed #11102: corrected a 1.1-ism in the tutorial.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 18:48:35 +00:00
Jacob Kaplan-Moss
f4fce99bc1 [1.0.X] Fixed #10687: fixed request parsing when upload_handlers is empty. Thanks, Armin Ronacher. Backport of [10723] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 18:45:16 +00:00
Jacob Kaplan-Moss
11d08bca2b [1.0.X] Fixed #10448: correcting errors on "save as new" now correctly create a new object instead of modifying the old one. Thanks, bastih. Backport of [10713] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 18:41:39 +00:00
Ian Kelly
68033811ee [1.0.X] Fixed BooleanFields being coerced null=True in Oracle. Backport of r10505 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 17:11:18 +00:00
Karen Tracey
cccfeaaa18 [1.0.X] Added admin URLs back to the urls.py example in the tutorial - had a complaint from someone following the tutorial that they got to that step and the admin stopped working and they weren't sure why.
Merge of r10727.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 16:19:52 +00:00
Karen Tracey
9e03bf2d47 [1.0.X] Blocked a few more changesets not applicable to the branch, and updated svnmerge-integrated to reflect changesets that have been merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 16:05:23 +00:00
Karen Tracey
3961b855e7 [1.0.X] Blocked a bunch of new function fixes from merge to branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 15:38:18 +00:00
Russell Keith-Magee
fe42c64a41 [1.0.X] Updated svnmerge properties for recent checkins
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 14:39:48 +00:00
Russell Keith-Magee
c482859105 [1.0.X] Fixed #10243, #11043 -- Corrected handling of formsets over a ForeignKey that uses to_field, and by extension, fixed the admin for handling fields of that type. Thanks to apollo13 for the initial patch.
Merge of r10756 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 14:32:18 +00:00
Russell Keith-Magee
17d214a982 [1.0.X] Fixed #10288 -- Corrected _has_changed handling of DateTimeInput when a custom date/time format is in use. Thanks to Koen Biermans for the report and patch.
Merge of r10641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-13 14:31:39 +00:00
Jacob Kaplan-Moss
cc96ed9ecd [1.0.X] Fixed #10643: fixed the formtools security hash to handle allowed empty forms or forms without changed data. Backport of [10753] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-12 22:03:32 +00:00
Jacob Kaplan-Moss
08577ab0f1 [1.0.X] Fixed #10034: the formtools security hash function is now friendlier to browsers that submit leading/trailing whitespace in form fields. Backport of [10752] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-12 22:03:19 +00:00