Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
7,681 Commits 26 Branches 382 Tags
Commit Graph

7681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
1adc88f4b4 [1.1.X] Fixed #12097 -- Cleaned up the documentation for ModelChoiceField and MultipleModelChoiceField. Thanks to JasonYosinski for the patch. 
Backport of r12712 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 03:27:12 +00:00
Russell Keith-Magee
fdbf6c881b [1.1.X] Fixed #12114 -- Clarified the existence of the reverse relation _set in the tutorial. Thanks to panfist for the suggestion, and dwillis for the patch. 
Backport of r12711 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 03:26:45 +00:00
Russell Keith-Magee
ec6f705956 [1.1.X] Fixed #12811 -- Modified Tutorial 2 to indicate that the templating language will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text. 
Backport of r12710 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 03:26:24 +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
Karen Tracey
90e12662b9 [1.1.X] snvmerge metadata housekeeping. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-07 17:15:21 +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
James Bennett
8a8366d2fa [1.1.X] Fixed #13048: Corrected typo in email documentation. Backport of [12694] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-07 00:52:11 +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
James Bennett
b3c2ae9153 [1.1.X] Fixed #11680: Added a note in the error-reporting documentation about basic e-mail configuration. Backport of [12686] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-06 11:21:48 +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
1fedc0b9eb [1.1.X] Made Python 2.3 compatibility fixes for some recent test additions. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-04 01:11:37 +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
1332b114cc [1.1.X] Fixed #12601: Documented the slug field in the forms module. Backport of [12673] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 09:02:53 +00:00
James Bennett
36e7739d9d [1.1.X] Fixed #12217: Documented the fact that serving flatpages from the flatpage middleware does not apply view middleware methods. Backport of [12671] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:52:51 +00:00
James Bennett
7adae30286 [1.1.X] Fixed #11889: Documented the fact that context processors will overwrite pre-existing context variables of the same names. Backport of [12669] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:44:22 +00:00
James Bennett
bca50d20d3 [1.1.X] Fixed #11883: Documented how to set a custom template name on a flatpage. Backport of [12667] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:36:42 +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
Jannis Leidel
cea0374cc6 [1.1.X] Fixed Bosnian language code introduced in r12330. 
Backport from r12657.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 17:11:02 +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
a6225393c2 [1.1.X] Fixed #12946: Removed an invalid example of url tag usage from the docs. 
r12652 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 04:06:21 +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
5f70a72876 [1.1.X] Fixed a silly bug in [12644]. 
Backport of [12646].

Of course, this sort of thing *does* do wonders for my commit count.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 00:00:08 +00:00
Jacob Kaplan-Moss
60f4b7c4a9 [1.1.X] Fixed #1104: set FormWizard.extra_context in __init__ to avoid context leakage. 
Backport of [12644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 23:26:44 +00:00
Jacob Kaplan-Moss
34a3b7b6fd [1.1.X] Fixed #5605: only lowercase the domain portion of an email address in UserManager.create_user. 
Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 20:32:55 +00:00
Jacob Kaplan-Moss
ac72c8d1d3 [1.1.X] Fixed #10878, an error in the Moderator docstring. 
Thanks, Travis Cline.

Backport of [12639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 20:19:53 +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
Jacob Kaplan-Moss
6b94c64554 [1.1.X] Fixed #11457: tightened the security check for "next" redirects after logins. 
The new behavior still disallows redirects to off-site URLs, but now allows
redirects of the form `/some/other/view?foo=http://...`.

Thanks to brutasse.

Backport of [12635] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 20:06:20 +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
Jannis Leidel
f09eabfb90 [1.1.X] Fixed #12987 - Added a few versionadded directives to the docs. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 14:41:11 +00:00
Jannis Leidel
4871b654b5 [1.1.X] Fixed #12966 - Force unicode of verbose labels in admin change messages. 
Backport of r12627.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 14:36:45 +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
Karen Tracey
aa8a98564c [1.1.X] Fixed #12981 -- Removed some stray tabs. Thanks to loewis for the report. 
Backport of the applicable part of r12614 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-27 15:40:50 +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
Justin Bronn
b698d7762b [1.1.X] Fixed #12585 -- Corrected typo in tutorial03. Thanks, fcsmith. 
Backport of r12484 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 16:56:39 +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
121188e254 [1.1.X] Corrected an edge case introduced in r12602. Thanks to Ramiro Morales for the eagle eyes. 
Backport of r12605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 16:12:54 +00:00
Russell Keith-Magee
94054604e4 Corrected a versionchanged marker added in r12603. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 15:54: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
Karen Tracey
0c2d3ff7a1 [1.1.X] Python 2.3 compatibility: moved the fallback import for set to where set() is now used. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 14:24:08 +00:00