innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,774 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

7774 Commits

Author SHA1 Message Date
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
Justin Bronn 231eb1d3ac [1.1.X] Fixed #12828 -- The table quoting function is now argument `get_geo_where_clause`. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 21:59:27 +00:00
Justin Bronn 49194df8c3 [1.1.X] Fixed #11353 -- `GeometryProxy` descriptor no longer chokes when accessed from a class rather than an instance, thanks yml and Tobu; removed unnecessary imports from `types` and cleaned up whitespace. 
Backport of r12584 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 21:26:11 +00:00
Joseph Kocherhans 4006402570 [1.1.X.] Blocked a few more revisions via svnmerge.py. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 21:16: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
Russell Keith-Magee 770b31e209 [1.1.X] Fixed #12102 -- Corrected an example in the docs that suggested that you use a relative path in your PYTHONPATH. Thanks to alexkon for the report. 
Backport of r12570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:52:49 +00:00
Russell Keith-Magee c1edfcd9ae [1.1.X] Fixed #11933 -- Added versionchanged marker for the cache_db session backend. Thanks to gabrielhurley for the report and patch. 
Backport of r12569 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:52:21 +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
Russell Keith-Magee fbe455e1ac [1.1.X] Fixed #11782 -- Added some Sphinx metadata to the file uploads documentation. Thanks to timo for the patch. 
Backport of r12562 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:07:25 +00:00
Russell Keith-Magee f7b415869c [1.1.X] Fixed #12538 -- Added a note that pickles aren't stable during version updates. Thanks to snow0x2d0 for the suggestion. 
Backport of r12560 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:06:51 +00:00
Russell Keith-Magee d33fd127f8 [1.1.X] Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch. 
Backport of r12559 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:05:58 +00:00
Russell Keith-Magee ef7debf34b [1.1.X] Fixed #12951 -- Corrected README link for deployment. Thanks to carljm for the report. 
Backport of r12558 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 14:05:18 +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 87bb1608bd [1.1.X] Blocked a few more changesets. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 21:12:14 +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 a1bff5f823 [1.1.X] Fixed #11681. Fixed display of non_field_errors and non_form_errors in the admin. Backport of r12541 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 19:00:50 +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 ae01b0c5cb [1.1.X] Fixed a few more spots related to #11859. Backport of r12537 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 18:40:07 +00:00
Joseph Kocherhans a599e50b07 [1.1.X] Fixed #11859. Allowed subclasses of tuple or list for choice options. Backport of r12535 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 17:32:07 +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 c7117b103a [1.1.X] Blocked a couple of revisions that shouldn't be merged. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 15:27:36 +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
Justin Bronn c702e262ff [1.1.X] Fixed #12802 -- Specify the correct factory in the `InlineModelAdmin` docs. Thanks, rctay and unbracketed. 
Backport of r12527 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 15:11:01 +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
Russell Keith-Magee cda48e9f0b [1.1.X] Fixed #12799 -- Added an extra newline to help with PDF generation of documentation. Thanks to Ivan Savov for the report. 
Backport of r12518 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 13:30:49 +00:00
Russell Keith-Magee e771d15e2d [1.1.X] Fixed #12837 -- Clarified the naming strategy for m2m intermediate tables. Thanks to Ramiro Morales for the report and patch. 
Backport of r12516 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 13:30:18 +00:00
Russell Keith-Magee 7c1671b480 [1.1.X] Fixed #12859 -- Clarified the documentation on using multiple tables with .update() calls. Thanks to dwillis for the report. 
Backport of r12515 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 13:29:52 +00:00
Russell Keith-Magee b9d1c5d9f6 [1.1.X] Fixed #12925 -- Corrected typo in v1.1 release notes. Thanks to aruseni for the report. 
Backport of r12513 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 13:29:18 +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
Joseph Kocherhans 8c4f16657f [1.1.X] Fixed #12570. Removed unused fields from GenericForeignKey. Backport of r12492 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 22:14:31 +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 9ee2d5c646 [1.1.X] Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales. 
Backport or r12473.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:44:27 +00:00
Jannis Leidel 5059de200b [1.1.X] Fixed #12275 - Small fix in Sphinx templates. 
Backport of r12467.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:44:05 +00:00
Jannis Leidel 4f1134898c [1.1.X] Fixed #12675 - Add the admin app to the project template settings.py for consistency with the urls.py. Thanks, stephanhoyer. 
Backport of r12464.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:43:47 +00:00
Jannis Leidel 713bac952f [1.1.X] Fixed #12655 - diffsettings command now returns the diff instead of printing. Thanks, jobscry. 
Backport of r12463.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:43:29 +00:00
Jannis Leidel 4261efdc67 [1.1.X] Fixed #12620 - Refer to better fieldname in defer docs. Thanks, dwillis. 
Backport of r12462.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:43:10 +00:00
Jannis Leidel 71897bf300 [1.1.X] Fixed #12604 - Typo in 1.1 release docs. 
Backport of r12461.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:42:51 +00:00
Jannis Leidel 49c116f14c [1.1.X] Fixed #12895 - Fixed typo in auth docs. Thanks Timo. 
Backported from r12457.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 00:42:33 +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
Jannis Leidel a1ecd073e6 [1.1.X] Fixed #11284 - Stop forcing the use of the djangojs domain when the ".js" file extension is passed to makemessages management command. Thanks, Ramiro Morales. 
Backport of r12439.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:51:12 +00:00
Jannis Leidel a23edb643b [1.1.X] Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales. 
Partial backport of r12440.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:50:47 +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 9f78e4692c [1.1.X] Fixed a couple Python 2.4 incompatibilities. Backport of [12434]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 20:33:32 +00:00