mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Code Issues 25 Releases Wiki Activity
7,950 Commits 28 Branches 426 Tags 666 MiB
12d40a9fd6
Commit Graph

1609 Commits

Author SHA1 Message Date
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
Jannis Leidel
a28bd76bb6 Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-05 00:44:35 +00:00
Karen Tracey
96a10094e8 Corrected app_loading test so it does not generate a key error when TZ is not set in the environment (e.g., on Windows). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-03 18:09:11 +00:00
Joseph Kocherhans
fbb42c31df Fixed #12667. Added optgroup validation support to model fields with choices. Thanks ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-02 00:41:28 +00:00
Jannis Leidel
9555f2be9d Fixed #12692 - Properly handle the extra clause of admin inline formsets. Also fixes #12703, second error. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-01 14:14:56 +00:00
Jannis Leidel
267346678d Fixed #12654 - Correctly display ForeignKey fields in read-only scenarios. Thanks, minmax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-01 14:12:56 +00:00
Karen Tracey
33b1036f6f Tweaked the validation test models to avoid tripping over the fact that Oracle doesn't like columns named 'number'. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-29 18:38:28 +00:00
Karen Tracey
199cd0efca 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. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-29 17:58:22 +00:00
Karen Tracey
59cccd1474 Fixed #12724: Fixed new comment tests to not hardcode comment primary key values. Thanks carljm. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-28 19:23:54 +00:00
Russell Keith-Magee
c4c27d8a04 Fixed #6188, #6304, #6618, #6969, #8758, #8989, #10334, #11069, #11973 and #12403 -- Modified the syndication framework to use class-based views. Thanks to Ben Firshman for his work on this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-28 13:46:18 +00:00
Russell Keith-Magee
65b6080da2 Fixed #12703 -- Corrected a test suite failure in the admin_views tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-27 14:18:50 +00:00
Russell Keith-Magee
58cd220f51 Fixed #7270 -- Added the ability to follow reverse OneToOneFields in select_related(). Thanks to George Vilches, Ben Davis, and Alex Gaynor for their work on various stages of this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-27 13:30:29 +00:00
Russell Keith-Magee
8e8d4b5888 Fixed #12671 -- Added set_many(), get_many(), and clear() methods to the cache backend interface. Thanks to Jeff Balogh for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-27 08:21:35 +00:00
Russell Keith-Magee
c8873bbba7 Made the database master router tolerant of router definitions that omit individual routing methods. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-27 07:56:53 +00:00
Jannis Leidel
c14937cf7a Fixed #12508 - Added ability to dynamically add inlines in the admin app. 
Refs #13. Also introduces an ``empty_form`` attribute on formsets to make it easier to implement dynamic forms.

Many thanks to Zain Memon for the initial patch from his Summer of Code 2009 project, Stanislaus Madueke for his django-dynamic-formset app and all the other people helping out.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-26 15:02:53 +00:00
Russell Keith-Magee
12d3799dd2 Fixed #6587 -- Removed nasty __path__ hacking in templatetag loading. Thanks to Øyvind Satvik and Andrew Badr for their work on this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-26 01:38:50 +00:00
Russell Keith-Magee
14116bc53e Fixed #12672 -- Added the ability to configure which applications are available on which database. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-25 12:23:30 +00:00
Luke Plant
088f717077 Fixed #12470 - django.contrib.messages CookieStorage failing silently in safari when comma is used in message 
This issue was fixed by changing the underlying cookie storage mechanism.

This will fix other bugs with cookies for Internet Explorer and Safari, but
could also cause backwards incompatibilities with existing javascript that
may parse cookie values that contain commas or semi-colons, and, very
rarely, with existing cookie values.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-23 23:13:00 +00:00
Brian Rosner
4d81874f9d ModelAdmin.fields wasn't able to refer to fields only on a custom form 
Regressed in r11737 which used get_field instead of opts.get_field and ignoring
fields not found.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-23 16:44:42 +00:00
Justin Bronn
c1584383fa Fixed #12664 -- Fixed GenericRelation.m2m_reverse_name to return the correct pk column name. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-22 18:39:48 +00:00
Russell Keith-Magee
f114fbecc2 Fixed #12659 -- Return a more meaningful KeyError message when ContextList lookups fail. Thanks to rodriguealcazar for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-22 15:31:14 +00:00
Russell Keith-Magee
7ca9d9306c Fixed #10314 -- Added a message prefix argument to Django's test assertions. Thanks to Wes Winham for the original suggestion, and Chistian Oudard for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-22 15:02:02 +00:00
Russell Keith-Magee
1b3dc8ad9a Fixed #12540, #12541 -- Added database routers, allowing for configurable database use behavior in a multi-db setup, and improved error checking for cross-database joins. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-22 14:30:06 +00:00
Joseph Kocherhans
acc095c333 Fixed #12582. Model validation on ForeignKeys now respects limit_choices_to. Thanks, Honza Král. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-21 03:26:14 +00:00
Joseph Kocherhans
86f283d4ca Fixed #12590. Changed an expression in the validators tests to work correctly with python 2.4. Thanks, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-21 03:02:13 +00:00
Joseph Kocherhans
408d431029 Fixed #12596. Calling super from a ModelForm's clean method is once again optional. Failing to call super only skips unique validation as documented. Thanks for the initial patch and tests, carljm. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-21 02:28:03 +00:00
Joseph Kocherhans
856a39e841 Fixed #12577. Reverted some changes from [12098] since [12206] made them unneccessary. Also, added a test for using generic inlines with unique_together. Thanks for the report, Raffaele Salmaso. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-21 01:40:21 +00:00
Ian Kelly
fb5f8d7b14 Fixed an Oracle test failure introduced in [12226]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-19 18:09:03 +00:00
Russell Keith-Magee
e2d094b8fb Fixed #12640 -- Corrected a regression in test suite construction order introduced by #12255. Also updated the docs to reflect what the test code has always done. Thanks to Ramiro Morales for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-19 01:14:02 +00:00