Commit Graph

5029 Commits

Author SHA1 Message Date
Russell Keith-Magee c7fc8891b1 [1.1.X] Fixed #13467 -- Corrected Japanese translation for password reset emails. Thanks to cdeyoung for the report.
Backport of r13084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:16:06 +00:00
Russell Keith-Magee bc9708735f [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach.
Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:15:34 +00:00
Nicola Larosa 0265a81449 [1.1.X] Updated the Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 06:42:52 +00:00
Nicola Larosa 9c14f23946 [1.1.X] Italian translation updated by makemessages, to be fixed
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 05:57:16 +00:00
Jannis Leidel 99a512300c [1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view.
Backport of r13069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-02 19:48:17 +00:00
Karen Tracey ef0e10cccf [1.1.X] Fixed #13453: Corrected typo in template syntax error message. Thanks jheasly.
r13061 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-01 02:32:45 +00:00
Russell Keith-Magee fe3b75e276 [1.1.X] Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case.
Backport of r13059 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 16:37:54 +00:00
Russell Keith-Magee 868acb3a6c [1.1.X] Fixed #13431 -- Corrected a unicode literal in select widgets. Thanks to gutworth for the report.
Backport of r13036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 14:12:36 +00:00
Russell Keith-Magee 2eb832a7e6 [1.1.X] Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case.
Backport of r13054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 14:12:12 +00:00
Ian Kelly 6f4563aced [1.1.X] Fixed a bug preventing cursor variables from being passed as bind parameters in the oracle backend. Backport of r13042 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-28 17:15:11 +00:00
Karen Tracey 33f097e50b Python 2.3 compatibility: replaced rsplit with something that works on 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-27 13:40:52 +00:00
Russell Keith-Magee a43464d67e [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help.
Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-25 13:23:14 +00:00
Russell Keith-Magee 58c1a67ff1 [1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch.
Backport of r13019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-23 14:30:29 +00:00
Russell Keith-Magee af48cad39e [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix.
Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 23:50:00 +00:00
Russell Keith-Magee 2f6317f89c [1.1.X] Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report.
Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 15:07:14 +00:00
Russell Keith-Magee f282099832 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch.
Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 11:57:04 +00:00
Justin Bronn be167b804d [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504.
Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 16:45:59 +00:00
Russell Keith-Magee e7ef1b220e [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch.
Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 11:15:21 +00:00
Karen Tracey 534dc44dba [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen.
r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 23:18:33 +00:00
Karen Tracey ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule.
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 18:49:37 +00:00
Karen Tracey ef6308db01 [1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 19:14:23 +00:00
Russell Keith-Magee 65a9d73069 [1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch.
Backport of r12964 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:43:03 +00:00
Russell Keith-Magee cf08ea496e [1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:00:46 +00:00
Karen Tracey eca89ea9be [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database
r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:27:53 +00:00
Brian Rosner f45e39ba8e Fixed #11957 -- exceptions in admin.py are no longer hidden after second request
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

Backport of r12956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:55:45 +00:00
Russell Keith-Magee 38056e82d7 [1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report
Backport of r12941 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:22:16 +00:00
Karen Tracey 46b9dd3048 [1.1.X] Fixed #11696: Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised.
r12950 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 12:43:39 +00:00
Justin Bronn bf5d71f2a7 [1.1.X] Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
Backport of r12948 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 19:01:02 +00:00
Russell Keith-Magee dce7515bef [1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch.
Backport of r12920 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 13:01:14 +00:00
Russell Keith-Magee 985c764a77 [1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.
Backport of r12918 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:38:30 +00:00
Russell Keith-Magee c01735dee7 [1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.
Backport of r12916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:08:45 +00:00
Russell Keith-Magee 0d6a776ccd [1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report.
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

Backport of r12912 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:17:46 +00:00
Russell Keith-Magee 17636ef999 [1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.
Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03 11:47:46 +00:00
Russell Keith-Magee ac0aea8910 [1.1.X] Fixed #11956 -- Modified the handling of m2m relationships between subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem.
Backport of r12908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-02 15:52:58 +00:00
Justin Bronn adfeb96227 [1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report.
Backport of r12905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 16:57:23 +00:00
Russell Keith-Magee 33052458c5 [1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix.
Backport of r12901 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 15:25:54 +00:00
Justin Bronn fa114305cb [1.1.X] No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects.
Backport of r12898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 18:58:19 +00:00
Russell Keith-Magee 7a7b9a0428 [1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix.
Backport of r12896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 13:51:20 +00:00
Russell Keith-Magee f0fa0808ea [1.1.X] Fixed #13253 -- Updated the help message for dumpdata to indicate that individual models can be serialized. Thanks to arowla for the report.
Backport of r12893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 11:34:32 +00:00
Brian Rosner 64e4ffc932 [1.1.X] Restored pre-r10062 behavior allowing None from formfield_callback to exclude itself from the form
Backported from r12891 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 08:08:29 +00:00
Justin Bronn 2613872969 [1.1.X] Fixed #10594 -- `GeoQuerySet` measurment methods no longer crash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch.
Backport of r12885 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 22:20:51 +00:00
Justin Bronn 8ef5daeb4f [1.1.X] Added another GDAL bug workaround for retrieving the correct coordinate dimension on geometry collections. Refs #12312.
Backport of r12883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 21:58:48 +00:00
Justin Bronn 08d00942d0 [1.1.X] Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field. Thanks, esizikov for bug report and initial patch.
Backport of r12880 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 18:34:09 +00:00
Justin Bronn ceb5261276 [1.1.X] Fixed #12312 -- Set the coordinate dimension on each component of geometry collections after transform (refines GDAL bug workaround introduced in r11629). Thanks, yourcelf for bug report.
Backport of r12878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 17:36:25 +00:00
Justin Bronn e53de431f2 [1.1.X] `OGRGeomType` now recognizes 2.5D types, and removes need for unnecessary workaround in `Layer.geom_type`; corrected geometry type in test VRT file. Refs #11433.
Backport of r11739 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:48:38 +00:00
Justin Bronn 127d46e6a5 [1.1.X] Fixed a brittle test case that was failing on PostGIS versions < 1.4.
Backport of r11729 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:41:29 +00:00
Jannis Leidel 5a6446b443 [1.1.X] Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan.
Backport from trunk, r12825.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 12:35:59 +00:00
Gary Wilson Jr 52e2e5cc96 [1.1.X] Removed out-of-date statement in markdown templatetags docstring (refs #1204).
Backport of r12858 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:56:56 +00:00
Russell Keith-Magee 7733895382 [1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch.
Backport of r12854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 15:15:55 +00:00
Justin Bronn 917fb7c993 [1.1.X] Peform smarter version detection of GDAL so development versions are supported.
Backport of r12852 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 20:01:40 +00:00