mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-21 12:49:11 +00:00
Code Issues 32 Releases Wiki Activity
8,695 Commits 30 Branches 459 Tags
Commit Graph

5580 Commits

Author SHA1 Message Date
Jannis Leidel
3a6afc7e0b [1.2.X] Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled. 
Backport from trunk (r13770).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:41:48 +00:00
Malcolm Tredinnick
686d6a414c [1.2.X] Add warning when using cache keys that might not work with 
memcached.

This means testing with local dev caches (not memcache) will warn
developers if they are introducing inadvertent importabilities.  There
is also the ability to silence the warning if a dev is not planning to
use memcache and knows what they are doing with their keys.

Thanks to Carl Meyer for the patch. Fixed #6447.

Backport of r13766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:07:09 +00:00
Justin Bronn
31744a78cd [1.2.X] Fixed #14060 -- PostGIS never implemented the ~= operator for geography types, so removed support for it. 
Backport of r13757 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 02:09:17 +00:00
Justin Bronn
24586d4d86 [1.2.X] Fixed regression in running the GeoDjango test suite after r13670 with addition of GeoDjangoTestSuiteRunner (replaces run_gis_tests, which is now a stub). 
Backport of r13755 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 01:44:51 +00:00
Justin Bronn
864361aabd [1.2.X] Fixed #13390 -- SplitDateTimeWidget now recognizes when it's no longer required. Thanks vaxXxa for bug report and patch. 
Backport of r13753 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 21:28:00 +00:00
Justin Bronn
e4bd5e8a2d [1.2.X] Fixed #13149 -- The admin ForeignKeyRawIdWidget now properly handles non-integer values. Thanks, Chris Adams. 
Backport of r13751 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 18:38:24 +00:00
James Bennett
f140436e3a [1.2.X] Bump to 1.2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 06:49:33 +00:00
Malcolm Tredinnick
4eb78b89ce [1.2.X] Improved unicode-type, ASCII-convertible header handling in 
HttpResponse.

Fixed #8765. Thanks to SmileyChris and semenov for working on this one.

Backport of r13740 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 03:25:44 +00:00
Malcolm Tredinnick
dc00873da0 [1.2.X] Fixed id attribute generation in the admin docs page. Patch from simeon. 
Fixed #3695. Thanks.

Backport of r13728 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 03:25:39 +00:00
Justin Bronn
ff0cb11c1b [1.2.X] Fixed #13599 -- No longer embed hidden <td> elements in ChangeList that cause improper rendering when list_editable is enabled; refactored admin_changelist tests. Thanks, skevy for bug report and patch. 
Backport of r13744 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 03:04:28 +00:00
Justin Bronn
8829b7d956 [1.2.X] Fixed #12632 -- Improved performance of SortedDict. Thanks, Alex Gaynor. 
Backport of r13742 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 02:30:39 +00:00
Luke Plant
890b0b6234 [1.2.X] Fixed #14235 - UnicodeDecodeError in CSRF middleware 
Thanks to jbg for the report.
  
This changeset essentially backs out [13698] in favour of a method that
sanitizes the token rather than escaping it.

Backport of [13732] from trunk.




git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 23:11:24 +00:00
Justin Bronn
43988e9835 [1.2.X] Fixed #13095 -- formfield_callback keyword argument is now more sane and works with widgets defined in ModelForm.Meta.widgets. Thanks, hvdklauw for bug report, vung for initial patch, and carljm for review. Backport of r13730 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 22:54:52 +00:00
Ramiro Morales
19cce79253 [1.2.X] Fixed typos in es_AR translation. 
Backport of r13572 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 19:46:25 +00:00
Luke Plant
ec8d04cffe [1.2.X] Fixed #11158 - get_image_dimensions very slow/incorrect after 1 call 
Thanks to kua for the report, and to kua, SmileyChris and SAn for the patch

Backport of [13715] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 18:49:45 +00:00
Luke Plant
6e1c46dab9 [1.2.X] Fixed #14250 - FileBasedCacheTests.test_cull test failure 
This patch makes the cull behaviour (which files deleted and how many
deleted) deterministic.

