Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
6,932 Commits 26 Branches 382 Tags
Commit Graph

2361 Commits

Author SHA1 Message Date
Karen Tracey
75de41f910 [1.0.X] Fixed #11344 -- Made a couple of minor clarifications to the mod_wsgi deployment doc. Thanks nartzpod and achew22. 
r11079 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 01:38:53 +00:00
Russell Keith-Magee
0c24c3ee17 [1.0.X] Fixed #11221 -- Replaced a reference to a non-existent URL with an actual explanation of sequences. Thanks to Rob Hudson for the report, and SmileyChris for the patch. 
Merge of r11053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:18:43 +00:00
Russell Keith-Magee
527609ccc9 [1.0.X] Fixed #10978 -- Clarified that the include statement is part of the urlpattern definition. Thanks to swatermasysk for the suggestion. 
Merge of r11052 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:18:13 +00:00
Russell Keith-Magee
91e16bdcb7 [1.0.X] Fixed #11253 -- Normalized the way the docs refer to TestCase.assert* methods. Thanks to SmileyChris for the report and patch. 
Merge of r11051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:17:45 +00:00
Russell Keith-Magee
7cebfa1c49 [1.0.X] Fixed #11119 -- Corrected spelling error in 1.0 porting guide. 
Merge of r11050 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:17:13 +00:00
Russell Keith-Magee
5301334f15 [1.0.X] Fixed #11141 -- Corrected a code example in the admin docs. Thanks to jodal for the report, and SmileyChris for the patch. 
Merge of r11049 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:16:45 +00:00
Russell Keith-Magee
c77f83ceae [1.0.X] Fixed #11322 -- Clarified docs regarding middleware processing. Thanks the Michael Malone for the patch. 
Merge of r11048 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:16:13 +00:00
Russell Keith-Magee
82ffb6747f [1.0.X] Fixed #11318 -- Grammar correction in modelform docs. Thanks to seemant for the report. 
Merge of r11047 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:15:27 +00:00
Russell Keith-Magee
7ccd095755 [1.0.X] Fixed #11312 -- Fixed the default value given for DEFAULT_FILE_STORAGE in the docs. THanks to x00nix@gmail.com for the patch. 
Merge of r11046 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:14:52 +00:00
Russell Keith-Magee
9029db7b79 [1.0.X] Fixed #11278 -- Clarified query documentation regarding bulk assignment of m2m values. Thanks to zgoda for the patch. 
Merge of r11045 and r11054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:14:21 +00:00
Russell Keith-Magee
58e4a9d938 [1.0.X] Fixed #11272 -- Made some clarifications to the overview and tutorial. Thanks to jjinux for the review notes. 
Merge of r11044 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:13:50 +00:00
Karen Tracey
7cccaaaf70 [1.0.X] Fixed #11339 -- Corrected typo in FAQ. Thanks Kellen. 
r11041 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 12:42:57 +00:00
Karen Tracey
a44960b083 [1.0.X] Fixed #11335 -- Corrected model reference in generic views doc. Thanks oyvind. 
r11028 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 20:02:17 +00:00
Russell Keith-Magee
9d7e51d957 [1.0.X] Fixed #10336 -- Added improved documentation of generic views. Thanks to Jacob and Adrian for the original text (from the DjangoBook), and Ramiro for doing the work of porting the docs. 
Merge of r11025 and r11026 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 14:19:54 +00:00
Russell Keith-Magee
40bcd34fab [1.0.X] Fixed #9919 -- Added note on the need to mark transactions as dirty when using raw SQL. 
Merge of r11022 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 13:54:43 +00:00
Russell Keith-Magee
e63e0bb400 [1.0.X] Fixed #11328 -- Added missing imports in the sample urls.py from Tutorial 3. Thanks to marcalj for the report. 
Merge of r11021 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 13:52:05 +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
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
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
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
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
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
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
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
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
7bcbc99b9e [1.0.X] Fixed #9493 -- Corrected error handling of formsets that violate unique constraints across the component forms. Thanks to Alex Gaynor for the patch. 
Merge of r10682 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:04:59 +00:00
Jacob Kaplan-Moss
4f383e2939 Reverted r10709 which I applied to the wrong branch. Sorry for my git-svn fail! 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:13:17 +00:00