9252 Commits

Author SHA1 Message Date
Russell Keith-Magee
d073d30e45 [1.2.X] Fixed #15046 -- Added "CHROMEFRAME" as a user agent alias for various MSIE fixes. Thanks to chrj for the report and patch.
Backport of r15340 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:52:14 +00:00
Russell Keith-Magee
407208b0c2 [1.2.X] Fixed #14823 -- Corrected bootstrapping problems with register_serializers. Thanks to miker985@uw.edu for the report and draft patch.
Backport of r15336 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:43:30 +00:00
Russell Keith-Magee
81f844afb1 [1.2.X] Fixed #14818 -- Added explicit tests for the way that the cycle tag handles escaping. Thanks to steveire.
Backport of r15335 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:43:06 +00:00
Russell Keith-Magee
ee29ec62be [1.2.X] Fixed #15041 -- Added tests for the spaceless tag interacting with escaping. Thanks to steveire.
Backport of r15334 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:42:45 +00:00
Carl Meyer
10b4d93f50 [1.2.X] Fixed #15161 - Corrected handling of ManyToManyField with through table using to_field on its ForeignKeys. Thanks to adehnert for the report.
Backport of r15330 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 19:27:46 +00:00
Ramiro Morales
5b8c593053 [1.2.X] Fixed #15157 -- Modified evaluation of literals surrounded by '_(' and ')' in templates to be done at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report.
Backport of [15327] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 15:44:11 +00:00
Russell Keith-Magee
167d1cbdf5 [1.2.X] Made a transaction test optional unless transactions are supported.
Backport of r15325 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 14:55:27 +00:00
Carl Meyer
3af1bf8217 [1.2.X] Fixed #6456 - Excised FileField file deletion to avoid data loss. Thanks to durdinator for the report.
Backport of r15321 from trunk. Backported despite slight backwards-incompatibility due to potential for data loss.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 08:04:19 +00:00
Alex Gaynor
c4b0878b43 [1.2.X] Fixed #13206 -- call super().__init__() in Model.__init__ to allow mixins to do things there. Backport of [15317].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:52:52 +00:00
Alex Gaynor
4cee764a46 [1.2.X] Fixed #13159 -- properly quote aggregates in order_by. Backport of [15318].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:52:41 +00:00
Timo Graham
1418c215f4 [1.2.X] Fixed #15163 - typo in email docs; thanks metal for the report.
Backport of r15311 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 00:37:55 +00:00
Ramiro Morales
7d0d10ce20 [1.2.X] Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report.
Backport of [15309] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 15:44:41 +00:00
Carl Meyer
c09249731b [1.2.X] Fixed #14938 - Fixed save-as-new on inline formset with new forms.
Backport of r15306 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 05:06:43 +00:00
Carl Meyer
131d83b9cd [1.2.X] Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review.
Backport of r15303 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 03:39:38 +00:00
Ramiro Morales
f01e1cd425 [1.2.X] Fixed #14796 -- Modified order of operations performed on field names by the inspectdb command so it doesn't generates model fields with names equal to Python keywords. Thanks pappjm at gmail dot com for the report, mmcnickle for the fix and Alex for simplifying the tests.
Backport of r15296 and r15297 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 00:42:54 +00:00
Ian Kelly
5f923671e5 [1.2.X] Fixed #14149: Initialize the Oracle connection.operators at connection time since some systems don't seem to like the "TRANSLATE" trick.
Backport of r15299 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 21:48:27 +00:00
Jannis Leidel
63536a8ee5 [1.2.X] Updated all existing translations after changes to filesize translation strings made in [15291].
Backport from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 09:49:28 +00:00
Russell Keith-Magee
a116ae6633 [1.2.X] Fixed #14240 -- Enabled localization for the filesize filter. Thanks to David Danier for the report and patch.
Backport of r15290 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 08:33:51 +00:00
Russell Keith-Magee
dec539f360 [1.2.X] Fixed #15067 -- Modified the range checks on base36_to_int so you are guaranteed to always get an int, avoiding possible OverflowErrors. Thanks to Garthex for the report, jboutros for the patch, and kfrazier for the feedback.
Backport of r15288 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 08:04:14 +00:00
Russell Keith-Magee
a9cf3d2372 [1.2.X] Fixed #14982 -- Ensure that EMPTY_CHANGELIST_VALUE is honored for nullable foreign keys. Thanks to marcob for the report and fix, and to sontek for the test case.
Backport of r15286 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 07:10:18 +00:00
Timo Graham
ccd68f2d43 [1.2.X] Fixed #15141 - remove some deprecated storage engines from the MySQL notes; thanks mariuz for the suggestion.
Backport of r15282 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 16:21:25 +00:00
Ramiro Morales
80264702d0 [1.2.X] Added a modification missed in r15241 (backport of r15239 to this branch.)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 02:15:13 +00:00
Ramiro Morales
715c00df76 [1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244.
Also, changed an asertion not supported by unittest.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 01:37:08 +00:00
Ramiro Morales
cf7157a7a4 [1.2.X] Fixed #15122 -- Restored reporting of the template files tried in the texmplate loader post mortem section of the TemplateDoesNotExit 500 error debug page. Thanks rdrey for reporting this regression.
Backport of [15252] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-20 23:17:37 +00:00
Russell Keith-Magee
0958f32209 [1.2.X] Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

Backport of r15239 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:55:00 +00:00
Russell Keith-Magee
86239cbb56 [1.2.X] Refs #14661 -- Corrected (well... hacked around) a test failure under MySQL/MyISAM with the queries regression test.
Backport of r15238 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:54:28 +00:00
Jannis Leidel
b305cc33c5 [1.2.X] Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.
Backport from trunk (r15236).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 00:00:11 +00:00
Russell Keith-Magee
b9db129a7e [1.2.X] Fixed #13062 -- Ensure that runserver exposes all warnings requested at the command line. Thanks to gremmie for the report, and claudep for the patch.
Backport of r15233 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 13:16:07 +00:00
Russell Keith-Magee
aeddab3fc7 [1.2.X] Corrected an aggregation test failure under PostgreSQL, introduced by r15223. Thanks to Alex for the report.
Backport of r15230 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 02:40:16 +00:00
Timo Graham
0866dc1715 [1.2.X] Fixed #13628 - Discourage the use of doctests; thanks d0ugal for the suggestion.
Backport of r15227 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 19:27:23 +00:00
Russell Keith-Magee
be12f9e278 [1.2.X] Fixed #14707 -- Relax the protections on aggregate naming collisions when a ValuesQuerySet removes the colliding name. Thanks to Andy McKay for the report.
Backport of r15223 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 08:04:39 +00:00
Russell Keith-Magee
73b3611723 [1.2.X] Fixed #15062 -- Documented the fact that managers must be able to be shallow copied. Thanks to Ian Clelland for the report, and Łukasz Rekucki for the help diagnosing the problem.
Backport of r15220 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 06:45:35 +00:00
Russell Keith-Magee
84db894f44 [1.2.X] Fixed #15042 -- Ensured that email addresses without a domain can still be mail recipients. Patch also improves the IDN handling introduced by r15006, and refactors the test suite to ensure even feature coverage. Thanks to net147 for the report, and to Łukasz Rekucki for the awesome patch.
Backport of r15211 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:06:34 +00:00
Russell Keith-Magee
f7d04c37b9 [1.2.X] Corrected r15205 syntax to be Python2.4 compatible.
Backport of r15210 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:06:09 +00:00
Ramiro Morales
74a61e35b8 [1.2.X] Fixed #14948 -- Fixed a couple of cases where invalid model classes were passed to the database router when collecting reverse foreign key and many to many relationships. Thanks shell_dweller for the report and Harm Geerts for the patch.
This also enhances tests added in r15186.

Code in SVN trunk doesn't suffer from this problem because it was refactored in r14507.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 23:30:17 +00:00
Andrew Godwin
eb9ebb1931 [1.2.X] Fixed #11193 -- WSGI handler not properly handling lock on error in load_middleware. Thanks to Phillip Sitbon.
Backport of [15205] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 23:19:50 +00:00
Ramiro Morales
88dfbc50fb [1.2.X] Enhanced tests for r14857 added in r15185. Refs #14870. Thanks Harm Geerts.
Backport of [15201] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 03:53:01 +00:00
Luke Plant
0ebb02e9dc [1.2.X] Fixed some bugs with formtools tests.
Without these checks, it is possible for the tests to pass by virtue of
asserts never being reached for some reason (very possible in this case, due
to handling of security hashes).

Backport of [15198] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 23:25:23 +00:00
Luke Plant
444bda0be0 [1.2.X] Fixed #15075 - No longer possible to alter the form_list in FormWizard.process_step
Thanks to niels, stas for the report, and stas for the patch.

Backport of [15196] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 23:10:13 +00:00
Russell Keith-Magee
924bad822a [1.2.X] Fixed #13631 -- Made sure that max_length and min_length are retained as attributes on form fields. Thanks to mila for the report.
Backport of r15194 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 16:43:18 +00:00
Russell Keith-Magee
3ce473617c [1.2.X] Fixed #14975, #14925 -- Added some cache flushing to avoid some cross-test effects. Thanks to jsdalton and rpbarlow for the reports.
Backport of r15192 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 16:24:19 +00:00
Ramiro Morales
3297c09da4 [1.2.X] Fixed #2986 -- Made the JavaScript code that drives related model instance addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality to django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch.
Backport of [15131] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 15:47:36 +00:00
Russell Keith-Magee
58038a8b2b [1.2.X] Fixed #14176 -- Added forwards compatibility to the legacy syndication feed view. This allows class-based feeds to be deployed using the old-style feed view, as long as the feed requires no arguments (i.e., get_object returns None). Thanks to psychcf for the report, cwhaines for the investigation, and Andrew Godwin for the assist.
Backport of r15189 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 14:54:49 +00:00
Ramiro Morales
857b49d1c3 [1.2.X] Fixed #13668 -- Corrected database router methods invocation for ManyToMany fields without through models. Thanks craig.kimerer for the report and David Gouldin for the fix.
This also adds tests for r14857.

Backport of [15185] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 04:59:31 +00:00
Ramiro Morales
4d2708ff01 [1.2.X] Fixed #15024 -- Ensure that choice of L10N format module used is stable given a stable setup of format modules in ll/ and ll_CC/ dirs. Thanks David Reynolds for the report and suggestions leading to the solution.
Backport of [15183] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 03:13:39 +00:00
Ramiro Morales
0a0472f51b [1.2.X] Fixed #14951 -- Made the unique_for_{date,month,year} model field constraints to not fail when the related DateField is empty.
Existing modelforms tests were extended to cover this case and an equivalent set of tests was added for the model functionality.

Backport of [15167] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 00:15:31 +00:00
Ramiro Morales
0e49b8b8bd [1.2.X] Fixed #11434 -- Corrected style of arrow buttons located at the center of filter_{horizontal|vertical} m2m widgets to not give them focus borders that span from the left page border. Thanks defaultwombat for the report and patch.
Backport of [15144] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:59:49 +00:00
Ramiro Morales
9846fee794 [1.2.X] Fixed #11414 -- Made sure the calendar and clock popup windows in the admin don't have a negative vertical position. Thanks uipko for the report and fix.
Backport of [15143] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:57:45 +00:00
Ramiro Morales
10ca44ba8d [1.2.X] Fixed #11124 -- Expanded docstrings of the ModelAdmin has_{change|delete}_permission methods to make it clear they can be overriden to implement per-instance permission checks. Refs #12642.
Backport of [15126] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:54:17 +00:00
Ramiro Morales
90be6ca20d [1.2.X] Fixed #15032 -- Replaced 1.2.X implementation of admin changelist filtering security fix (r15031/r15033) with the one from trunk so another valid filter usage scenario (using model inheritance) is still possible. Thanks rene for reporting this.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:25:33 +00:00