Karen Tracey
9bdfe1765f
[1.1.X] Move the tests added for #12302 to where some other tests for debug page responses already existed.
...
r12723 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:23:52 +00:00
Luke Plant
55c71d3ed5
[1.1.X] Fixed #11940 - ModelForm evaluates callable default values on form class creation
...
Thanks to Harm Geerts for the report and initial patch.
Backport of [12721] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:13:08 +00:00
Luke Plant
6c507a5cd4
[1.1.X] Fixed #12240 - select_related doesn't work correctly when mixing nullable and non-nullable keys
...
Thanks to embe for report and Alex for fix.
Backport of 12719 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 12:59:50 +00:00
Karen Tracey
9b2ac2ad2d
[1.1.X] Made a few Python 2.3 compatibility test fixes.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 04:37:45 +00:00
Karen Tracey
b86b38f618
[1.1.X] Fixed #6228 : Changed common middleware to respect request-specific urlconf. Thanks trey, skevy, and mikexstudios.
...
r12704 and r12705 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 20:14:34 +00:00
Russell Keith-Magee
24b969d28e
[1.1.X] Fixed #12876 -- Corrected a problem with recursive relations under deepcopy. Thanks to elachuni for the patch.
...
Backport of r12700 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 07:18:46 +00:00
Joseph Kocherhans
72a659f8f8
[1.1.X] Fixed #12858 . DateTime related widgets now handle custom formats properly in _has_changed. Backport of r12698 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 04:06:23 +00:00
Joseph Kocherhans
e8c768910a
[1.1.X] Fixed #12913 . Fields with choices now respect show_hidden_initial as a keyword argument to formfield. Backport of r12696 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 01:52:48 +00:00
Joseph Kocherhans
55bcc8ac30
[1.1.X] Fixed #12734 . Deferred fields will now be properly converted to python when accessed. Backport of r12579 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 19:17:29 +00:00
Karen Tracey
daec734584
[1.1.X] Fixed #6918 , #12791 : If an email message has an encoding, actually use that encoding to encode body and headers. Thanks for patch with tests oyvind.
...
Backport of r12683 and r12688 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 16:07:05 +00:00
Karen Tracey
215615ad58
[1.1.X] Fixed #12151 : Ensured the comments code does not cause a server error when a request comes in for a comment specifying an invalid primary key value. Thanks thejaswi_puthraya.
...
r12681 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-05 20:21:28 +00:00
Karen Tracey
b5a2f64cbb
[1.1.X] Fixed #12083 : Ensured generating debug 404 page won't raise a key error. Thanks pigletto.
...
r12679 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-05 18:58:47 +00:00
Karen Tracey
cc65ac9e2b
[1.1.X] Fixed the files test to not care whether the names are reported as bytestrings or unicode. Refs #12898 .
...
r12676 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 13:46:40 +00:00
James Bennett
faa341e61b
[1.1.X] Expanded the fix in [12663] to cover CSS declarations, which were also affected by the bug. Refs #12879 . Backport of [12665] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:19:23 +00:00
James Bennett
1d12aa2cfe
[1.1.X] Fixed #12879 : Declaring the same JS file multiple times in a single Media instance now only includes that file once. Backport of [12663] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:03:47 +00:00
Karen Tracey
c6e662cd6e
[1.1.X] Fixed #12898 : Reverted a change that assumed the file system encoding was utf8, and changed a test to demonstrate how that assumption corrupted uploaded non-ASCII file names on systems that don't use utf8 as their file system encoding (Windows for one, specifically). Thanks for the report to vrehak.
...
r12661 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 22:02:02 +00:00
Karen Tracey
b50b3cf75c
[1.1.X] Fixed #11522 : Restored ability of http redirect responses to correctly handle redirect locations with non-ASCII chars.
...
r12659 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 19:41:39 +00:00
Russell Keith-Magee
755a0f6d96
[1.1.X] Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch.
...
Backport of r12654 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 07:47:41 +00:00
Karen Tracey
69fb5c25bd
[1.1.X] Fixed #11710 : Made a small test change to ensure utf-8 bytestrings in verbose_names don't cause a server error when the admin change log message is built. The necessary code fix was made for #12966 in r12627. Thanks Rupe.
...
r12650 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 03:32:49 +00:00
Karen Tracey
08a698ed46
[1.1.X] Fixed #11465 : Ensure nonexistent pks enterd in an admin raw id field do not
...
cause a server error. Thanks for report and initial patch sacre@wp.pl .
Backport of r12648 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 02:39:26 +00:00
Jacob Kaplan-Moss
7e1c67040c
[1.1.X] Fixed #11012 : don't needless convert cache values to unicode.
...
This means you can now successfully store binary blogs, such as compressed data,
in the cache.
Thanks to Matt Croydon for the final patch.
Backport of [12637] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:14:18 +00:00
Karen Tracey
5f3a53036d
[1.1.X] Fixed #11791 : Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin.
...
r12631 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 18:46:20 +00:00
Karen Tracey
1b2b3b0dba
[1.1.X] Fixed #12302 : Modified force_unicode to avoid raising unicode errors when
...
handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.
r12621 and r12622 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-28 15:29:14 +00:00
Karen Tracey
e0679ef165
[1.1.X] Removed more stray tabs in Python files.
...
Applicable parts of r12616 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 16:37:32 +00:00
Justin Bronn
499c715513
[1.1.X] Fixed #12608 -- No longer return inconsistent results when using values and values_list in conjunction with annotate. Thanks, Charlie Leifer.
...
Backport of r12505 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:11:58 +00:00
Jannis Leidel
7c23a5303c
[1.1.X] Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales.
...
Backport of r12471.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:00:42 +00:00
Jannis Leidel
079d9f3738
[1.1.X] Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.
...
Backport of r12447.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:00:11 +00:00
Karen Tracey
14fbee6958
[1.1.X] Added force_unicode to a test (needed for Python 2.3 compatibility).
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 16:40:37 +00:00
Russell Keith-Magee
b6bd766d88
[1.1.X] Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
...
Backport of r12602 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 15:38:50 +00:00
Russell Keith-Magee
3bda1f5bd3
[1.1.X] Fixed #6191 , #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.
...
Backport of r12598 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 13:43:28 +00:00
Russell Keith-Magee
a52f1dd95c
[1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch.
...
Backport of r12489 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 11:12:14 +00:00
Karen Tracey
6ca3154bcd
[1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 05:14:36 +00:00
Jannis Leidel
b711400278
[1.1.X] Fixed #12910 - Only test extracting translation strings if xgettext can be found on PATH.
...
Backport from r12475.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 17:14:37 +00:00
Joseph Kocherhans
6bf75fd3f5
[1.1.X] Fixed #12119 . Changed smart_split to stop splitting on whitespace in quotes. Backport of r12581 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 20:56:09 +00:00
Joseph Kocherhans
07f2d19269
[1.1.X] Fixed #12546 . Objects with a __len__ that returns 0 can now be serialized. Thanks, casobn for the report and Alex Gaynor for the patch and tests. Backport of r12576 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 16:06:10 +00:00
Joseph Kocherhans
692d122ce2
[1.1.X] Fixed #12818 . SQLite now properly quotes strings for date extraction and truncation. Backport of r12573 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 15:40:33 +00:00
Joseph Kocherhans
18c800f1a3
[1.1.X] Fixed #12152 . DoesNotExist and MultipleObjectsReturned now subclass their parent model's exceptions. Backport of r12567 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:42:03 +00:00
Joseph Kocherhans
d75e23ce9b
[1.1.X] Fixed #9336 . Changed CheckboxInput to render 'True' and 'False' input strings as checked or not instead of as a value attribute. Backport of r12556 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 23:48:44 +00:00
Jacob Kaplan-Moss
778b7bcd19
[1.1.X] Fixed an unspecified ordering in the expression tests that could lead to a heisenbug.
...
Backport of [12553]
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 23:04:25 +00:00
Joseph Kocherhans
860497c9b3
[1.1.x] Fixed #12878 . Formset-wide errors are now rendered properly as html. Backport of r12548 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 21:09:27 +00:00
Joseph Kocherhans
f48cf954f8
[1.1.X] Fixed #12070 . Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. Backport of r12539 from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 18:53:42 +00:00
Joseph Kocherhans
6510822679
[1.1.X] Fixed #12561 . InlineAdmin now respects can_delete=False. Backport of [12533] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 17:26:20 +00:00
Joseph Kocherhans
d23f2249ea
[1.1.X] Fixed #12285 . ModelForm raises a more informative error if it doesn't have a model class defined. Backport of [12526] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:12:29 +00:00
Joseph Kocherhans
fd0c365690
[1.1.X] Fixed #11860 . Changed NullBooleanSelect's _has_changed method to repect differences between None and False. Backport of [12523] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 14:20:35 +00:00
Justin Bronn
6a28f581c0
Fixed #12855 -- QuerySets? with extra where parameters now combine correctly. Thanks, Alex Gaynor.
...
Backport of r12502 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:59:04 +00:00
Joseph Kocherhans
16efc1a92e
[1.1.X] Fixed #12820 . Implemented other dict methods for MergeDict. Backport of [12498] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 00:08:03 +00:00
Jacob Kaplan-Moss
bd79677e29
[1.1.X] Fixed #11687 : the `add` filter is now less failsome when faced with things that can't be coerced to integers.
...
Backport of [12497] from trunk, although the fix here is slightly different to
avoid adding new behavior to a bugfix branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:41:29 +00:00
Russell Keith-Magee
8b415e7299
[1.1.X] Fixed #7777 -- Added validation handling for NaN, Inf and -Inf in DecimalFields. Thanks to thebitguru for the patch.
...
Backport of r12490 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 15:02:45 +00:00
Jannis Leidel
77192eb661
[1.1.X] Fixed #12716 - Typo in the admin change list template. Thanks, kbrownlees.
...
Backport of r12398 and r12448.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:33 +00:00
Jannis Leidel
df1ad561b1
[1.1.X] Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales.
...
Backport of r12442.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:04 +00:00
Jannis Leidel
6a3c915933
[1.1.X] Fixed #4695 - Worked around a problem of xgettext ignoring some translation strings in JavaScript files. Thanks, Ramiro Morales.
...
Backport of r12441.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:51:43 +00:00
Jacob Kaplan-Moss
4384b164cc
[1.1.X] Fixed (what I hope is) the last Python 2.4 incompatibility, this one in the httpwrappers tests.
...
Backport of [12436] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-15 02:18:15 +00:00
Jacob Kaplan-Moss
a9879b1438
[1.1.X] Fixed #6054 : work around PIL's installation brokeness by detecting either of the two ways it can end up being installed.
...
Backport of [12429] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:33:01 +00:00
Russell Keith-Magee
166405b2e4
[1.1.X] Fixed #11944 -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch.
...
Backport of r12426 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:44:07 +00:00
Russell Keith-Magee
f30a4b368c
[1.1.X] Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch.
...
Backport of r12425 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:43:33 +00:00
Russell Keith-Magee
d751f2cade
[1.1.X] Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
...
Backport of r12423 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:06:13 +00:00
Russell Keith-Magee
bf11ab2b21
[1.1.X] Fixed #12011 -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch.
...
Backport of r12419 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:32:01 +00:00
Russell Keith-Magee
f764d7ffb1
[1.1.X] Fixed #11483 -- Modified db cache backend to use db backend functions for date conversion, avoiding problems under Jython. Thanks to Leo Soto for the report and patch.
...
Merge of r12411 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:12:38 +00:00
Russell Keith-Magee
d4a34b5508
[1.1.X] Fixed #11623 -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix.
...
Backport of r12410 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:11:47 +00:00
Russell Keith-Magee
3792b2cd9f
[1.1.X] Fixed #12399 -- Added handling for memcache timeouts longer than 30 days. Thanks to houdinihound for the report, and gciotta for the patch.
...
Backport of r12408 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:09:56 +00:00
Karen Tracey
ad08f07722
[1.1.X] Fixed #11535 : Corrected SQL generated for queries involving generic relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review.
...
r12405 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 19:24:44 +00:00
Jannis Leidel
01d4316874
[1.1.X] Fixed #3594 - Added ability to discard the language catalog in the JavaScript i18n view in case the selected language is English but no English translation catalog actual exists, e.g. due to being the language translated from. Thanks to msaelices, aryx and Ramiro Morales.
...
Backport of r12384.
Conflicts:
tests/regressiontests/views/tests/i18n.py
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 01:54:22 +00:00
Karen Tracey
88bd40c551
[1.1.X] Corrected app_loading test so it does not generate a key error when TZ is not set in the environment (e.g., on Windows).
...
r12379 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 18:12:35 +00:00
Karen Tracey
4043521f53
[1.1.X] Fixed #12721 : Ensured objects with generic relations that use non-integer object ID fields can be deleted on PostgreSQL. Thanks much carljm for patch and Russ for review.
...
r12353 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-29 18:02:35 +00:00
Russell Keith-Magee
4a1be98aee
[1.1.X] Fixed #8758 -- Corrected handling of tag creation in feeds when the URL contains a port number.
...
Partial backport of r12338 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 13:59:57 +00:00
Luke Plant
a3f4402853
[1.1.X] Fixed #12470 - encoding of comma and semi-colon in cookies.
...
This is a backport of r12282 from trunk.
The original bug was about CookieStorage, which does not exist in 1.1.X,
but the fix involved the underlying cookie storage.
The change fixes other bugs with cookies for Internet Explorer and Safari,
hence it is backported. It could, however, also cause backwards
incompatibilities with existing javascript that may parse cookie values that
contain commas or semi-colons, and, very rarely, with existing cookie values
manipulated server side.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 23:25:41 +00:00
Justin Bronn
da954e876b
[1.1.X] Fixed #12664 -- Fixed `GenericRelation.m2m_reverse_name` to return the correct pk column name.
...
Backport of r12276 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 19:43:14 +00:00
Karen Tracey
46d8ae7c24
[1.1.X] Fixed #10015 -- PostgreSQL 8.3+ no longer barfs when passing an integer as a filter() value for a CharField? or TextField?. Thanks, carljm
...
Backport of r12150 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-19 16:55:22 +00:00
Jannis Leidel
3a417736bc
[1.1.X] Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas.
...
Backport of r12056.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 23:10:23 +00:00
Jannis Leidel
d1e7fdea3f
[1.1.X] Fixed #12017 - Overriding the default error message of the UKPostcodeField works again. Backport of r12044 and r12249.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:51:25 +00:00
Jannis Leidel
dc3d26bb59
[1.1.X] Fixed #11301 - Properly hide SplitHiddenDateTimeWidget. Thanks to David Gouldin for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:11:23 +00:00
Jannis Leidel
889c110e51
[1.1.X] Fixed #11843 - Give MultipleHiddenInput different IDs. Thanks Chris Beaven.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:11:00 +00:00
Jannis Leidel
3a6f58a169
[1.1.X] Fixed #12059 - Let TimeField.to_python correctly return a datetime.time object when having a datetime object.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:33 +00:00
Karen Tracey
2986dc7b28
[1.1.X] Fixed code duplication caused in [11859].
...
r12048 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 20:47:35 +00:00
Karen Tracey
9041b1addf
[1.1.X] Changed an i18n test to use a number that converts consistely from string to float on Pythons up to 2.7.
...
r12144 from trunk, backported to the doctest version where the change is needed for the test to pass on Python 2.7 alpha 2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 21:03:25 +00:00
Karen Tracey
03d57f0a82
[1.1.X] Fixed #12562 : Made Platypus just a tad lighter so it does not trigger noticing version-dependent differences in Ptyhon string/float conversions.
...
r12132 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:20:51 +00:00
Luke Plant
3de16688a9
[1.1.X] Fixed #12506 - 'lazy' fails when there are multiple expected classes with the same method
...
Thanks to Alex for report and patch
Backport of r12104 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-05 13:20:19 +00:00
Gary Wilson Jr
07fa03dde4
[1.1.X] Fixed #11615 -- Changed test runners to use an exit status code of 1 for any number of failed tests. The previous behavior of using an exit status code equal to the number of failed tests produced incorrect exit status codes when the number of test failures was 256 or greater. Thanks to lamby for the report and patch.
...
Backport of r12068 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 18:57:15 +00:00
Russell Keith-Magee
e8b001f46f
[1.1.X] Fixed #12476 -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch.
...
Backport of r12064 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 06:56:10 +00:00
Luke Plant
58bf653a26
[1.1.X] Fixed #11191 - Admin throws 500 instead of 404 for PK of incorrect type
...
Thanks to mmachine for report and test, and Chris Beaven for the patch
Backport of r12011 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-28 14:15:34 +00:00
Russell Keith-Magee
d0ea8f2d4c
[1.1.X] Tweaked the model_formsets test to work around a weird sorting problem between versions of Postgres. Thanks to Alex Gaynor for the report.
...
Backport of r11953 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 15:57:45 +00:00
Russell Keith-Magee
7d6213e0aa
[1.1.X] Fixed #11936 -- Removed deferred models from the list returned by the app_cache. Thanks to ryszard for the report, and clamothe for the initial patch.
...
Backport of r11938 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 11:20:43 +00:00
Luke Plant
b15d762d7a
[1.1.X] Fixed #10927 - Content Types shortcut view throws 500s instead of 404s
...
Thanks to Jeremy Dunck/Alex Gaynor for the patch
Backport of r11917 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:31:28 +00:00
Luke Plant
c81f1da152
[1.1.X] Fixed #6961 - loaddata fails if models is a package instead of a module
...
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch
Backport of 11914 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:27:50 +00:00
Russell Keith-Magee
d10f9766ad
[1.1.X] Fixed #12393 -- Parameterized the form output in the testGenericInlineFormset test to avoid database PK problems. Thanks to Karen for the report.
...
Backport of r11905 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 23:48:40 +00:00
Jacob Kaplan-Moss
321fe61f64
[1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
...
Backport of [11901].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:11:39 +00:00
Russell Keith-Magee
de64970091
[1.1.X] Updated BaseGenericInlineFormSet to match the changes made to BaseInlineFormSet in r11874.
...
Backport of r11885 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 07:28:26 +00:00
Russell Keith-Magee
45bc45eac2
[1.1.X] Cleaned up some stray text in the test from r11874. Thanks to Rob Hudson for the eagle eyes.
...
Backport of r11876 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 15:16:21 +00:00
Russell Keith-Magee
632a0e9a8d
[1.1.X] Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the patch.
...
Backport of r11874 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 14:53:42 +00:00
Karen Tracey
fee560f4e5
[1.1.X] Fixed #10969 : Made US State field a CharField, fixing a few oddities in its behavior. Thanks Paul McLanahan.
...
r11847 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 22:08:03 +00:00
Karen Tracey
64736fe37f
[1.1.X] Fixed #12146 : Corrected Canadian postal code validation. Thanks paulschreiber and Mark Lavin.
...
r11844 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 17:05:17 +00:00
Karen Tracey
6c91e6ecbc
[1.1.X] Fixed #12281 : Added some helpful messages when Go is pressed in admin actions and there
...
is nothing to do because no action was selected or no items are selected.
r11837 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:02:55 +00:00
Karen Tracey
31618e3ea4
[1.1.X] Fixed #11632 : Fixed a test broken by r11827 that relied on the exact (invalid HTML) id of an initial hidden input field.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:55:46 +00:00
Jacob Kaplan-Moss
d053631286
[1.1.X] Fixed the tests I broke with [11825].
...
Backport of r11828.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:48:20 +00:00
Karen Tracey
8bb3763c2b
[1.1.X] Fixed #11632 : Fixed the id for hidden initial widget so that it is different from the id for its visible counterpart. Thanks geber@datacollect.com and Mark Lavin.
...
r11826 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:22:09 +00:00
Jacob Kaplan-Moss
c1a8bd6779
[1.1.X] Fixed #10130 : you may now delete attributes on `settings`. Thanks, jcassee.
...
Backport of r11824.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:53:32 +00:00
Karen Tracey
5e6c3d24b3
[1.1.X] Fixed #11972 : Corrected title filter handling of numbers followed by letters. Thanks schwank@gmail.com and Randy Barlow.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:29:46 +00:00
Karen Tracey
79d8d683d2
[1.1.X] Fixed #12349 : Added missing unquote in admin history view. Thanks for the report guard.
...
r11808 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-10 20:01:59 +00:00
Justin Bronn
58c19c324b
[1.1.X] Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset.
...
Backport of r11800 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 04:24:05 +00:00
Jacob Kaplan-Moss
fa5ff296ce
[1.1.X] Added an explicit test showing that field errors are correctly autoescaped.
...
Backport of r11756 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-20 15:04:16 +00:00