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

7691 Commits

Author SHA1 Message Date
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
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
Karen Tracey 6c031fbef7 [1.1.X] Removed a couple of changesets from the blocked list that shouldn't have been blocked. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-25 23:57:27 +00:00
Karen Tracey 5ac214b46a [1.1.X] Added a few more blocked changesets I missed earlier. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-25 20:32:47 +00:00
Karen Tracey f18cf31bbc [1.1.X] Updated svnmerge metadata to reflect changesets that have been and should not be merged. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-25 19:04:21 +00:00
Jannis Leidel 1a377a8d0c [1.1.X] Added note to the contributing docs about requiring gettext to run the makemessages tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-25 17:20:13 +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
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