Commit Graph

9436 Commits

Author SHA1 Message Date
Gabriel Hurley de46b6687f [1.2.X] Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.
Backport of [15733] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:32:55 +00:00
Ramiro Morales 1091a8e73e [1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up.
Backport of [15731] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:45:07 +00:00
Gabriel Hurley ef53365a7d [1.2.X] Fixed #15541 -- Updated FAQ to point at djangosites.org instead of defunct wiki page. Thanks to aaugustin for the report and draft patch.
Backport of [15729] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:27:08 +00:00
Russell Keith-Magee 113a8c1f1c [1.2.X] Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates.
Backport of r15726 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:53:12 +00:00
Jannis Leidel a97396948b [1.2.X] Fixed wrong import introduced in r15697.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:47:46 +00:00
Jannis Leidel 0516b99875 [1.2.X] Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master.
Backport from trunk (r15722).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:47:39 +00:00
Jannis Leidel 1985ca77ea [1.2.X] Fixed #13411 -- Made sure URL fragments are correctly handled by the next_redirect utility of the comments apps. Thanks, timesong, dpn and Julien Phalip.
Backport from trunk (r15720).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:04:51 +00:00
Russell Keith-Magee ac87e4f8fa [1.2.X] Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch.
Backport of r15717 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:42:56 +00:00
Russell Keith-Magee 4c76896ead [1.2.X] Fixed #15530 -- Corrected typo in template loader deprecation message. Thanks to msaelices for the report and patch.
Backport of r15714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:38:08 +00:00
Russell Keith-Magee 76f5b4eb5c [1.2.X] Fixed #15532 -- Clarified the error message for unknown auth backends. Thanks to kmike for the report.
Backport of r15713 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:37:56 +00:00
Jannis Leidel 84f398e77c Fixed typo in r15710.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 21:47:55 +00:00
Jannis Leidel b34a08e070 [1.2.X] Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath.
Backport from trunk (r15709).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 21:37:29 +00:00
Jannis Leidel 7207481aa8 [1.2.X] Fixed #11223 -- Fixed logout view to use the 'next' GET parameter correctly as described in the docs, while only allowing redirection to the same host.
Backport from trunk (r15706).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 12:59:26 +00:00
Luke Plant 29fccc353c [1.2.X] Added file missing from [15696], sorry for breakage.
Thanks to Ramiro for letting me know. Refs #717.

Backport of [15699] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 18:55:39 +00:00
Luke Plant 58bd249283 [1.2.X] Fixed #717 - If-Modified-Since handling should compare dates according to RFC 2616
Thanks to Maniac for the report, julienb for the initial patch, and
especially to aaugustin for the final patch and tests.

Backport of [15696] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 14:34:03 +00:00
Ramiro Morales 8d3ee29847 [1.2.X] Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report.
Backport of [15678] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 03:07:25 +00:00
Ramiro Morales b5b5d3c280 [1.2.X] Fixed #15520 -- Fixed incompatibility with email module shipped with Python 2.4 introduced in r15669. Thanks dobcey for the report.
Backport of [15675] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 14:09:58 +00:00
Gabriel Hurley a5f71e1264 [1.2.X] Fixed #15365 -- Added a warning to the `contrib.markup` docs reminding users that the marked up output will not be escaped.
Backport of [15673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:40:55 +00:00
Gabriel Hurley 32ac8d913e [1.2.X] Fixed #15395 -- Documented the modules/import paths for the various decorators in `django.views.decorators`. Thanks to slinkp for the report.
Backport of [15671] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:26:48 +00:00
Ramiro Morales f5c0328fd3 [1.2.X] Fixed #13433 -- Changed default behavior of Django email message wrappers to not mangle lines starting with 'From '. Thanks Leo for the report and patch.
Backport of [15669] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 02:56:02 +00:00
Russell Keith-Magee 076ce17f0e [1.2.X] Converted the new contributions docs to unix line endings.
Backport of r15667 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 23:34:14 +00:00
Gabriel Hurley f1dd46b63d [1.2.X] Fixed #14702 -- Added a "needsinfo" resolution to Trac, and added supporting documentation on the new resolution and closing tickets in general.
Backport of [15665] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 22:14:17 +00:00
Gabriel Hurley a90e297f58 [1.2.X] Fixed #15492 -- Documented the `invalid_date` and `invalid_time` error keys for !SplitDateTimeField. Thanks to lode for the report.
Backport of [15663] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 21:18:16 +00:00
Luke Plant e233917832 [1.2.X] Fixed #15368 - test failures due to regression with RequestContext
Thanks to cyberdelia for the reports on this.

Backport of [15660] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 00:28:53 +00:00
Russell Keith-Magee 120d01c20b [1.2.X] Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses the right field name when the ForeignKey has a to_field definition. Thanks to David Cramer for the report, Collin Anderson for the fix, and Julien Phalip for the test.
Backport of r15657 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:49:15 +00:00
Russell Keith-Magee 3a31023783 [1.2.X] Fixed #11447 -- Ensured that ForeignKey widgets in a list-editable admin changelist won't wrap split the widget. Thanks to patrick@vonautomatisch.at for the report, and Julien Phalip for the patch.
Backport of r15656 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:49:00 +00:00
Ramiro Morales 049b3ff8a2 [1.2.X] Fixed #15424 -- Corrected lookup of callables listed in admin inlines' `readonly_fields` by passing the right ModelAdmin (sub)class instance when instantiating inline forms admin wrappers. Also, added early validation of its elements. Thanks kmike for the report and Karen for the patch fixing the issue.
Backport of [15650] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 02:00:18 +00:00
Luke Plant 9a5ebbcac9 [1.2.X] Fixed #15493 - csrf_migration_helper.py parsing fix.
Thanks to 'john' for the patch.

Backport of [15647] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 09:45:54 +00:00
Gabriel Hurley 69af5573c3 [1.2.X] Fixed #14401 -- Added a contributing howto guide for new users. Thank you to everyone who added their advice, feedback, and wisdom to the wiki article while constructing this new guide.
Backport of [15645] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 02:51:16 +00:00
Russell Keith-Magee 97e81089a2 [1.2.X] Fixed #15491 -- Added a CDATA block and closed a stray tag in the comments HTML. Thanks to Jonathan Slenders for the report.
Backport of r15642 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 01:08:04 +00:00
Russell Keith-Magee 5b342d7c30 [1.2.X] Fixed #15490 -- Added some missing semicolons in admin javascript. Thanks to Jonathan Slenders for the report and patch.
Backport of r15641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 01:07:49 +00:00
Jacob Kaplan-Moss 062cbfb1ec [1.2.X] Prevented non-admin users from accessing the admin redirect shortcut.
If the admin shortcut view (e.g. /admin/r/<content-type>/<pk>/) is
publically-accessible, and if a public users can guess a content-type ID
(which isn't hard given that they're sequential), then the redirect view could
possibly leak data by redirecting to pages a user shouldn't "know about." So
the redirect view needs the same protection as the rest of the admin site.

Thanks to Jason Royes for pointing this out.

Backport of [15639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-24 13:38:32 +00:00
Ramiro Morales fa1a74ff3c [1.2.X] Fixed #14012 (again) -- Admin app: Don't show the full user edition view after adding a user in a FK popup. Thanks dburke for reporting this regression introduced in r14628.
Backport of [15637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-24 01:09:23 +00:00
Simon Meers f87936fa89 [1.2.X] Fixed #15375 -- clarified apparent contradiction in Form Wizard documentation. Thanks to codysomerville for the report.
Backport of r15633 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-23 09:44:40 +00:00
Russell Keith-Magee 8ed8b249ef [1.2.X] Fixed #15371 -- Ensure that a superuser created with the createsuperuser management command with --noinput has an invalid password, not a blank password. Thanks to yishaibeeri for the report and patch.
Backport of r15631 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:35:25 +00:00
Luke Plant e89c471ebb [1.2.X] Removed example CSRF jQuery code from release notes, replacing with link to improved code in the CSRF docs
Backport of [15628] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:30:10 +00:00
Ramiro Morales dc9d639c0a [1.2.X] Fixed #13510 -- Corrected colspan of non-field-specific error messages in admin app tabular inlines so it isn't greater than the actual number of field cells. Thanks KyleMac for the report and Julien Phalip for the patch fixing the issue.
Backport of [15626] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 03:25:55 +00:00
Timo Graham 53663be502 [1.2.X] Fixed #15257 - Add a link about field lookups to the tutorial; thanks dwillis.
Backport of r15624 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 00:58:38 +00:00
Luke Plant a6114e1a14 [1.2.X] Fixed error that was introduced in [15601] causing lots of test failures on 1.2.X
In 1.2.X and earlier, the test client adds the 'template' attribute to
responses, while in trunk it adds 'templates', hence the confusion.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 22:56:01 +00:00
Luke Plant 31d0f2fa29 [1.2.X] Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch.

Backport of [15619] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:20:41 +00:00
Luke Plant 25c217bc17 [1.2.X] Fixed #14835 -- Corrected a lack of indentation in the reST markup for docs/ref/contrib/admin/index.txt and reflowed the text accordingly.
Thanks to cogat for the report.

Backport of [14830] from trunk - approximate, because other changes have
made it very hard to do exactly.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:04:25 +00:00
Chris Beaven 58c4aca370 Remove reference to use_l10n which snuck in from a backport from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 18:45:46 +00:00
Luke Plant 5baa06ecfe [1.2.X] Fixed HTML error in admin when using list_editable.
Backport of [15616] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 18:44:42 +00:00
Luke Plant e63db6597c [1.2.X] Fixed #15349 - Bound FormSet produces bound empty_form
Thanks to hidde-jan for the report and patch.

Backport of [15614] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 16:14:04 +00:00
Luke Plant c326ec48d8 [1.2.X] Fixed #14099 - BaseModelFormSet should use _should_delete_form
Thanks to kenth for the report and patch.

Backport of [15612] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:32:12 +00:00
Luke Plant 4df0e5ff84 [1.2.X] Fixed #11707 - limit_choices_to on a ForeignKey can render duplicate options in formfield
Thanks to Chris Wesseling for the report and patch.

Backport of [15607] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:08:06 +00:00
Russell Keith-Magee fee8a49866 [1.2.X] Fixed #15359 -- Ensure that the -h option is always honored by django-admin.py. Thanks to teubank for the report.
Backport of r15605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:06:28 +00:00
Russell Keith-Magee bf4507f255 [1.2.X] Fixed #15364 -- Ensure files are closed correctly during file tests. Thanks to Mila for the report and patch.
Backport of r15604 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:06:12 +00:00
Karen Tracey e636db1066 [1.2.X] Fixed #15362: Added explicit deletion of file to test, needed now since files are no longer auto-deleted when a referencing object is deleted. Thanks mila.
r15602 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 12:40:55 +00:00
Chris Beaven 39b8a1f7ed [1.2.X] Fix broken tests due to changes in r15591 by updating the test store_rendered_templates signal handler.
Backport of r15600 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 10:13:11 +00:00