Commit Graph

6302 Commits

Author SHA1 Message Date
Karen Tracey 3ced836c73 [1.0.X] Fixed #9514 -- Made admin change_form template correctly recognize/report when a form has only a single error.
[9371] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-09 18:54:12 +00:00
Karen Tracey dc0389cca0 [1.0.X] Fixed #5748 -- Made floatformat filter round properly on all platforms and handle NaN input correctly on Windows. Also added tests for these cases. Thanks for the report and initial patch to SmileyChris and PJCrosier.
[9369] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-08 01:53:20 +00:00
Jannis Leidel f56df044dc [1.0.X] Updated German translation after r9364
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 21:37:08 +00:00
Karen Tracey 335f4ac03d [1.0.X] Fixed #6160, #9111 -- Consistently apply conditional_escape to form errors and labels when outputing them as HTML.
[9365] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 19:53:36 +00:00
Karen Tracey 675ee5c137 [1.0.X] Fixed #9506 take 2 -- Marked the message properly for translation, in both places it appears in the source.
[9363] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 16:47:13 +00:00
Karen Tracey 0776ba048a [1.0.X] Fixed #9506 -- Marked error string for translation.
[9360] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9362 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 14:50:23 +00:00
Karen Tracey 1cbf9a93c6 [1.0.X] Block trunk translation updates from snvmerge to branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 14:47:54 +00:00
Russell Keith-Magee 6be20bf64c [1.0.X] Fixed #9011 -- Corrected handling of fixture files that contain errors to correctly report the broken fixture name. Thanks to jlrivitti@gmail.com for the report and initial patch.
Merge of [9357] and [9358] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 11:27:33 +00:00
Russell Keith-Magee 697f73f488 [1.0.X] Fixed #9518 -- Corrected example JSON snippet in fixture documentation. Thanks to claude@2xlibre.net for the report.
Merge of [9355] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 10:48:20 +00:00
Marc Fargas 603dcb89bb Refs #9526, Updated Arabic translation; Thanks Ossama M. Khayat.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 09:41:20 +00:00
Marc Fargas 8edcfc030e [1.0.X] Refs #9513, Updated Polish translation; Thanks Jarek Zgoda.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 09:40:56 +00:00
Marc Fargas 19dd6c3566 [1.0.X] Fixed #9512, Updated French translation. Thanks David Larlet.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 09:34:01 +00:00
Marc Fargas 65d00e5db8 [1.0.X] Refs #9419, Typo in Russian translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 09:18:58 +00:00
Marc Fargas e33c6f1382 [1.0.X] Refs #9511, Updated Hebrew translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-06 09:12:31 +00:00
Marc Fargas 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
Karen Tracey 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
Marc Fargas 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
Justin Bronn 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
Justin Bronn 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Brian Rosner 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
Ramiro Morales 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
Karen Tracey 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
Karen Tracey 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
Ludvig Ericson 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Jannis Leidel 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
James Bennett 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
James Bennett 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
Brian Rosner 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
Nicola Larosa 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
Brian Rosner 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Justin Bronn 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
Justin Bronn 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
Justin Bronn 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
James Bennett 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
Karen Tracey 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
Karen Tracey 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