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

6975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
0056d79c4e [1.0.X] Fixed #11229 -- Updated the mod_wsgi deployment documentation to avoid references to mod_python and techniques that are not recommended or required for mod_wsgi. Thanks to Graham Dumpleton for the suggestion and guidance. 
Merge of r11249 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 23:54:04 +00:00
Russell Keith-Magee
ab3b5b2380 [1.0.X] Fixed #10908 -- Clarified the procedure for creating test users in the testing docs. Thanks to gruszczy and timo. 
Merge of r11248 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 23:49:27 +00:00
Russell Keith-Magee
940b8a17d4 [1.0.X] Blocked some recent updates from merge 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:28:08 +00:00
Russell Keith-Magee
1c908784e6 [1.0.X] Fixed #11235 -- Added a missing clause from some sample SQL in the queryset docs. 
Merge of r11239 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:24:49 +00:00
Russell Keith-Magee
c7289a0402 [1.0.X] Fixed #11364 -- Modified the jsi18n example to use the {% url %} tag rather than a placeholder. Thanks to jcassee for the suggestion. 
Merge of r11237 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:21:19 +00:00
Russell Keith-Magee
500202337e [1.0.X] Fixed #11374 -- Modified the documentation for forms.BooleanField to allow for the fact that it can be rendered using widgets other than a checkbox. Thanks to lygaret for the patch. 
Merge of r11236 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:17:29 +00:00
Russell Keith-Magee
ca3bd9ffb7 [1.0.X] Fixed #11469 -- Removed suspicion that Django developers have trouble counting to four. Thanks to msgre for the report. 
Merge of r11235 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:14:04 +00:00
Russell Keith-Magee
fcbd3bcec9 [1.0.X] Fixed #10287 -- Added better examples in the docs of formset validation. Thanks to Andrew Badr for the text. 
Merge of r11234 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 14:11:06 +00:00
Russell Keith-Magee
9133e12a4c [1.0.X] Update svnmerge properties for recent changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-13 14:01:04 +00:00
Russell Keith-Magee
c4f1970b03 [1.0.X] Blocked r11221 from merge. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 16:11:50 +00:00
Russell Keith-Magee
558e4e9482 [1.0.X] Fixed #11438 -- Corrected some bad grammar in the custom fields docs. Thanks to thepointer for the report. 
Merge of r11220 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 16:09:18 +00:00
Russell Keith-Magee
5c2518539c [1.0.X] Fixed #11453 -- Added note on customizing SERVER_EMAIL for error reporting. Thanks to seveas for the suggestion and draft text. 
Merge of r11219 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 16:06:59 +00:00
Russell Keith-Magee
7cfee7925a [1.0.X] Fixed #11450 -- Corrected markup problem in contenttype docs. Thanks to seveas for the report. 
Merge of r11218 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 15:48:38 +00:00
Russell Keith-Magee
667042a060 [1.0.X] Fixed #11454 -- Corrected mismatched parenthesis in admin docs. Thanks to seveas for the report. 
Merge of r11217 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 15:45:55 +00:00
Russell Keith-Magee
79af110d37 [1.0.X] Fixed #11107 -- Corrected the generation of sequence reset SQL for m2m fields with an intermediate model. Thanks to J Clifford Dyer for the report and fix. 
Merge of r11215 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 14:30:14 +00:00
Justin Bronn
aa0be5b7f0 [1.0.X] ixed GEOS & GDAL C function prototypes to explicitly use a subclass of c_char_p as the return type on routines that return strings. This prevents crashes on some 64-bit platforms, like FreeBSD. Thanks to wilsaj for discovering the problem. Refs #9747. 
Backport of r11205 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-09 02:37:20 +00:00
Marc Fargas
18f12a3884 [1.0.X] Updated Spanish translation. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-07 13:31:57 +00:00
Marc Fargas
e3cf57598e [1.0.X] Update Catalan translation. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-07 13:31:32 +00:00
Russell Keith-Magee
f921908bc2 [1.0.X] Blocked r11176 from merge to branch 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 14:19:14 +00:00
Russell Keith-Magee
63a7b95693 [1.0.X] Fixed #9669 -- Corrected an answer in the admin FAQ that is wrong in a post-newforms-admin world. Thanks to Alex for the report. 
Merge of r11175 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 14:16:21 +00:00
Russell Keith-Magee
7b5869e140 [1.0.X] Fixed #9607 -- Added documentation for the `extra` argument in test client methods. Thanks to jroes for the report and patch. 
Merge of r11173 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 07:47:05 +00:00
Russell Keith-Magee
40f24b4635 [1.0.X] Fixed #10426 -- Added note on language variables required for Apache to survive non-ASCII file uploads. Thanks to daybreaker for the report, and david for the draft text. 
Merge of r11170 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 07:23:37 +00:00
Russell Keith-Magee
c05f4d5a22 [1.0.X] Fixed #11417 -- Corrected typo in MySQL collation notes. Thanks to vorushin for the report. 
Merge of r11169 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 07:20:36 +00:00
Russell Keith-Magee
df2011c61b [1.0.X] Added a Sphinx anchor that somehow got omitted from r11102. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 06:25:42 +00:00
Russell Keith-Magee
45411379b4 [1.0.X] Fixed #10604 -- Added note on the limitation of ungettext, especially as relating to the {% blocktrans %} tag. Thanks to bartTC for the report, and Ramiro Morales for the patch. 
Merge of r11164 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 06:15:48 +00:00
Russell Keith-Magee
9219741ee7 [1.0.X] Fixed #11413 -- Added notes on the cycle and firstof tag detailing that variables output by those tags will not be escaped by default. Thanks to krystal for the report and draft patch. 
Merge of r11163 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 06:12:50 +00:00
Russell Keith-Magee
4aca3be925 [1.0.X] Fixed #10539 -- Updated Sphinx configuration to accommodate 0.6 while retaining compatibility with 0.4 and 0.5. Thanks to Ramiro Morales for the patch. 
Merge of r11162 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 06:09:57 +00:00
Russell Keith-Magee
f538e15a2c [1.0.X] Updated svnmerge properties for recent commits 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 03:27:31 +00:00
Russell Keith-Magee
c60901c031 [1.0.X] Fixed #10834 -- Corrected [11120] to ensure that there is a difference between catching a bad URL pattern and an new (no URLs) project. Thanks to Matt Welch for the report. 
Merge of r11155 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-02 14:44:28 +00:00
James Bennett
2a7b781cfe [1.0.X] Fixed #11357: contrib.admindocs now correctly displays many-to-many relationships. Thanks to Ben Spaulding for the final version of the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-30 18:41:12 +00:00
Justin Bronn
8fd40001f5 [1.0.X] Fixed #11401 -- Update geographic admin to use OpenLayers 2.8 as OpenStreetMap does not support previous versions. Thanks, yourcelf for ticket and patch. 
Backport of 11125 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 17:58:07 +00:00
Russell Keith-Magee
1153d4bf80 [1.0.X] Fixed #10834 -- Added bucket condition to ensure that URL resolvers won't ever return None. Thanks to Chris Cahoon for the patch. 
Merge of r11120 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 14:23:28 +00:00
Russell Keith-Magee
c4e240fae3 [1.0.X] Fixed #11392 -- Enforced a predictable result order for a couple of test cases. Thanks to Nathan Auch for the report and patch. 
Merge of r11119 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 14:10:53 +00:00
Russell Keith-Magee
74b631667b [1.0.X] Updated svnmerge-blocked property for some old checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-25 06:16:38 +00:00
Russell Keith-Magee
8d25e8f828 [1.0.X] Made some small improvements to docs/topics/http/sessions.txt 
Merge of r10839 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-25 05:56:43 +00:00
Russell Keith-Magee
998a3776ed [1.0.X] Updated svnmerge-integrated property for some old checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-25 05:52:54 +00:00
Russell Keith-Magee
cef2a6f236 [1.0.X] Updated svnmerge properties for recent checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-25 05:36:29 +00:00
Karen Tracey
7c8a6605ea [1.0.X] Fixed #10741: Updated instructions on the best gettext package to get for Windows. Thanks Ramiro. 
r11103 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 23:40:00 +00:00
Russell Keith-Magee
b287f8a96f [1.0.X] Fixed #8861 -- Added note on the availability of ModelForm.instance. Thanks to Ramiro Morales for the patch. 
Merge of r11097 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 14:23:24 +00:00
Russell Keith-Magee
34fbf191c1 [1.0.X] Fixed #11327 -- Added missing prefix in HTML id in admin-docs. Prefix originally added in r10343, but missed the second usage. Thanks to Nathan for the report and patch. 
Merge of r11096 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 14:22:11 +00:00
Russell Keith-Magee
60ec0bdec2 [1.0.X] Fixed #10415 -- Added documentation for features added in r7627 and r7630; extensibility points for the ModelAdmin?? and AdminSite??. Thanks to Ramiro Morales for the draft text. 
Merge of r11095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 14:21:19 +00:00
Russell Keith-Magee
e717ddc0da [1.0.X] Fixed #11354 -- Remove stray whitespace in queryset docs. Thanks to flebel for the report. 
Merge of r11094 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 14:20:38 +00:00
Russell Keith-Magee
589d96ce4a [1.0.X] Fixed #11356 -- Added links to the growing collection of 3rd party database backends that are available. Thank to Nathan Auch for the draft text. 
Merge of r11093 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-24 14:19:44 +00:00
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
c9771f0b4a [1.0.X] Fixed #11270 -- Modified cache template tag to prevent the creation of very long cache keys. Thanks to 235 for the report and patch. 
Merge of r11068 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 15:14:04 +00:00
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