Commit Graph

9436 Commits

Author SHA1 Message Date
Ramiro Morales cf96d88421 [1.2.X] Fixed #17846 -- Made a note about the micro-version in which a security fix for URLField was introduced in the 1.2.X branch more accurate.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@17677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-10 17:45:26 +00:00
James Bennett ed736e6a25 [1.2.X] Bump to 1.2.7, refs #16804.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-11 01:01:58 +00:00
James Bennett 216a79ee47 [1.2.X] Bump to 1.2.6 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:41:36 +00:00
Russell Keith-Magee 7268f8af86 [1.2.X] Altered the behavior of URLField to avoid a potential DOS vector, and to avoid potential leakage of local filesystem data. A security announcement will be made shortly.
Backport of r16760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:50 +00:00
Russell Keith-Magee ac7c3a110f [1.2.X] Corrected an issue which could allow attackers to manipulate session data using the cache. A security announcement will be made shortly.
Backport of r16759 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:40 +00:00
Russell Keith-Magee c613af4d64 [1.2.X] Added protection against spoofing of X_FORWARDED_HOST headers. A security announcement will be made shortly.
Backport of r16758 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:31 +00:00
Luke Plant 285b464fb8 [1.2.X] Updated AJAX example code in CSRF docs to be consistent regarding what are safe HTTP methods
Backport of [16202] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:56:04 +00:00
Luke Plant cfc1756ef5 [1.2.X] Fixed #15469 - CSRF token is inserted on GET requests
Thanks to goran for report.

Backport of [16191] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 21:39:22 +00:00
Luke Plant 87fa64ca7c [1.2.X] Fixed #15869 - example AJAX code in CSRF docs fails sometimes for IE7 or absolute same origin URLs
Thanks to nick for the report.

Backport of [16183] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 15:49:54 +00:00
Karen Tracey 1dc518555b [1.2.X] Ensure stdin is a tty before handing it to termios, so as to prevent prolems when running under IDEs.
r15911 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 13:00:59 +00:00
Simon Meers c5b476e22a [1.2.X] Fixed typo in forms API documentation.
Backport of r15896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 23:24:13 +00:00
Ramiro Morales 1332e89852 [1.2.X] Tweaked title level in custom file storage systems documentation.
Backport of [15888] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-21 15:41:53 +00:00
Karen Tracey f9f2f4b7ec [1.2.X] Fixed #15565: Ensure terminal echo is on after reloader reloads (something turns it off on some systems if reload happens while at a pdb prompt). Thanks for the report zimnyx.
r15883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 22:13:35 +00:00
Russell Keith-Magee 52e81079be [1.2.X] Fixed #13686 -- Ensure that memcache handling of unicode values in add() and set_many() is consistent with the handling provided by get() and set(). Thanks to nedbatchelder for the report, and to jbalogh, accuser and Jacob Burch for their work ont the patch.
Backport of r15880 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 02:45:51 +00:00
Justin Bronn 9ccf1d087e [1.2.X] Fixed #14133 -- Updated Windows installation instructions for GeoDjango, now recommend the OSGeo4W installer for spatial libraries.
Backport of r15872 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 20:12:38 +00:00
Russell Keith-Magee cbf9688b12 [1.2.X] Fixed #15622 -- Clear content type cache to avoid problems with subsequence TransactionTestCases. Thanks to zyga for the report
Backport of r15867 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:42:10 +00:00
Russell Keith-Magee 1d64c8a539 [1.2.X] Fixed #15142 -- Force test views to be non-cached so that projects with caching middleware enabled don't cause test failures. Thanks to jsdalton for the report and patch
Backport of r15865 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:10:52 +00:00
Russell Keith-Magee 05c929fb3b [1.2.X] Fixed #15569 -- Corrected the numbering updates to inlines when rows are added and deleted. Thanks to sbaechler for the report, to Arthur de Jong and mk for the work on the patch, and to Karen Tracey for the last minute testing help.
Backport of r15862 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:50:53 +00:00
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