mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
20,741 Commits 30 Branches 460 Tags
20ff296cb15a53b8b9517a834688e57749b43e21
Commit Graph

6837 Commits

Author SHA1 Message Date
Joseph Kocherhans
65b451ae3e Fixed #12819. Fixed a bug with caching values of nullable 1to1 fields. Thanks, s.angel@twidi.com for the initial patch, and Alex Gaynor for the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 19:24:27 +00:00
Joseph Kocherhans
fd233f40d1 Fixed #12070. Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 18:50:57 +00:00
Joseph Kocherhans
f2d5582c53 Fixed #12561. InlineAdmin now respects can_delete=False. Thanks, nessita. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 17:14:50 +00:00
Joseph Kocherhans
8da76ffeaa Fixed #12285. ModelForm raises a more informative error if it doesn't have a model class defined. Thanks, tobias. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 14:59:30 +00:00
Joseph Kocherhans
7aeb37d610 Fixed #12707. Admin action messages are no longer displayed when submitting list_editable content. Thanks, copelco. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 14:48:15 +00:00
Joseph Kocherhans
871a99c948 Fixed #11860. Changed NullBooleanSelect's _has_changed method to repect differences between None and False. Thanks, matiasb. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 14:17:42 +00:00
Justin Bronn
7ca3e8fecf Updated patch applied in r12504. Refs #12806. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 06:04:06 +00:00
Justin Bronn
5546430304 Fixed #12608 -- No longer return inconsistent results when using values and values_list in conjunction with annotate. Thanks, Charlie Leifer. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 05:26:49 +00:00
Justin Bronn
c4699b0b8a Fixed #12806 -- Added an implementation of RawQuerySet.__getitem__. Thanks, Bruno Renié. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 05:22:12 +00:00
Justin Bronn
349827996b Fixed #12072 -- Certain characters no longer break url tag. Thanks, Alexander Dutton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 05:17:39 +00:00
Justin Bronn
6ed7bd5609 Fixed #12855 -- QuerySets with extra where parameters now combine correctly. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 04:39:39 +00:00
Jacob Kaplan-Moss
c1d795df45 Clarified a comment from [11687]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:42:53 +00:00
Joseph Kocherhans
b3d20ade47 Fixed #12820. Implemented other dict methods for MergeDict. Thanks, Gisle Aas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:38:18 +00:00
Jacob Kaplan-Moss
49d6a82261 Fixed #11687: the add filter is now less failsome when faced with things that can't be coerced to integers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:34:33 +00:00
Joseph Kocherhans
eb0751a4c0 Fixed #12901. Exclude overridden form fields from model field validation. Thanks, Honza Král. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:06:09 +00:00
Jannis Leidel
9b8c44c3ed Fixed a typo in last commit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 20:27:58 +00:00
Jannis Leidel
7573c4a9f7 Updated the check for gettext introduced in r12475 to also look at the version. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 20:25:43 +00:00
Russell Keith-Magee
692fd7da5e Fixed #7777 -- Added validation handling for NaN, Inf and -Inf in DecimalFields. Thanks to thebitguru for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 14:38:44 +00:00
Russell Keith-Magee
e6db084ac8 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 14:04:13 +00:00
Russell Keith-Magee
eb67e449dd Fixed #12864 -- Corrected handling of new user creation when a multi-database router is in place. Thanks to haris@dubizzle.com for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 13:09:02 +00:00
Jannis Leidel
8e1a4bd677 Fixed #12910 - Only test extracting translation strings if xgettext can be found on PATH. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:45:04 +00:00
Jannis Leidel
7f5d9ad661 Fixed #9764 - Updated EmailField and URLField to support IDN (Internationalized Domain Names). Thanks, UloPe. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:44:35 +00:00
Jannis Leidel
84f8213d74 Fixed #5972 - Allow the template filters to be used with the trans tag. Thanks for the initial patch, Dmitri Fedortchenko. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:43:28 +00:00
Jannis Leidel
b459f5b7e3 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:42:57 +00:00
Jannis Leidel
67d4289c2e Fixed #12066 - Moved auth context processor from core to the auth app. Thanks, Rob Hudson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:40:47 +00:00
Jannis Leidel
6cafd4b21f Fixed #7876 - Improved template error message to include expected end tag. Thanks to Matthias Kestenholz for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:38:33 +00:00
Justin Bronn
eaa17e13e8 Fixed #12705 -- Date/time and select filter widgets now work again with newly added inline forms in the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-17 18:54:02 +00:00
Jannis Leidel
342517000c Added missing tests for fix committed in r12398. Thanks Karen for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:17:37 +00:00
Jannis Leidel
12d40a9fd6 Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:17:17 +00:00
Jannis Leidel
89df0432f2 Fixed #6505 - Copy plural forms from Django translation files for newly created translation files. Thanks to Ramiro Morales for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:15:41 +00:00
Jannis Leidel
eb26c9686b Fixed #7050 - Allow the makemessages command to optionally ignore paths when examining source code and templates for translation strings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:15:04 +00:00
Jannis Leidel
fef575a7f9 Fixed #6380 - Follow symlinks when examining source code and templates for translation strings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:14:27 +00:00
Jannis Leidel
71da5f62da Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:13:48 +00:00
Jannis Leidel
e50eefceb6 Fixed #4695 - Worked around a problem of xgettext ignoring some translation strings in JavaScript files. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:13:23 +00:00
Jacob Kaplan-Moss
75d4e9326f Fixed (what I hope is) the last Python 2.4 incompatibility, this one in the httpwrappers tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-15 02:17:07 +00:00
Jacob Kaplan-Moss
76afc30229 Fixed a couple Python 2.4 incompatibilities. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 20:29:42 +00:00
Jacob Kaplan-Moss
1d078be448 Fixed #6799 - added an end_text argument to truncate_words/truncate_html_words. 
This allows customizing the standard "..." end text. Yes, this is technically a
feature sneaking in after the deadline, but I just couldn't bring myself to punt
it again: we already used that excuse for not getting it into 1.1.

