Commit Graph

8928 Commits

Author SHA1 Message Date
Russell Keith-Magee 29ea1bef21 [1.2.X] Fixed #14471 -- Corrected a regression in the use of methods on custom managers on related querysets. Thanks to Lucky for the report.
Backport of r14389 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 13:00:08 +00:00
Russell Keith-Magee 3a679cc1c4 [1.2.X] Fixed #14412 -- Pointed contrib.comments comments-url-redirect URLpattern at the actual view instead of the deprecated view. Thanks, subsume
Backport of r13995 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:39 +00:00
Russell Keith-Magee 181f26428a [1.2.X] Fixed #14414 -- Improved contenttypes shortcut() view to check that the ContentType has a model_class(). Thanks, subsume
Backport of r13994 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:21 +00:00
Russell Keith-Magee c120794b9d [1.2.X] Fixed the ugly spacing of 'BEGIN;' and 'COMMIT;' in the output of the sql/sqlall commands. They're no longer smooshed with the rest of the SQL.
Backport of r13993 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:04 +00:00
Russell Keith-Magee 4890ff1292 [1.2.X] Negligible formatting improvement to an error in management/sql.py
Backport of r13992 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:46 +00:00
Russell Keith-Magee 5d0f4edb8b [1.2.X] Fixed #14409 -- Fixed typo in docs/internals/documentation.txt. Thanks, kurtmckee
Backport of r13991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:27 +00:00
Russell Keith-Magee 4b8a391a3b [1.2.X] Fixed #14395 -- Fixed typo in error message in db/__init__.py. Thanks, agabel
Backport of r13990 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:05 +00:00
Luke Plant 36dd744460 [1.2.X] Fixed #14565 - No csrf_token on 404 page.
This solution doesn't have the negative side-effects of [14356].

Backport of [14377] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 11:58:51 +00:00
Luke Plant fcc283a52d [1.2.X] Reverted changeset [14356]
That fix for #14565 introduced test failures.  A better fix will
follow shortly.

Refs #14565

Backport of [14376] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 11:58:30 +00:00
Gabriel Hurley 12652baca6 [1.2.X] Fixed #14578 -- Corrected a typo in the Models topic docs. Thanks to tobych for the report and patch.
Backport of [14369] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 01:56:41 +00:00
Alex Gaynor e8c413a3e2 [1.2.X] Fixed #14577 -- fixed a docstring typo. Thanks to dauerbaustelle for the report and patch. Backport of [14364].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 20:08:54 +00:00
Ramiro Morales f2d6c6f54d [1.2.X] Documented options accepted by the runfcgi management command.
Also, modified our custom management command option docs xref parser
to also process those without a ``--`` prefix. --  Refs #14398.

Backport of [14361] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 16:10:48 +00:00
Ramiro Morales 99fbf0a46d [1.2.X] Fixed #14398 -- Changed runfcgi command to interpret the umask option argument as an octal value.
Thanks petteyg for report and aptiko for help with the fix.

Backport of [14360] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14362 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 16:04:33 +00:00
Luke Plant cbc110a467 [1.2.X] Fixed #14565 - No csrf_token on 404 pages
Thanks to gvangool for report and patch.

Backport of [14356] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-26 18:11:22 +00:00
Gabriel Hurley 4527535a93 [1.2.X] Fixed #14047 -- Updated the CommonMiddleware docs to include sending broken link email notifications. Thanks to Leon Matthews for the report and patch.
Backport of [14532] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 21:06:11 +00:00
Gabriel Hurley da5f6ef9e0 [1.2.X] Fixed #10545 -- Mentioned that template context variables only exist in the scope of th block in which they're assigned. Thanks to yaniv.haber for the report and timo for the patch.
Backport of [14350] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 20:52:04 +00:00
Alex Gaynor 1826039e00 [1.2.X] Converted model_inheritance doctests to unittests. We have always been at war with doctests. Backport of [14348].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 18:21:39 +00:00
Ramiro Morales 188a8e39fd [1.2.X] Removed obsolete 'date' filter -> 'now' tag link.
Backport of [14346] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 12:57:36 +00:00
Alex Gaynor 552acc652d [1.2.X] Fixed #14551 -- corrected a type in the remote user auth documentation. Thanks to mag for the report and fix. Backport of [14344].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 17:29:49 +00:00
Justin Bronn 2d4ddc0416 [1.2.X] Fixed #13617 -- `OSMGeoAdmin` now works again when `USE_L10N` (or `LANGUAGE_CODE`) is set. Thanks, Federico Hlawaczek, for workaround and piquadrat for patch.
Backport of r14341 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 09:41:08 +00:00
Gabriel Hurley 4b61183840 [1.2.X] Fixed #13040 -- Added info on where to import File class from to File reference docs, and improved Sphinx formatting. Thanks to stherrien for the report.
Backport of [14339] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 09:13:56 +00:00
Gabriel Hurley 92435e1e48 [1.2.X] Fixed #11441 -- Improved signal topic guide, particularly regarding the weak and dispatch_uid parameters to the Signal.connect method. Thanks to Mike_A and sayane for the report, and gremmie for the draft patch.
Backport of [14337] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 08:54:51 +00:00
Gabriel Hurley d269738f41 [1.2.X] Fixed #14526 -- Updated wording regarding the minimum Python version required for GeoDjango. Thanks to PaulM for the report.
Backport of [14335] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:29:53 +00:00
Gabriel Hurley 74fe397646 [1.2.X] Fixed #14541 -- Corrected an outdated bit of wording in the LANGUAGES setting docs. Thanks to akelm for the report and suggested fix.
Backport of [14333] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:15:27 +00:00
Gabriel Hurley f0416f693f [1.2.X] Fixed #14537 -- Added documentation on where validators can be imported from to Validators Reference docs, and improved Sphinx formatting and metadata. Thanks to rfugger for the report.
Backport of [14331] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:07:33 +00:00
Gabriel Hurley 2380a469d7 [1.2.X] Fixed #14545 -- Added ValidationError to Exceptions Reference docs and improved Sphinx metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 21:21:34 +00:00
Ramiro Morales af3de6a712 [1.2.X] Fixed #14173 -- Added sections about contrib apps-provided commands to django-admin.py docs.
Added documentation about changepassword, pointers to GeoDjango and sitemaps
commands, grouped them by app.