Backport of [13705] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 13:09:19 +00:00
Luke Plant
6ea90256d7 [1.2.X] Fixed #14242 - UserChangeForm subclasses without 'user_permissions' field causes KeyError 
This was a regression introduced by [13684]
  
Thanks to adammckerlie@gmail.com for report.

Backport of [13702] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-09 23:43:01 +00:00
Luke Plant
5357000bc3 [1.2.X] Converted tests for contrib.auth.forms to unit tests. 
Backport of [13701], needed in order to backport [13702]


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-09 23:38:01 +00:00
James Bennett
329fab430b [1.2.X] Increment to Django 1.2.2. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-09 00:37:33 +00:00
James Bennett
7f84657b6b [1.2.X] Patch CSRF-protection system to deal with reported security issue. Announcement and details to follow. Backport of [13698] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-09 00:36:08 +00:00
Luke Plant
a04398eb1b [1.2.X] Fixed #13081 - Admin actions lose get-parameters in changelist view 
Thanks to joh for report and to SmileyChris for patch.

Backport of [13696] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-07 20:59:28 +00:00
Luke Plant
79d9206711 [1.2.X] Fixed #13414 - QuerySet API ref wrong sql equivalent in __year lookup example 
Thanks to idle for report and patch

Backport of [13690] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-07 20:45:48 +00:00
Luke Plant
4b4168b1bf Fixed #14090 - Many sql queries needed to display change user form 
Thanks to Suor for report and patch.

Backport for [13683] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-03 18:58:53 +00:00
Luke Plant
94047d7a3a [1.2.X] Added explanatory note on CSRF failure page for the case of a missing Referer header. 
This is intended to help power users who have disabled Referer headers, or
installed add-ons which have done so, and to help web site administrators
with debugging, since this problem will be browser specific and not a
programming error.

Backport of [13680] from trunk. Technically this is a (tiny) new feature,
but it has been backported because it might give significant help with
debugging rare problems with Django 1.2's new CSRF protection.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-03 18:34:30 +00:00
Luke Plant
7a601b3fc1 [1.2.X] Fixed #14145 - undeterministic behavior when project or app template contains dotdir 
Thanks to marbu for report and patch.

