django.git, branch 1.6.2 django http://cgit.adnoto.dev/django.git/atom?h=1.6.2 2014-02-06T21:38:06Z Bump version number for 1.6.2. 2014-02-06T21:38:06Z Jacob Kaplan-Moss jacob@jacobian.org 2014-02-06T21:38:06Z urn:sha1:687b3d96c40d745371c64bca7fe6d46a4e7e379c Updated 1.6.2 release notes for release (and linkified tickets). 2014-02-06T21:34:41Z Jacob Kaplan-Moss jacob@jacobian.org 2014-02-06T21:34:22Z urn:sha1:c58a98cc34d471d743cd39e873e5b730a372d01b [1.6.x] Added missing items to 1.6.2 release notes. 2014-02-06T00:30:30Z Tim Graham timograham@gmail.com 2014-02-06T00:29:41Z urn:sha1:5f03b06919997aaba4244034afafdf3b84a3e7d3 Backport of b17c75564f from master [1.6.x] Added previous commit to 1.6.2 release notes. 2014-02-05T20:46:24Z Baptiste Mispelon bmispelon@gmail.com 2014-02-05T20:46:02Z urn:sha1:a77ec255737eb87d5e876083651c9aaf950d6f46 Backport of 2dd88f0687c2bc9c457816a011bf5e46f6bf84ad from master. [1.6.x] Revert "Fixed #20296 -- Allowed SafeData and EscapeData to be lazy" 2014-02-05T20:32:17Z Baptiste Mispelon bmispelon@gmail.com 2014-02-05T04:16:39Z urn:sha1:8864d2478946506db22d2d2d37585f55536fb358 This reverts commit 2ee447fb5f8974b432d3dd421af9a242215aea44. That commit introduced a regression (#21882) and didn't really do what it was supposed to: while it did delay the evaluation of lazy objects passed to mark_safe(), they weren't actually marked as such so they could end up being escaped twice. Refs #21882. Backport of a878bf9b093bf15d751b070d132fec52a7523a47 from master. [1.6.x] Fixed #21748 -- join promotion for negated AND conditions 2014-02-04T17:06:37Z Anssi Kääriäinen akaariai@gmail.com 2014-01-08T17:35:47Z urn:sha1:fd3fa851b592700a8b04af46f626454db0db02e4 Made sure Django treats case .filter(NOT (a AND b)) the same way as .filter((NOT a OR NOT b)) for join promotion. Heavily modified backpatch of 35cecb1ebd0ccda0be7a518d1b7273333d26fbae from master. Conflicts: django/db/models/sql/query.py tests/queries/tests.py [1.6.x] Fixed #21413 -- resolve_columns fields misalignment 2014-02-04T13:21:13Z Anssi Kääriäinen akaariai@gmail.com 2013-11-17T13:50:14Z urn:sha1:0f272629ca18e440aef67b4a3fd9377a57fb25a8 Backpatch of 9918c11114ac3ec9622631558ef26ebf3919cb69 from master. Conflicts: django/db/models/sql/compiler.py tests/model_inheritance_regress/tests.py [1.6.x] Made Oracle introspect FloatFields correctly 2014-01-29T23:26:42Z Shai Berger shai@platonix.com 2014-01-29T17:18:32Z urn:sha1:5f42c0219550b62e62db6e0f3834671a994e3cd8 Broke InspectDBTestCase.test_field_types in two: - a test_number_field_types, which now passes on Oracle too - a test_field_types, for all non-numeric fields, which is still expected to fail Also made some pep8 fixes in the tests file. Refs #19884 Thanks Tim Graham for review. Backport of e9d12ba from master [1.6.x] Made Oracle introspect boolean fields 2014-01-29T23:04:19Z Shai Berger shai@platonix.com 2014-01-29T16:08:01Z urn:sha1:0573120cb406066041b0235a3912dc38bc9f10ef Refs #19884 Backport of ad975c64fc from master [1.6.x] Fix typo CRSF -> CSRF 2014-01-29T17:08:42Z Ian Foote python@ian.feete.org 2014-01-29T16:54:02Z urn:sha1:05cef1939e523bdd80d3d3f7864c3b89a2cab303 Backport of af64f829d7 from master