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