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

7605 Commits

Author SHA1 Message Date
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
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 1d9bc59534 [1.1.X] Fixed #10976 -- Isolated contrib.auth tests so they will always pass, regardless of any local templates. Thanks to aarond10 for the report, and SmileyChris for turning that into a patch. 
Backport of r12420 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 12:32:49 +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 0e9f1553e1 [1.1.X] Corrected merge of r12411 to 1.1.X branch (see r12415). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 13:23:11 +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 a9282168f5 [1.1.X] Fixed #12189 -- Corrected rollback behavior in database cache backend. Thanks to Lakin Wecker for the report. 
Backport of r12409 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 13:10:52 +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
Karen Tracey 750c889a74 [1.1.X] Update svnmerge metatdata to reflect changesets that should not be merged to 1.1.X and those that have already been applied. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-10 17:43:05 +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
James Bennett daeceafee6 [1.1.X] Fixed #12745: The maxlength -> max_length change happened in 2007, we can probably stop mentioning it in the tutorial now. Backport of [12362] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-01 11:53:55 +00:00
Karen Tracey 75146a3d7b [1.1.X] Really this time -- 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. 
Remainder of r12353 from trunk, previous attempt only picked up the new tests.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-29 18:05:58 +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
Ian Kelly ab75fd4786 [1.1.X] Fixed #4140: Documented the ORA-06552 error that can occur when a keyword is used as a field name in the Oracle notes. Backport of r12346 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-28 22:14:38 +00:00