mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity
9,418 Commits 29 Branches 451 Tags
Commit Graph

9418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bronn
33c0d50c0c [1.2.X] Added GIS test fixture directories to the MANIFEST. 
Backport of r15860 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-16 19:03:34 +00:00
Justin Bronn
28462b693f [1.2.X] Add setUp and tearDown methods to the geographic feed and sitemap tests to ensure Site exists for tests. 
Backport of r15856 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-16 18:23:39 +00:00
Justin Bronn
64c83ac6fb [1.2.X] Use Sphinx :download: directives for spatial database template creation scripts instead of linking to geodjango.org. 
Backport of r15854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-16 16:52:53 +00:00
Justin Bronn
e594ca7f93 [1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch. 
Backport of r15852 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-16 04:45:00 +00:00
Justin Bronn
1e2d896e33 [1.2.X] Fixed #15533 -- Now use 3857 as spherical mercator projection instead of deprecated 900913 on platforms that support it. Thanks to cnorthwood for bug report and Christopher Schmidt for OpenLayers JavaScript workaround. 
Backport of r15845 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-16 03:07:30 +00:00
Luke Plant
1d628d7ecf [1.2.X] Fixed #15617 - CSRF referer checking too strict 
Thanks to adam for the report.

Backport of [15840] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 22:24:26 +00:00
Justin Bronn
63686ce2c6 [1.2.X] Previous changeset did not include new test data, stupid hgsubversion. Refs #15378. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 02:30:54 +00:00
Justin Bronn
ddb1cee0e5 [1.2.X] Fixed #15378 -- Now properly handle OGR layers that have features with invalid geometries. Thanks, kunitoki for bug report and initial patch. 
Backport of r15813 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 02:27:48 +00:00
Carl Meyer
e8dcaa4bba [1.2.X] Added backwards-incompatibility note for r15808. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 22:52:12 +00:00
Carl Meyer
e5f49f8c06 [1.2.X] Fixed #9213 - Added check to prevent inactive users from resetting their password. Thanks to John Scott for report and draft patch, and Evgeny Fadeev for final patch with test. 
Backport of r15805 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 21:22:00 +00:00
Justin Bronn
f10dae5160 [1.2.X] Fixed brittle tests that broke with release of GDAL 1.8. 
Backport of r15806 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 21:17:20 +00:00
Justin Bronn
8ad87ec6ea [1.2.X] Fixed an invalid import in the GeoDjango 3D tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 21:11:42 +00:00
Gabriel Hurley
e9857ed5b1 [1.2.X] Fixed #15592 -- corrected an missing backtick in the syndication docs. Thanks to bradley.ayers for the report and patch. 
Backport of [15793] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-10 17:22:35 +00:00
Luke Plant
2bb360c91c [1.2.X] Fixed #15559 - distinct queries introduced by [15607] cause errors with some custom model fields 
This patch just reverts [15607] until a more satisfying solution can be
found.

Refs #11707

Backport of [15791] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-10 01:21:59 +00:00
Ian Kelly
ec7dd583f2 [1.2.X] Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
Backport of r15789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-10 00:04:43 +00:00
Ian Kelly
317f30a77f [1.2.X] Fixed another case-sensitivity bug in Oracle introspection. This one was harmless, but it was causing an irritating test failure. 
Backport of r15787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 22:47:25 +00:00
Ian Kelly
76636c81cd [1.2.X] Fixed a case-sensitivity bug in Oracle introspection that was preventing inspectdb from identifying foreign keys. 
Backport of r15785 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 19:41:33 +00:00
Ian Kelly
4c152afbb6 [1.2.X] Fixed a test that was failing in Oracle due to default ordering assumptions. 
Backport of r15783 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 19:22:27 +00:00
Ian Kelly
1c08ca568f [1.2.X] Fixed a number of tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
Backport of r15779 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 00:43:36 +00:00
Ian Kelly
05b197dbb1 [1.2.X] Added a skip for a test that fails in Oracle. Unlike other backends, Oracle does not allow duplicate rows where there is a unique_together constraint for which some but not all of the columns are NULL. 
Backport of r15777 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 22:50:56 +00:00
Ian Kelly
e81e64cd63 [1.2.X] Fixed field names that were preventing the tests from running in Oracle. Backport of r15774 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 19:38:54 +00:00
Russell Keith-Magee
ee31d7124f [1.2.X] Fixed #15554 -- Corrected test failure in contenttypes when default site isn't example.com. Thanks to twil for the report, and PaulM for the patch. 
Backport of r15766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-07 00:12:02 +00:00
Russell Keith-Magee
20cf3b82a1 [1.2.X] Fixed #3094 -- Updated docs to reflect actual behavior of XMLField. Thanks to PaulM for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-06 07:03:27 +00:00
Russell Keith-Magee
cb4b469a7f [1.2.X] Added trove classifiers for specific python versions. Thanks to Brett Cannon for the suggestion. 
Backport of r15760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-05 10:39:10 +00:00
Gabriel Hurley
64011c8e5a [1.2.X] Fixed #11864 -- Improved the "see also" section of the many-to-one model topic guide to more clearly connect people to the backwards-related objects docs and to the correct point in the model tests for sample code (since the doctests went away). Thanks to dwillis for the work on the patch. 
Backport of [15758] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 22:30:18 +00:00
Simon Meers
52739520c6 [1.2.X] Fixed #15547 -- incorrect link in generic views reference page. 1.2 only. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 20:05:57 +00:00
Russell Keith-Magee
64cf5d33ac [1.2.X] Refs #15550 -- Corrected another primary-key ordering problem in the modelforms tests. Thanks to bberes for the report. 
Backport of r15753 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:28:22 +00:00
Russell Keith-Magee
138c4aaa77 [1.2.X] Fixed #15550 -- Corrected an ordering dependency in the model_forms doctests. Thanks to bberes for the report. 
Backport of r15745 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 00:42:37 +00:00
Russell Keith-Magee
d9b9684eff [1.2.X] Fixed #15549 -- Removed dependency on specific primary keys. Thanks to bberes for the report. 
Backport of r15744 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 00:42:21 +00:00
Russell Keith-Magee
a1697e883a [1.2.X] Fixed #15548 -- Added an ordering clause to prevent test failures under Postgres. Thanks to bberes for the report. 
Backport of r15743 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 00:41:54 +00:00
Gabriel Hurley
a9a85d7cfa [1.2.X] Fixed #15504 -- Cleaned up contrib.syndication and contrib.utils.feedgenerator docs. Corrected numerous reST problems, removed duplicate method declarations, corrected method signatures, etc. Thanks to slinkp for the report. 
Backport of [15739] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 22:22:03 +00:00
Ramiro Morales
f88b9eee53 [1.2.X] Fixed #11206 -- Ensure that the floatformat template filter doesn't switch to scientific notation when asked to format a zero value with more than six decimal places. Thanks Tai Lee for the report and fix and Facundo Batista for his help when Decimal module expertise was needed. 
Backport of [15736] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 21:17:48 +00:00
Gabriel Hurley
de46b6687f [1.2.X] Added crossref targets for a couple of Django exceptions and cleaned up related reST markup. 
Backport of [15733] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 19:32:55 +00:00
Ramiro Morales
1091a8e73e [1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up. 
Backport of [15731] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 18:45:07 +00:00
Gabriel Hurley
ef53365a7d [1.2.X] Fixed #15541 -- Updated FAQ to point at djangosites.org instead of defunct wiki page. Thanks to aaugustin for the report and draft patch. 
Backport of [15729] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 18:27:08 +00:00
Russell Keith-Magee
113a8c1f1c [1.2.X] Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates. 
Backport of r15726 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:53:12 +00:00
Jannis Leidel
a97396948b [1.2.X] Fixed wrong import introduced in r15697. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:47:46 +00:00
Jannis Leidel
0516b99875 [1.2.X] Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master. 
Backport from trunk (r15722).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:47:39 +00:00
Jannis Leidel
1985ca77ea [1.2.X] Fixed #13411 -- Made sure URL fragments are correctly handled by the next_redirect utility of the comments apps. Thanks, timesong, dpn and Julien Phalip. 
Backport from trunk (r15720).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:04:51 +00:00
Russell Keith-Magee
ac87e4f8fa [1.2.X] Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch. 
Backport of r15717 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:42:56 +00:00
Russell Keith-Magee
4c76896ead [1.2.X] Fixed #15530 -- Corrected typo in template loader deprecation message. Thanks to msaelices for the report and patch. 
Backport of r15714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:38:08 +00:00
Russell Keith-Magee
76f5b4eb5c [1.2.X] Fixed #15532 -- Clarified the error message for unknown auth backends. Thanks to kmike for the report. 
Backport of r15713 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:37:56 +00:00
Jannis Leidel
84f398e77c Fixed typo in r15710. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-02 21:47:55 +00:00
Jannis Leidel
b34a08e070 [1.2.X] Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath. 
Backport from trunk (r15709).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-02 21:37:29 +00:00
Jannis Leidel
7207481aa8 [1.2.X] Fixed #11223 -- Fixed logout view to use the 'next' GET parameter correctly as described in the docs, while only allowing redirection to the same host. 
Backport from trunk (r15706).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-02 12:59:26 +00:00
Luke Plant
29fccc353c [1.2.X] Added file missing from [15696], sorry for breakage. 
Thanks to Ramiro for letting me know. Refs #717.

Backport of [15699] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 18:55:39 +00:00
Luke Plant
58bd249283 [1.2.X] Fixed #717 - If-Modified-Since handling should compare dates according to RFC 2616 
Thanks to Maniac for the report, julienb for the initial patch, and
especially to aaugustin for the final patch and tests.

Backport of [15696] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 14:34:03 +00:00
Ramiro Morales
8d3ee29847 [1.2.X] Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report. 
Backport of [15678] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 03:07:25 +00:00
Ramiro Morales
b5b5d3c280 [1.2.X] Fixed #15520 -- Fixed incompatibility with email module shipped with Python 2.4 introduced in r15669. Thanks dobcey for the report. 
Backport of [15675] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-28 14:09:58 +00:00
Gabriel Hurley
a5f71e1264 [1.2.X] Fixed #15365 -- Added a warning to the contrib.markup docs reminding users that the marked up output will not be escaped. 
Backport of [15673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-28 05:40:55 +00:00