p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,930 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

6930 Commits

Author SHA1 Message Date
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
Matt Boersma 5e20f14c8b [1.0.X] Fixed #11033 -- handle cx_Oracle.UNICODE when driver was compiled without Unicode support. Thanks, JirkaV. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 20:32:03 +00:00
Jacob Kaplan-Moss a1d6fdafce [1.0.X] Fixed #9675: added note about upgrading the URLconf to the comment upgrade guide. Backport of [10746] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 17:25:29 +00:00
Jacob Kaplan-Moss da4ddabbe5 [1.0.X] Fixed #11063: updated install docs to mention mod_wsgi instead of mod_python. Backport of [10745] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 17:25:07 +00:00
Matt Boersma 0f98f0b214 [1.0.X] Fixed #11050 -- Oracle now passes all but one introspection unit test. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-11 20:56:38 +00:00
Malcolm Tredinnick 9b8644407d [1.0.X] Changed r10672 to not falsely error out when using generic inlines. 
The bug was picked up by the tests already, but only if run against a
backend that supports referential integrity.

Backport of r10732 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-11 01:48:06 +00:00
Russell Keith-Magee 1b6fac19ce [1.0.X] Updated svnmerge properties for recent checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-11 00:06:03 +00:00
Russell Keith-Magee bc07a498fe [1.0.X] Fixed #10792 -- Ensured that ModelChoiceFields don't provide an empty option when the underlying field has blank=False and there is a default value available. Thanks to carljm for the report and patch. 
Merge of r10729 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-11 00:01:40 +00:00
Russell Keith-Magee 0d930ee0e6 [1.0.X] Fixed #11042 -- Corrected admin inlines for inherited models. Thanks to jsmullyan for the report, and mir for helpful triage work. Patch includes regression test for #8093, and a commented out test for #10992. 
Merge of r10725 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-09 11:52:15 +00:00
Russell Keith-Magee cde397df31 [1.0.X] Updated svnmerge properties for recent checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-09 05:31:19 +00:00
Matt Boersma 1fe7eb603d [1.0.X] Fixed test suite on Oracle that was broken by using keyword "date" as a field name. Refs #4140 and #10422. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:49:49 +00:00
Russell Keith-Magee 8397c1fdfa [1.0.X] Fixed #10899 -- Ensured that log messages for deletions in the admin contain useful descriptions. Thanks to Jeremy Dunck for the patch. 
Merge of r10686 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:12:51 +00:00
Russell Keith-Magee 41ba8e7ca6 [1.0.X] Fixed #10516 -- Corrected admin search when the search_fields definition contains multiple fields on the same base model. Thanks to Zain Memon 
Merge of r10684 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:08:55 +00:00