1
0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00

8676 Commits

Author SHA1 Message Date
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
Malcolm Tredinnick
f4ebd701f2 [1.2.X] Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695.
Backport of r13737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 17:55:08 +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
1.2.3
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
260eff5684 [1.2.X] Fixed a test so that it actually tests what it's supposed to test.
Previously it passed whether or not the view was 'csrf_exempt'ed.

Backport of [13735] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:58:52 +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
Karen Tracey
aec5cbc370 [1.2.X] Fixed #13799, a test failure on Postgres. Thanks, Alex.
r13400 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:59:36 +00:00
Jannis Leidel
ebda0e014a [1.2.X] Converted doctest to unittest. Patch by Alex Gaynor.
Backport from trunk (r13725).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:55:09 +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
Russell Keith-Magee
de91b33a78 [1.2.X] Fixed #14245 -- Added some files and paths missing from the MANIFEST.in. Thanks to pmclanahan for the report.
Backport of r13719 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:22:06 +00:00
Karen Tracey
924ae1a09c [1.2.X] Pass commit=False to loaddata in tests, which will keep the DB connection open. Closing the connection has the side-effect on some DBs (Postgres, MySQL/InnoDB) of rolling back the transaction that was in progress, causing these tests to fail.
r13717 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:19:08 +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
Karen Tracey
13f1192911 [1.2.X] Fixed #14246: Modified aggregation_regress tests so that they will pass on a variety (sqlite, Postgres, MySQL/MyISAM) of DBs.
r13712 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:11:25 +00:00
Karen Tracey
1b0084e2a0 [1.2.X] Fixed some of the problems with aggregation_regress tests on higher levles of Postgres. Refs #14246.
r13709 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 17:08:14 +00:00
Luke Plant
ec4d6bb21d [1.2.X] Fixed #14247 - 'forms' test failure in 1.2.X
Thanks to ramiro/pmclanaham for the report and analysis.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 13:17:38 +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
1.2.2
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
1b910d7fbc [1.2.X] Fixed #13350 - Documentation on autoescape should mention endautoescape
Thanks to mountainpaul@gmail.com for report and to dwillis for patch.

Backport of [13694] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:54:13 +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
a537235d7f [1.2.X] Fixed #13853 - line with csrf_token too wide
Thanks to alper for report, alper/richardb for patch

Backport of [13688] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:33:58 +00:00
Luke Plant
01e8d75c20 [1.2.X] Fixed #14205 - Tiny grammar fix in form validation documentation
Thanks to zendak for report and patch.

Backport of [13687] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:26:23 +00:00
Luke Plant
17ae1d3262 [1.2.X] Fixed #13754 - Add a note about a test client session property gotcha
Thanks SmileyChris for report and patch.

Backport of [13685] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 19:04:29 +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
5295d678b9 [1.2.X] Fixed #14054 -- Added documentation for the connection_created event. Thanks to Rob Hudson for the report and patch.
Backport of r13673 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 13:25:47 +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
Luke Plant
57e6ee8507 Fixed #14189 - permalink docs import mistake
Thanks to 7times9 for report and patch.

Backport of [13666] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:31:56 +00:00
Luke Plant
dde1f13315 [1.2.X] Fixed #13759 - Multi-db docs have an example that isn't syntax highlighting
Thanks to Tim Hatch for report and patch.

Backport of [13664] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:27:08 +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
Luke Plant
be7f912ce7 [1.2.X] Fixed #14185 - improved example SQL for 'select' example.
Thanks to Trindaz for the suggestion.
  
Also fixed some references to 'lede' which is no longer part of the
example Blog model.

Backport of [13652] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 11:30:28 +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
c868c368eb [1.2.X] Refactored markup documentation to give it it's own home.
Backport of r13647 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:44:24 +00:00