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 bb0538d4d5 [1.0.X] Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report. 
Merge of r11067 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 15:07:22 +00:00
Russell Keith-Magee 9356e16a62 [1.0.X] Updated svnmerge properties for recent commits 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:22:39 +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
Russell Keith-Magee 4a79eaac97 [1.0.X] Fixed #10848 -- Added prairiedogg to AUTHORS. 
Merge of r11043 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:12:55 +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 c19d10c180 [1.0.X] Fixed #9268 -- Ensured that the next argument is passed on when previewing comments. Thanks to leanmeandonothingmachine for the patch. 
Merge of r11019 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 13:12:28 +00:00
Russell Keith-Magee d0a3b92e4b [1.0.X] Fixed #9023 -- Corrected a problem where cached attribute values would cause a delete to cascade to a related object even when the relationship had been set to None. Thanks to TheShark for the report and test case, and to juriejan and Jacob for their work on the patch. 
Merge of r11009 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-15 15:06:35 +00:00
Russell Keith-Magee 8656fffbe0 [1.0.X] Fixed #11311 -- Reverted [10952], Refs #10785. Changeset [10952] caused problems with m2m relations between models that had non-integer primary keys. Thanks to Ronny for the report and test case. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-15 11:54:03 +00:00
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