Backport of [14327] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 16:43:42 +00:00
Ramiro Morales 67ba914b87 [1.2.X] Fixed #14463 -- Fixed links to new location of date/time format specifiers docs.
Thanks epicserve for the report.

Backport of [14325] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 14:53:18 +00:00
Ramiro Morales f6de03b3a2 [1.2.X] Fixed #14223 -- Extended unification of exception raised in presence of integrity constraint violations.
The unification had been introduced in r12352 and native backend exceptions still
slipped through in cases that end in connection.commit() call. Thanks Alex,
Jacob and Carl for reviewing.

Backport of [14320] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 00:11:50 +00:00
Alex Gaynor 7377e4f92d [1.2.X] Fixed #14534 -- updated an out of date link in the docs. Thanks to d0ugal for the report and Frank Wiles for the patch. Backport of [14318].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-22 21:20:30 +00:00
Chris Beaven 54cb6ab1f3 [1.2.X] Fixed #14513 -- check fields with underscores for validity when ordering. Bonus points to Klaas van Schelven.
Backport from trunk (r14315)

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 21:22:11 +00:00
Chris Beaven 7f404e2628 [1.2.X] Revert [13850], this was a new feature not a bugfix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 21:21:43 +00:00
Alex Gaynor 0df4c1c411 [1.2.X] Ensure the mutliple_database tests leave the settings in the same state they found them. Backport of [14313].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 17:37:38 +00:00
Gabriel Hurley b855dbf676 [1.2.X] Fixed #14477 -- Corrects several instances of "add" and "remove" m2m_changed signal actions not having been updated to "pre_add", "post_add", etc. Thanks to slink and andrews for reporting several instances of it, and andrews for the draft patch.
Backport of [14304] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 22:15:26 +00:00
Gabriel Hurley 1160d81e44 [1.2.X] Fixed #14432 -- Added an import statement which was previously implied in tutorial 3's URLconf to make it as explicit as possible for new users. Thanks to gorus for the report and andrews for the patch.
Backport of [14302] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 21:19:50 +00:00
Gabriel Hurley c2cb82b3c7 [1.2.X] Fixed #14493 -- Corrected use of the wrong attribute in the model validation example pseudo-code. Thanks to wogan for the report and patch.
Backport of [14300] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 21:08:50 +00:00
Luke Plant f71f312283 [1.2.X] Fixed bug and test failure introducted in [14290]
Thanks Russell for alerting me.

Backport of [14294] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 08:02:07 +00:00
Luke Plant a7a91c2d40 [1.2.X] Fixed #14498 - Forms passed to FormWizard.process_step are not guaranteed to have cleaned_data
Thanks to stas for the report.

Backport of [14290] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 21:45:51 +00:00
Ramiro Morales 6a369d2ff3 [1.2.X] Fixed errors introduced in r14280 when running Django tests under Python < 2.6.
Backport of [14287] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 19:42:36 +00:00
Russell Keith-Magee ed195a6fd3 [1.2.X] Migrated many-to-many doctests. Thanks to George Sakkis for the patch.
Backport of r14285 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 12:28:48 +00:00
Russell Keith-Magee 0476014a76 [1.2.X] Migrated many-to-one doctests. Thanks to George Sakkis for the patch.
Backport of r14281 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 05:11:56 +00:00
Ramiro Morales 9bcdb620cb [1.2.X] Converted queries tests from doctests to unittests.
Thanks Russell and Alex for reviews and suggestions.

Backport of [14279] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 04:17:29 +00:00
Gabriel Hurley da17c2b84f [1.2.X] Fixed #7616 -- Added advice on unix socket permissions and umasks to fastcgi deployment documentation. Thanks to Malcolm Tredinnick for the report and advice, and PaulM and cramm for reviewing the patch.
Backport of [14276] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:58:34 +00:00
Gabriel Hurley 4ec58f702b [1.2.X] Fixed #14464 -- Strengthened the admonition regarding documentation versions at the end of the install docs. Thanks to PaulM for the report.
Backport of [14274] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:28:00 +00:00
Gabriel Hurley 9dfdcf86be [1.2.X] Fixed #14426 -- Removed "mysite" import statements from examples that might teach people "bad habits" in regards to creating reusable apps.
Thanks to idahogray for assisting with the patch (and sorry for forgetting the attribution in the patch on trunk).

Backport of [14270] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:11:51 +00:00
Honza Král efcb7776a0 [1.2.X] Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley!
Backport from trunk (r14251).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-18 05:02:28 +00:00
Jannis Leidel 55d8c47d29 [1.2.X] Fixed a few other backporting-related bugs introduced in r14213.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 16:09:07 +00:00
Jannis Leidel 630b1fc09b [1.2.X] Removed stray code introduced in r14126 that broke the test suite.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 15:41:00 +00:00
Jannis Leidel 0e4737ec24 [1.2.X] Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal.
Backport from trunk (r14244).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 15:40:41 +00:00
Alex Gaynor 2a33115040 Corrected a suite of test failures when running under postgres. Backport of [14241].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 01:50:58 +00:00