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

9436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Gaynor
b28756bb29 [1.2.X] Fixed #11293 -- fixed using Q objects to generate ORs with aggregates. Backport of [15173]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-11 01:03:08 +00:00
Timo Graham
52999afaf5 [1.2.X] Fixed #15045 - Typo auto_add_now -> auto_now_add; thanks dr_gone for the report. 
Backport of r15171 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-11 00:30:24 +00:00
Andrew Godwin
663eb9656a [1.2.X] Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this. 
Backport of [15169] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-10 13:45:36 +00:00
Luke Plant
03ab30c3f1 [1.2.X] Fixed test failure when using Python 2.7 
Backport of [14309] from trunk.

Fixed #14947

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 16:13:58 +00:00
Andrew Godwin
989486d05d [1.2.X] Fixed #14888 -- Removing duplicated code in serialisers. Thanks to eric.fortin. 
Backport of [15163] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 15:14:24 +00:00
Andrew Godwin
d065e7eed2 [1.2.X] Fixed #14929 -- Move gzip_page docstring to the right place. Thanks adamv. 
Backport of [15161] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 14:56:02 +00:00
Andrew Godwin
34d306c71c Fixed #12295 -- Issue had already been fixed, but added test. Thanks tomevans222 and dpn. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 14:50:31 +00:00
Andrew Godwin
2b90267fa8 [1.2.X] Fixed #9029 -- Allow use of fieldname_id with get_or_create. Thanks to aaron and mrmachine. 
Backport of [15156] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 13:40:23 +00:00
Luke Plant
6849c5f3d5 [1.2.X] Fixed sending mail on 404s to fail silently. 
A failure in the e-mail system should not turn a 404 into a 500.

Backport of [15145] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-04 04:02:42 +00:00
Timo Graham
0b0e9457b2 [1.2.X] Fixed #10078 - Document use of locales in management commands. Thanks gregoire for the suggestion and ramiro for the patch. 
Backport of r15141 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 14:27:51 +00:00
Russell Keith-Magee
c76ab45fc6 [1.2.X] Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report. 
Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 14:01:44 +00:00
Russell Keith-Magee
9f49666114 [1.2.X] Fixed #15006 -- Removed some stray tabs in python code. Thanks to vanschelven for the report. 
Backport of r15134 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 13:52:28 +00:00
Timo Graham
12d5c09fdd [1.2.X] Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv. 
Backport of r15135 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 13:30:12 +00:00
Ramiro Morales
e501f50237 [1.2.X] Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report. 
Backport of [15124] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-31 23:06:07 +00:00
Luke Plant
fa4ac6f80c [1.2.X] Some small fixes to DB optimization docs. 
Backport of [15122] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-31 15:48:51 +00:00
Timo Graham
2d854539c3 [1.2.X] Fixed #14997 - A typo in "Overriding delete". thanks phunehehe for the report. 
Backport of r15117 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-31 13:10:05 +00:00