Thanks to Adam Fast and Travis Cline for work on this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 18:36:48 +00:00
Jacob Kaplan-Moss
7578981626 Fixed #6054: work around PIL's installation brokeness by detecting either of the two ways it can end up being installed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 18:28:28 +00:00
Russell Keith-Magee
e6740cb39c Fixed #11944 -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:37:17 +00:00
Russell Keith-Magee
0e5836dc07 Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:36:21 +00:00
Russell Keith-Magee
03924929ba 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:02:32 +00:00
Russell Keith-Magee
79857802b8 Fixed #12011 -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 12:01:14 +00:00
Russell Keith-Magee
23d3450d5e Fixed #12378 -- Removed some tests made redundant by feature deprecation. Thanks to jcd for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 12:00:10 +00:00
Russell Keith-Magee
ab828da2b9 Fixed #11623 -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 12:21:46 +00:00
Russell Keith-Magee
75ab212d12 Fixed #12399 -- Added handling for memcache timeouts longer than 30 days. Thanks to houdinihound for the report, and gciotta for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 12:06:26 +00:00
Karen Tracey
bb6b9aa472 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-10 19:21:52 +00:00
Joseph Kocherhans
225c413b08 Fixed #12647. Allow unique_together checks be specified as lists as well as tuples. Thanks, Honza Král. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-10 00:49:33 +00:00
Joseph Kocherhans
8f4540b2e6 Fixed #12698. Model.clean() used with a ModelForm no longer causes a KeyError when raising a ValidationError. 
Note that previously it was possible to raise a ValidationError in the same place with a message_dict attribute. That behavior was a bug and will no longer have the same behavior.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-10 00:34:45 +00:00
Luke Plant
4bff194633 Fixed #12804 - regression with decorating admin views. 
This is a BACKWARDS INCOMPATIBLE change, because it removes the flawed
'auto_adapt_to_methods' decorator, and replaces it with 'method_decorator'
which must be applied manually when necessary, as described in the 1.2
release notes.

For users of 1.1 and 1.0, this affects the decorators:

 * login_required
 * permission_required
 * user_passes_test

For those following trunk, this also affects:

 * csrf_protect
 * anything created with decorator_from_middleware 

If a decorator does not depend on the signature of the function it is
supposed to decorate (for example if it only does post-processing of the
result), it will not be affected.
 



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-09 15:02:39 +00:00
Jannis Leidel
8600ad4c50 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-05 01:43:13 +00:00