Backport of [13668] from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-03 18:29:33 +00:00
Russell Keith-Magee
7a1b694189 [1.2.X] Fixed #14199 -- Added a missing table creation statement in the db cache backend cull implementation, and added tests for cache culling. Thanks to Tim for the report. 
Backport of r13678 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-31 00:45:35 +00:00
Russell Keith-Magee
4d8af2faa3 [1.2.X] Fixed #14198 -- Corrected rendering of generic sitemaps when no priority is specified. Thanks to palkeo for the report. 
Backport of r13676 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-30 15:11:21 +00:00
Russell Keith-Magee
62355d8253 [1.2.X] Fixed #13798 -- Added connection argument to the connection_created signal. Thanks to liangent for the report, and Alex Gaynor for the patch. 
Backport of r13672 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-30 13:25:22 +00:00
Russell Keith-Magee
2c82a2aaf7 [1.2.X] Added a missing (empty) models.py file required for the tests from r13644 to actually run. 
Backport of r13670 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-30 12:33:45 +00:00
Russell Keith-Magee
6fbd860fa8 [1.2.X] Fixed #12343 -- Added support for connection-by-socket to MySQL using the dbshell management command. Thanks to elyon001@gmail.com for the report, and sfllaw for the patch. 
Backport of r13660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 13:20:11 +00:00
Russell Keith-Magee
af0e3217ae [1.2.X] Fixed #13723 -- Improved the legibility of hyperlinks included in admin validation error messages. Thanks to Sebastian Noack for the suggestion and patch. 
Backport of r13659 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 13:19:49 +00:00
Russell Keith-Magee
ba876ea2cc [1.2.X] Fixed #13681 -- Added a commented out admindocs entry to the default INSTALLED_APPS for a new project. Thanks to elkan for the report, and andrews for the patch. 
Backport of r13658 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 13:19:28 +00:00
Russell Keith-Magee
174940cab2 [1.2.X] Fixed #14166 -- Modified the list of state choices in the Indian localflavor to be a list of tuples, not just a list of values. Thanks to gogna for the report and patch. 
Backport of r13656 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 12:31:12 +00:00
Russell Keith-Magee
37d5ec34b6 [1.2.X] Removed a stray DEBUG=True test setting introduced in r13641. 
Backport of r13650 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 06:13:41 +00:00
Russell Keith-Magee
38e9ca1e09 [1.2.X] Fixed #14164 -- Ensure that sitemap priorities aren't rendered with localized numerical formats. Thanks to dokterbob for the report, and vung for the draft patch. 
Backport of r13644 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-27 15:18:10 +00:00
Russell Keith-Magee
2370a10380 [1.2.X] Fixed #14156 -- Modified the way CSRF protection is applied to flatpages so that the flatpage middleware doesn't cause all POSTs resulting in 404s to turn into 403s. Thanks to patrys for the report. 
Backport of r13641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-27 13:59:46 +00:00
Russell Keith-Magee
35411fd7da [1.2.X] Fixed #14116 -- Added a flag to enable CSRF checks in the test client. Thanks to jon@licq.org for the suggestion. 
Backport of r13640 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-27 13:58:36 +00:00
Russell Keith-Magee
87cd047123 [1.2.X] Fixed #14084 -- Updated French translation. Thanks to stephaner. 
Backport of r13580 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-23 13:39:58 +00:00
Russell Keith-Magee
2bbcb1a821 [1.2.X] Fixed #13951 -- Corrected docstring in formtools wizard. Thanks to suzaku for the report, and lrekucki for the patch. 
Backport of r13630 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-23 08:12:17 +00:00
Russell Keith-Magee
49c5c07568 [1.2.X] Fixed #13140 -- Ensure that request headers are preserved through redirect chains in the test client. Thanks to David Novakovic for the report. 
Backport of r13620 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-21 03:02:47 +00:00
Russell Keith-Magee
c3b13d8f03 [1.2.X] Fixed #13895 -- Refactored aggregation_regress doctests. Thanks to Alex Gaynor for the patch. 
Backport of r13614 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-20 14:29:57 +00:00
Russell Keith-Magee
3fc9d7e390 [1.2.X] Fixed #14068 -- Corrected error handling in loaddata when an allow_syncdb method is defined on the router. Thanks to Xavier Ordoquy for the report. 
Backport of r13612 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-20 14:07:02 +00:00
Russell Keith-Magee
14fa7f9907 [1.2.X] Fixed #14102 -- Ensure that fields that have been excluded from a form aren't included in the unique_for_* checks, either. Thanks to Travis Cline for the report and fix. 
Backport of r13598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-17 07:08:26 +00:00
Russell Keith-Magee
13953badb7 [1.2.X] Fixed #13796 -- Ensure that builtin tags and filters are included in admin documentation views. 
Backport of r13588 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-14 13:43:13 +00:00
Russell Keith-Magee
8a006e1819 [1.2.X] Fixed #13679, #13231, #7287 -- Ensured that models that have ForeignKeys/ManyToManyField can use a a callable default that returns a model instance/queryset. #13679 was a regression in behavior; the other two tickets are pleasant side effects. Thanks to 3point2 for the report. 
Backport of r13577 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-14 12:07:25 +00:00
Russell Keith-Magee
c7c59bc24f [1.2.X] Fixed #11021 -- Clarified newline stripping behavior in the truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch. 
Backport of r13555 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 15:02:01 +00:00
Russell Keith-Magee
94528b9067 [1.2.X] Fixed #14076 -- Updated Danish translation. Thanks to finngruwier. 
Backport of r13546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 14:18:47 +00:00
Russell Keith-Magee
e990a2cbc4 [1.2.X] Fixed #13516 -- Added an internal type definition for AutoFields, so that subclassed fields are handled correctly by the SQL generator. Thanks to manfre for the report and patch. 
Backport of r13540 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 07:39:19 +00:00
Russell Keith-Magee
486b0dfb21 [1.2.X] Fixed #14070 -- Updated Serbian translations. Thanks to janos. 
Backport of r13524 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:19:29 +00:00
Russell Keith-Magee
0ffbd44097 [1.2.X] Updated es_AR translation (via Ramiro) 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:16:28 +00:00