Commit Graph

6909 Commits

Author SHA1 Message Date
Russell Keith-Magee e7555c09d8 [1.0.X] Updated svnmerge properties for recent changes
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 15:00:01 +00:00
Russell Keith-Magee 6a21ada37e Fixed #9609 -- Modified the clean method of(Null)Boolean field to accept '1' and '0' as valid inputs. Thanks to psagers for the patch.
This is required to support the use of non-default form widgets such as RadioSelect when the data comes from MySQL, which uses 1/0 to represent booleans.

Merge of r10660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 14:56:35 +00:00
Russell Keith-Magee 5a089a5b00 [1.0.x] Fixed #10367 -- Corrected an example in the documentation for GenericRelation. Thanks to George Song for the patch.
Merge of r10659 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 14:55:50 +00:00
Russell Keith-Magee c5bc893248 [1.0.X] Updated svnmerge properties for recent changes
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 07:46:37 +00:00
Russell Keith-Magee 6e1869c46b [1.0.X] Fixed #9206 -- Clarified documentation of transaction handling in raw SQL, and error recovery for Postgres. Thanks to Richard Davies for the suggestion and draft text.
Merge of r10655 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 07:44:39 +00:00
Russell Keith-Magee 5f730ded91 [1.0.X] Fixed #10954 -- Corrected error in docs example describing extending the JSON serializer. Thanks to Glenn for the report.
Merge of r10654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 07:43:55 +00:00
Russell Keith-Magee d22290b2ce [1.0.X] Fixed #10349 -- Modified ManyToManyFields to allow initial form values to be callables. Thanks to fas for the report and patch.
Merge of r10652 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 07:16:30 +00:00
Russell Keith-Magee 3c222b1b8b [1.0.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-30 15:44:05 +00:00
Russell Keith-Magee 23c12c9c2b [1.0.X] Fixed #10134 -- Added unique_for_[date|day|month|year] validation to ModelForm handling. Thanks to Alex Gaynor for the patch.
Merge of r10646 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-30 13:49:14 +00:00
Russell Keith-Magee 655b602020 Updated svnmerge properties for recent checkins
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-28 14:33:31 +00:00
Russell Keith-Magee bf10bded7a [1.0.X] Fixed #10082 -- Modified BaseFormSet so that ordering checks work when the formset is empty. Thanks to Petr Marhoun for the report and test case, and bmathieu for the fix.
Merge of r10643 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-28 14:22:39 +00:00
Jannis Leidel e114ffb90a [1.0.X] Updated German translation, thanks zerok and bartTC
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-28 09:44:48 +00:00
Justin Bronn a7bfcba5db [1.0.X] Fixed #10888 -- May now insert NULL `GeometryField` values on Oracle.
Backport of r10631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-24 20:25:48 +00:00
Jacob Kaplan-Moss 3b3c05df72 [1.0.X] Fixed #10163: add an artificial ordering to querysets used by formsets, thus ensuring that POSTed data "lines up" correctly every time. Thanks to Karen Tracey for pointing in the right direction here.
This is a backport of [10625] from trunk, in a sense. In 1.1 I added a `QuerySet.ordered` property to deal with the logic of determining whether a queryset has ordering, but we can't add new features on a bugfix branch. So here in 1.0-land, the logic has to live in the formset. This smells, but it's better than having a bug.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-23 14:18:11 +00:00
Jacob Kaplan-Moss 91d063c405 [1.0.X] Fixed a needless list() coercion in in ChangeList. Refs #10163. Backport of [10624] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-23 14:18:02 +00:00
Jacob Kaplan-Moss 2ceee52303 [1.0.X] Fixed the tests from [9438] to work consistantly across databases. In particular, it was failing on newer versions of PostgreSQL after [10586]. Backport of [10626] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-22 22:41:18 +00:00
Karen Tracey c39b59e1d9 [1.0.X] Blocked r10621 from merge to branch, and updated svnmerge-integrated to reflect all changesets that have been merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-22 19:26:00 +00:00
Jacob Kaplan-Moss 421b22e8ee [1.0.X] Fixed #10208: `ModelAdmin` now respects the `exclude` and `field` atributes of custom `ModelForm`s. Thanks, Alex Gaynor. Backport of r10619 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-22 16:14:02 +00:00
Luke Plant cb92893598 [1.0.X] Fixed #10884 - more lenient regexp for matching forms in CSRF post-processing
Thanks to Ryszard Szopa for the report and fix

Backport of r10617


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 23:44:28 +00:00
Justin Bronn 725ffa57bb [1.0.X] Fixed #10839 -- `GeoQuery` now unpickles properly on Oracle.
Backport of r10615 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 22:40:49 +00:00
Justin Bronn f110f91a03 [1.0.X] Fixed various Oracle errata and test failures present in this branch (including not going to 11).
Backport of Oracle-related changes from trunk in r10197.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 21:25:47 +00:00
Justin Bronn ed5e3c3d2b [1.0.X] Fixed #10791 -- The GeoDjango test runner now respects the `--noinput` command-line option, thanks to seanl for ticket & patch.
Backport of r10601 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 20:14:42 +00:00
Karen Tracey 7ff22ef258 [1.0.X] Fixed #9651: fixed save_as with inline forms. Thanks, kmike and Mnewman.
Backport of r10353 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 18:58:32 +00:00
Karen Tracey 0d17a5c7c6 [1.0.X] Fixed #10693: updated params in the docs.
r10324 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 18:36:45 +00:00
Karen Tracey 65b64d5a08 [1.0.X] Unblocked r10324 and 10353. These changesets are applicable to the branch as well.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 18:34:27 +00:00
Matt Boersma 9fabfedcbe [1.0.X] Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 18:09:52 +00:00
Karen Tracey a486c1e9b6 [1.0.X] Added a test from Jamie Gennis to ensure #9848 doesn't reappear.
The bug itself was fixed at some point in the past months (there have
been a few improvements to update() recently). Fixed #9848. 

(Merge of r10528 from trunk.  Per comment in #9848 the fix was in r9967,
which was backported in r9968, thus it seems right to backport the new
test as well.)


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 17:56:54 +00:00
Karen Tracey 40a7b54a00 [1.0.X] Fixed #10601 -- Fixed edit inline display in admin for right-to-left locales. r10524 from trunk.
Also updated svnmerge metadata to reflect other changesets that have already been applied to the branch.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 17:48:00 +00:00
Karen Tracey f873836989 [1.0.X] Blocked a bunch of changesets related to new function from merge to branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-21 16:41:33 +00:00
Justin Bronn dd51cf9876 [1.0.X] Fixed #10364 -- Correctly identify test spatial database creation errors to the user.
Backport of r10603 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-20 00:11:36 +00:00
Malcolm Tredinnick 1c925f65b3 [1.0.X] Fixed #8752 -- Fixed django.contrib.auth tests to be locale-independent.
Patch from Koen Biermans.

Backport of r10599 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-19 03:44:06 +00:00
Malcolm Tredinnick ecb3906791 [1.0.X] Fixed #10773 -- Fixed some damage I did to the French in r10509.
Patch from Karen Tracey.

Backport of r10595 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-19 02:33:20 +00:00
Jacob Kaplan-Moss f0e7dca9d1 [1.0.X] Fixed #10694: correctly check permissions in the change password admin. Thanks, jturnbull. Backport of r10591 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 21:06:19 +00:00
Jacob Kaplan-Moss 283442a50e [1.0.X] Fixed #10002: inline file uploads now correctly display prior data. Thanks, dgouldin. Backport of r10588 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 20:34:42 +00:00
Jacob Kaplan-Moss 01669a356a [1.0.X] Fixed #9122: generic inline formsets now respect exclude and max_num. Thanks, Alex Robbins. Backport of [10586] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 20:17:17 +00:00
Jacob Kaplan-Moss 681a26ca90 [1.0.X] Fixed #9124: fixed `SelectDateWidget` with `required=False`. Thanks, Bernd Schlapsi. Backport of [10584] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 17:36:45 +00:00
Jacob Kaplan-Moss 2ee33cf63b [1.0.X\ Fixed #10156: `ModelMultipleChoiceField.clean` now does a single query instead of O(N). Thanks, Alex Gaynor. Also, I ported a few more doctests to unittests. Backport of r10582 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-18 15:52:58 +00:00
Matt Boersma c17547ac50 [1.0.X] Fixed introspection test case which caused "ORA-00972: identifier is too long" errors against Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-17 16:28:13 +00:00
Russell Keith-Magee 5acc58360d Updated svnmerge properties for 1.0.X branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 15:02:33 +00:00
Russell Keith-Magee f80769d089 [1.0.X] Fixed #9948 -- Corrected URLField validation to match RFC1035 (URL analog of #9890). Thanks to kratorius for the report and fix.
Merge of r10574 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 15:00:20 +00:00
Russell Keith-Magee 5f20587fcb [1.0.X] Fixed #9890 -- Modified the regex validation for email addresses to match RFC822/1035. Thanks to ozgur for the report, and kratorius for the patch.
Merge of 10573 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 14:59:37 +00:00
Russell Keith-Magee 33eca69b95 [1.0.X] Fixed #10779 -- Corrected description of an example in the files docs. Thanks to timo for the patch.
Merge of r10567 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 13:29:31 +00:00
Russell Keith-Magee e249b0ec4d [1.0.X] Fixed #10776 -- Added metadata targets for the contrib.admin docs, and used one of those targets to clarify the SlugField docs. Thanks to ernop for the suggestion, and timo for the patch.
Merge of r10564 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 13:28:58 +00:00
Russell Keith-Magee c89bf435c2 [1.0.X] Fixed #10704 -- Resurrected documentation for {% else %} clause on {% ifchanged %}, lost during docs refactor. Thanks to Tarken for the report.
Merge of r10563 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 13:28:16 +00:00
Russell Keith-Magee b8abb9b872 [1.0.X] Fixed #10822 -- Corrected minor typo in i18n docs. Thanks to prairiedogg for the report.
Merge of r10561 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 13:27:46 +00:00
Russell Keith-Magee e471bbe209 [1.0.X] Fixed #10458 -- Corrected the `next_month` and `previous_month` context variables provided with the generic month_archive view. The value returned now matches the docstring and the generic views documentation. Thanks to fperetti for the report and initial patch.
Merge of r10556 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-13 13:26:31 +00:00
Russell Keith-Magee 960d3172f6 [1.0.X] Fixed #9522 -- Modified handling of values in base serializer so that field subclasses can define their own value_to_string() method for serialization. Thanks to Alex Koshelev for the report and initial patch.
Merge of r10554 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-13 12:40:43 +00:00
Russell Keith-Magee 6be2d903f3 [1.0.X] Fixed #9804 -- Corrected the introspection of sequence names. This was causing problems when flushing tables that had many-to-many relations through an inherited table. Thanks to jdimov for the report.
Merge of r10552 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-13 07:16:44 +00:00
Russell Keith-Magee 2c6e3b30b3 [1.0.X] Fixed #10237 -- Corrected the handling of self-referential m2m fields when using multi-table inheritance. Thanks to Justin Lilly for the report and patch.
Merge of r10550 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-13 03:07:59 +00:00
Malcolm Tredinnick cab85015c5 [1.0.X] Fixed #10716 -- Fixed a couple of typos in Oracle testing setup.
Thanks, canarix.

Backport of r10547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-12 05:56:59 +00:00