Commit Graph

9253 Commits

Author SHA1 Message Date
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
Timo Graham ae7f7a257f [1.2.X] Fixed #13912 - Fixed AliasMatch regex in modwsgi docs. Thanks SmileyChris for the report.
Backport of r15115 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-30 13:30:37 +00:00
Timo Graham cd2cf87243 [1.2.X] Fixed #14842 - Indent the model Meta options. Thanks adamv.
Backport of r15110 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:34:40 +00:00
Timo Graham 6c51b80c04 [1.2.X] Fixed #13452 - Document that regroup can be used with any template lookup. Thanks shacker for the suggestion and draft patch.
Backport of r15108 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:21:28 +00:00
Timo Graham 863240e336 [1.2.X] Fixed #14712 - Add an example for the post_syncdb signal. Thanks Frank Wiles for the patch.
Backport of r15104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:48:50 +00:00
Timo Graham b5a7ac4fff [1.2.X] Fixed #12193 - Add details to the i18n documentation for translation of model classes (relations and methods). Thanks Maxime Petazzoni and Ramiro for work on the patch.
Backport of r15102 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:39:44 +00:00
Timo Graham 235f29fa37 [1.2.X] Fixed #13961 - note that reverse URL lookups can't be done within a blocktrans tag. Thanks garrison for the report and richardb and zerok for work on the patch.
Backport of r15100 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 14:23:10 +00:00
Timo Graham 6ace3a9313 [1.2.X] Fixed #14277 - Clarify path names in modwsgi docs; thanks neitpiet for the report, elbarto for the patch.
Backport of r15098 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:59:51 +00:00
Timo Graham 6510bb76c6 [1.2.X] Fixed #14959 - Add a link to localflavor in the model field docs. Thanks PaulM for the suggestion, elbarto for the patch.
Backport of r15096 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:47:58 +00:00
Ramiro Morales 9bb995c6e0 [1.2.X] Fixed #7726 -- Added validation of max_digits and decimal_places options to DecimalField model field. Thanks theevilgeek for the report and elbarto for the patch.
Backport of [15094] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 01:26:45 +00:00
Gabriel Hurley 116804fbb5 [1.2.X] Fixed a crossref formatting problem in the signals reference docs.
Backport of [15092] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:09:46 +00:00
Gabriel Hurley 8db865c8fb [1.2.X] Fixed #14403 -- Provided some extra resources on the difference between FloatField and DecimalField in the model field reference. Thanks to typeshige for the report and trebor74hr and dmedvinsky for the draft patch.
Backport of [15090] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:04:06 +00:00
Gabriel Hurley a3169e3e8e [1.2.X] Fixed #14905 -- Corrected some misleading linking and language in the FileField docs. Thanks to Keryn Knight for the report and draft patch.
Backport of [15088] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 23:25:28 +00:00
Gabriel Hurley d4e19c68e8 [1.2.X] Fixed #14912 -- Expanded documentation for the urlize template filter. Thanks to adamv for the draft patch.
Backport of [15086] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 22:54:32 +00:00
Timo Graham 4c37802679 [1.2.X] Fixed #11496 - note that DecimalField max/min_value should be type(decimal.Decimal); thanks adamv.
Backport of r15084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:56:33 +00:00
Timo Graham 031eb9983e [1.2.X] Fixed #14708 - Document available keys for form field error messages; thanks adamv.
Backport of r15080 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:16:25 +00:00
Timo Graham 483cddf23e [1.2.X] Fixed #14320 - Add a note about lack of timezone support in MySQL. Thanks RauntyDave for the suggestion, adamv for the patch.
Backport of r15078 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 13:36:12 +00:00
Timo Graham b0ce5fce73 [1.2.X] Fixed #13837 - Add geodjango packages for Ubuntu 10.04; thanks muanis and zerok for the patch.
Backport of r15075 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 00:13:13 +00:00
Timo Graham d514b1b23d [1.2.X] Fixed #13397 - Include third level headings in the TOC. thanks cyang for the suggestion, rleland for the patch.
Backport of r15073 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:58:41 +00:00
Timo Graham d5970df38e [1.2.X] Fixed #12313 - Add a note that QuerySet.delete() doesn't necessarily call obj.delete(). thanks FunkyELF for the suggestion.
Backport of r15071 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:47:14 +00:00
Timo Graham 93e42272a4 [1.2.X] Fixed #14890 - Clarify poll "index" page in tutorial. thanks dbaggott for the report.
Backport of r15069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:30:19 +00:00
Timo Graham c0335a30bc [1.2.X] Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch.
Backport of r15066 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:41:57 +00:00
Timo Graham 5ba7bac5e7 [1.2.X] Fixed #6181 - Document `django.views.decorators.http` - thanks adamv for the patch.
Backport of r15064 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:28:04 +00:00
Alex Gaynor 05588a1897 [1.2.X] Converted the Czech localflavor tests to be unittests. We have always been at war with doctests. Thanks to Idan Gazit. Partial backport of [15062].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 07:47:25 +00:00
Timo Graham b1487c499b [1.2.X] Fixed #13949 - Note that readonly fields can't be modified via custom clean methods. thanks alk for the suggestion and elbarto and Gabriel Hurley whose language I used in the final patch.
Backport of r15060 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 21:51:51 +00:00
Jannis Leidel 79e64d7cff [1.2.X] Converted Swedish localflavor tests from doctests to unittests. Thanks, Idan Gazit!
Backport from trunk (r15057).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 11:49:45 +00:00
Timo Graham 89cb543f9e [1.2.X] Fixed #14000 - Remove versionadded/changed tags for 1.0. thanks ramiro!
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:46:36 +00:00
Timo Graham 40f2bb37c9 [1.2.X] Fixed #13020 - add clarifying note to SessionStore. thanks elbarto for the patch.
Backport of r15053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:46:44 +00:00
Timo Graham 3003ddec1a [1.2.X] Fixed #14927 - typo in model option docs. thanks tiliv.
Backport of r15051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:30:45 +00:00
Timo Graham ba7a151804 [1.2.X] Fixed #14956 - typo in messages docs. thanks alexarsh for the report.
Backport of r15049 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:27:21 +00:00
Andrew Godwin b168c1b1f9 [1.2.X] Fixed #14939: Don't strip ;-parameters from URLs in the test client.
Backport of [15027] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 21:39:34 +00:00
Ramiro Morales 6c32577d31 [1.2.X] Fixed #14576, #14946 - FormWizard.done() method doesn't get passed the last form in the list.
Thanks to cyberdelia for report and test, and steph for the initial patch.

Backport of r14574 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 15:32:59 +00:00
James Bennett 56007af321 [1.2.X] Update download_url for 1.2.4.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:12:24 +00:00
James Bennett c30be9739d [1.2.X] Bump to 1.2.4 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:52:07 +00:00