9c3e9c7e65
Merge branch 'master-1.0.X' into trunk-1.0.X
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 08:49:03 +00:00
dcfafea408
[1.0.X] Fixed #9218 -- Simplified the fix from #9039 and added tests to ensure this case doesn't break again (and that the simplification didn't break anything).
...
[9341] from trunk. Also updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-05 19:55:51 +00:00
8e7eddd59d
[1.0.X] Updated Catalan translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-05 18:29:21 +00:00
ca5a2b0930
[1.0.X] Fixed `resolve_columns` so that pagination works again on Oracle GeoQuerySets; properly set svn:ignore on `sitemaps` subdir.
...
Backport of r9338 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-05 18:24:55 +00:00
dca8dbaf86
Fixed #9364 -- now uses the appropriate database table for inherited `GeometryField`s; now uses the `SpatialBackend` booleans in tests.
...
Backport of r9336 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-05 18:06:24 +00:00
8e4827e506
[1.0.X] Fixed #9418 -- When saving a model form, defer saving of file-type fields until after other fields, so that callable upload_to methods can use data from the other fields. Thanks to Bernd Schlapsi for the report and initial patch.
...
[9334] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-04 19:54:28 +00:00
4563060093
[1.0.X] Block doc fix for new function from svnmerge consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 21:48:00 +00:00
55943c0975
[1.0.X] Fixed #9497 - Doc typos. Many thanks ramiro.
...
[9330] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 20:53:47 +00:00
f1eb098d96
[1.0.X] Fixed #9495 -- Corrected typo in urls doc. Thanks seemant.
...
[9328] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 04:23:28 +00:00
6c069d2a71
[1.0.X] Fixed #9494 -- Ensure the foreign key in an inline formset is always present on the forms. Thanks Fugazi for the report.
...
Backport of r9326 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 22:26:44 +00:00
da151657a0
[1.0.X] Updated Argentinian spanish translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 21:07:02 +00:00
3905b071bc
[1.0.X] Fixed #9337 -- Use a link to Jython that actually works. Thanks admackin.
...
[9323] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 20:55:13 +00:00
1af32e8809
[1.0.X] Fixed #9354 -- Set missing svn:eol-style property on some localflavor .py files. Thanks Semmel.
...
[9321] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 20:42:17 +00:00
4c0895bf8f
Updated Swedish translations.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 20:32:17 +00:00
daf875259d
[1.0.X] Fixed #9374 -- Added missing close paren in serialization doc. Thanks jordy.
...
[9318] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 20:17:10 +00:00
19d164e051
[1.0.X] Fixed #9441 -- Corrected typo in file upload settings doc. Thanks gsf.
...
[9316] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:47:09 +00:00
fbf32bd000
[1.0.X] Fixed #9412 -- Corrected a couple of typos in the custom model field doc. Thanks carljm.
...
[9314] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:21:46 +00:00
d6a1e2ef7a
[1.0.X] Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor.
...
[9312] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:05:46 +00:00
587a2f9809
[1.0.X] Fixed #9491 -- Added a missing 'are' in what to read next. Thanks mh983.
...
[9310] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 18:07:47 +00:00
9009cac6b9
[1.0.X] Updated svnmerge metadata to indicate all non-blocked trunk changes have been merged.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 17:18:17 +00:00
3c23dc977c
[1.0.X] Block admin css refactor changesets from svnmerge consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 17:02:17 +00:00
662c34d8a7
[1.0.X] Updated German translation
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 13:14:30 +00:00
b66e3a3d5e
[1.0.X] Minor correction to setup.py
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 23:03:43 +00:00
237153045a
Bump version number and set download_url for 1.0.1 beta
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 23:02:58 +00:00
7b80af625b
[1.0.X] Fixed #8882 -- When a foreign key is among the unique_together fields in an inline formset properly handle it.
...
Backport of r9297 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 22:09:56 +00:00
4931612727
[1.0.X] Italian translation updated
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-30 13:23:37 +00:00
38d9b0919b
[0.5.X] Fixed #9462 -- Set the instance in an inline formset correctly so that None does not get passed through to the queryset. Thanks tobias and copelco for the ticket.
...
Backport of r9293 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 20:03:56 +00:00
84216ef05e
[1.0.X] Fixed #8966 -- Changed is_safe for length_is filter to False, since its return value is a boolean, not a string.
...
Thanks Thomas Steinacher, carljm, and SmileyChris.
Backport of r9291 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 19:04:59 +00:00
a8a07c2057
[1.0.X] Fixed #9039 take 2 -- Modified the new tests added in [9240] so they pass on Oracle.
...
Backport of [9288] from trunk, also updated svnmerge.py metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 16:30:19 +00:00
98b1b0794c
[1.0.X] blocked commit related to new feature from svnmerge.py consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 16:25:42 +00:00
9db7d53b60
Fixed `MySQLGeoField` to create spatial indexes again.
...
Backport of r9286 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 00:47:49 +00:00
e4ea2e12e1
Fixed #9448 -- `Layer` objects now carry a reference to their parent `DataSource`. Thanks, Matthew D. Hancher for the bug report.
...
Backport of r9284 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 22:30:56 +00:00
3517f8a5ac
Fixed #9391 -- `AdminSite` and `ModelAdmin` now exposed in `django.contrib.gis.admin` for API consistency and convenience.
...
Backport of r9282 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 18:12:31 +00:00
d2f6a84668
[1.0.X] Remove obsolete reference to "development version" in autoescaping docs.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 03:10:48 +00:00
bffc238a2f
[1.0.X] Fixed #7179 -- Changed breadcrumbs on the add page so that a link to the change view is not included when the user doesn't have permission for that view. Also added tests to ensure the link is not there when it shouldn't be, and there when it should be. Thanks for the report & patch alen__ribic.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 19:18:10 +00:00
d323ef20d3
[1.0.X] Fixed #9411 -- Changed the test from r9081 to be more robust across different database backends.
...
Backport of [9254] from trunk (I neglected to mention in the ticket this affected 1.0.X branch).
Also updated svnmerge metadata; all eligible fixes have been backported and all others blocked.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 18:13:35 +00:00
71ae6cbfa4
[1.0.X] block [9248] (feature) and [9263] (updated translation) from svnmerge consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 16:39:28 +00:00
74c799d21d
[1.0.X] Fixed #9307 -- Added the ability to pickle the Query class used by the
...
Oracle backend.
This allows Querysets to be cached for Oracle and should provide a model for
adding pickling support to other (external) database backends that need a
custom Query class.
Thanks to Justin Bronn for some assistance with this patch.
Backport of r9272 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:40:12 +00:00
0a1aafa581
[1.0.X] Fixed #9434 -- Added a note to the mod_python docs regarding requiring
...
PythonInterpreter in different VirtualHost blocks that share the same server
name. Thanks to Graham Dumpleton for the clarification.
Backport of r9268 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:30:53 +00:00
13d810efe4
[1.0.X] Fixed #9432 -- Revived documentation of ~Q usage.
...
Backport of r9267 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:30:04 +00:00
8613e6c53e
[1.0.X] Fixed #9430 -- Fixed documentation references to the HttpResponse
...
classes for returning HTTP status codes other than 200.
Backport of r9266 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:29:27 +00:00
122c1a9ac0
[1.0.X] Fixed #9339 -- Small update to the Simplified Chinese translation from lidaobing.
...
This is the same typo fix as r9264 on trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:46:59 +00:00
8158bd9380
[1.0.X] Fixed #9424 -- Typo fix.
...
Backport of r9258 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:21:04 +00:00
8cf2a05d35
[1.0.X] Fixed #9420 -- Fixed an exception type in the documentation of
...
Queryset.get(). Based on a suggestion from daveyjoe.
Backport of r9257 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:20:29 +00:00
568cb5d87c
[1.0.X] Fixed #9390 -- Restored some documentation about select_related() that
...
was accidentally lost in the docs refactor.
Backport of r9256 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:19:45 +00:00
73ea785d6b
[1.0.X] Fixed #9384 -- Fixed a couple of typos. Thanks, Thomas Güttler and romke.
...
Backport of r9255 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:19:07 +00:00
6c85612499
[1.0.X] Backed out r9250. I committed this to the branch by mistake; there's no
...
bug in functionality fixed by this. Refs #9383 .
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 06:15:54 +00:00
b52e45193f
[1.0.X] Fixed #9406 -- Ensure that each database column is only represented
...
once in the "ORDER BY" clause of an SQL statement.
Backport of r9251 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 06:11:37 +00:00
43f6136f0f
[1.0.X] Fixed #9383 -- Don't open a network connection for sending email if
...
there's nothing to send. Saves a bit of time when, for example, processing
500-error emails with no ADMINs configured. Based on a patch from Jesse Young.
Backport of r9248 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 04:41:58 +00:00
f762dcdf65
[1.0.X] Fixed #9410 -- I did not spell Portuguese correctly 18 months ago.
...
Fixed now. Thanks, kimus.
Backport of r9247 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 04:40:51 +00:00
Marc Fargas
Karen Tracey
Justin Bronn
Brian Rosner
Ramiro Morales
Ludvig Ericson
Jannis Leidel
James Bennett
Nicola Larosa
Malcolm Tredinnick