Commit Graph

15609 Commits

Author SHA1 Message Date
Claude Paroz 76700c5437 [1.6.x] Fixed #21996 -- Used proper encoding for GeoIP content
Thanks Florent Messa for the report.
Backport of fb1e3435a4 from master.
2014-02-10 16:12:22 +01:00
Claude Paroz e9ffe7e3c8 [1.6.x] Added 1.6.3 release notes stub 2014-02-10 16:10:18 +01:00
Baptiste Mispelon dbb9819360 [1.6.x] Fixed inaccuracies in generic mixins documentation.
Backport of a5391db76a from master.
2014-02-09 11:00:25 +00:00
Jacob Kaplan-Moss 63d6983746 Bumped version number post-release. 2014-02-06 15:53:09 -06:00
Jacob Kaplan-Moss 687b3d96c4 Bump version number for 1.6.2. 2014-02-06 15:38:06 -06:00
Jacob Kaplan-Moss c58a98cc34 Updated 1.6.2 release notes for release (and linkified tickets). 2014-02-06 15:34:41 -06:00
Tim Graham 5f03b06919 [1.6.x] Added missing items to 1.6.2 release notes.
Backport of b17c75564f from master
2014-02-05 19:30:30 -05:00
Baptiste Mispelon a77ec25573 [1.6.x] Added previous commit to 1.6.2 release notes.
Backport of 2dd88f0687 from master.
2014-02-05 21:46:24 +01:00
Baptiste Mispelon 8864d24789 [1.6.x] Revert "Fixed #20296 -- Allowed SafeData and EscapeData to be lazy"
This reverts commit 2ee447fb5f.

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 a878bf9b09 from master.
2014-02-05 21:32:17 +01:00
Anssi Kääriäinen fd3fa851b5 [1.6.x] Fixed #21748 -- join promotion for negated AND conditions
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 35cecb1ebd
from master.

Conflicts:

	django/db/models/sql/query.py
	tests/queries/tests.py
2014-02-04 19:06:37 +02:00
Anssi Kääriäinen 0f272629ca [1.6.x] Fixed #21413 -- resolve_columns fields misalignment
Backpatch of 9918c11114 from master.

Conflicts:

	django/db/models/sql/compiler.py
	tests/model_inheritance_regress/tests.py
2014-02-04 15:21:13 +02:00
Shai Berger 5f42c02195 [1.6.x] Made Oracle introspect FloatFields correctly
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
2014-01-30 01:26:42 +02:00
Shai Berger 0573120cb4 [1.6.x] Made Oracle introspect boolean fields
Refs #19884

Backport of ad975c64fc from master
2014-01-30 01:04:19 +02:00
Ian Foote 05cef1939e [1.6.x] Fix typo CRSF -> CSRF
Backport of af64f829d7 from master
2014-01-29 12:08:42 -05:00
Tim Graham 6f8e655ca0 [1.6.x] Added release note stubs for 1.5.6 and 1.4.11.
Backport of dfa28981ce from master
2014-01-26 17:49:01 -05:00
Tim Graham 38635977b7 [1.6.x] Added missing items to 1.6.2 release notes.
Backport of 2cbe1e28fb from master
2014-01-26 15:40:44 -05:00
Tim Graham 319cfd2097 [1.6.x] Fixed #21823 -- Upgraded six to 1.5.2
Backport of 780ae7e9f8 from master.
2014-01-26 15:38:01 -05:00
Aymeric Augustin db60a52085 [1.6.x] Fixed #21880 -- Added missing items to django.utils.timezone.__all__.
Thanks Wim for the report.

Backport of 2b154ae from master.
2014-01-26 15:36:55 +01:00
Aymeric Augustin a0a6112afc [1.6.x] Fixed typo. Refs #21836.
Backport of 8e1fc03 from master
2014-01-26 09:30:27 +01:00
Chris Jerdonek a21fc1c086 [1.6.x] Fixed #21836 -- Improved transaction docs about autocommit mode
Clarified that queries in autocommit mode are committed immediately
only if a transaction has not already been started. Added to the
main transaction docs that Django's TestCase class implicitly wraps
its tests in transactions.

Backport of 798fd59f from master.
2014-01-25 21:21:30 +01:00
Tim Graham e2e4de6555 [1.6.x] Fixed #21869 -- Fixed docs building with Sphinx 1.2.1.
Thanks tragiclifestories for the report.

Backport of e1d18b9d2e from master
2014-01-24 09:05:49 -05:00
James Turley 6ea5f9e0de [1.6.x] Fixed #21824 -- Added reference to LTS in docs/internals/security.txt
Backport of 4d8209431d from master
2014-01-24 08:14:41 -05:00
Anssi Kääriäinen e47b90e48f [1.6.x] Fixed #21787 -- regression in MTI .exclude() queries
Backpatch of 78a2617703 from master.
2014-01-24 10:18:57 +02:00
Tim Graham c91e772b3a [1.6.x] Fixed some punctuation; thanks Chris Jerdonek.
Backport of 81830ce34f from master
2014-01-23 09:05:09 -05:00
Baptiste Mispelon 6bf05c0267 [1.6.x] Always use parentheses when documenting a method with no arguments.
Backport of 05d36dc06e from master.
2014-01-22 23:00:06 +01:00
Baptiste Mispelon 6bca149af5 [1.6.x] Don't show `self` in the list of arguments of a method.
This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].

[1] http://sphinx-doc.org/markup/desc.html#dir-method

Refs #21855.

Backport of 79e1d6ebd7 from master.
2014-01-22 22:59:55 +01:00
Tim Graham 8eca53f0be [1.6.x] Fixed #20834 -- Described how caching of user permissions works.
Thanks Giggaflop and Jennifer Casavantes.

Backport of 5f9790072d from master
2014-01-22 13:09:44 -05:00
Tim Graham 4cf556db48 [1.6.x] Added a link to the 1.6 release notes which also fixed a rendering issue.
Backport of 2171341162 from master
2014-01-22 11:04:31 -05:00
Tim Graham a4c32d70c2 [1.6.x] Fixed #21529 -- Noted that {% url %} encodes its output (refs #13260).
Backport of dfc092622e from master
2014-01-22 10:45:10 -05:00
Tim Graham f7c2852f30 [1.6.x] Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS.
Thanks russellm for the report.

Backport of 6f06c749b7 from master
2014-01-22 10:19:02 -05:00
Tim Graham a292ad1105 [1.6.x] Fixed #21834 -- Clarifed usage of template_name in tutorial part 4.
refs #21195 on master.
2014-01-20 20:06:08 -05:00
Jacob Kaplan-Moss fcc290eda9 [1.6.x] Added a note about LTS releases.
Backport of a44cbca2a5 from master.
2014-01-19 18:43:20 +01:00
Tim Graham 85149a8b7f [1.6.x] Fixed #18942 -- Clarified usage of {% get_static_prefix %}.
Thanks Aymeric for the suggestion.

Backport of bc7668eb51 from master
2014-01-17 16:06:54 -05:00
Tim Graham 4f058655d0 [1.6.x] Fixed #13116 -- Described scope of variables created by {% url ... as var %} syntax.
Thanks leif_p for the suggestion.

Backport of 4a5aac47a6 from master
2014-01-17 14:52:02 -05:00
Tim Graham b8ec3b6ddd [1.6.x] Fixed #20052 -- Discouraged use of Jython given the current state of django-jython.
Thanks Josh Juneau (maintainer of django-jython) for the review.

Backport of a67e327db5 from master
2014-01-17 09:28:21 -05:00
Tim Graham b1cc1633e0 [1.6.x] Fixed #18285 -- Documented that bulk_create doesn't work with M2M relationships.
Backport of 9173d2cb74 from master
2014-01-16 20:49:06 -05:00
Tim Graham 363b8c690a [1.6.x] Fixed #21768 -- Corrected TemplateView context section.
Thanks nedbatchelder for the report and claudep for the patch.

Backport of c05b2f58e7 from master
2014-01-16 07:59:15 -05:00
Tim Graham b63dad3f45 [1.6.x] Fixed #21727 -- Added some links to help clarify topics/auth/default.txt
Thanks daGrevis for the suggestion.

Backport of d35f2bfd5b from master
2014-01-16 07:17:42 -05:00
Tim Graham f8d93f2c71 [1.6.x] Fixed #21747 -- Added {% elif %} to template topics guide.
Thanks gcc for the suggestion.

Backport of 9e5033b302 from master
2014-01-16 07:09:15 -05:00
Kevin Wood deefdc8e60 [1.6.x] Fixed typo in storage docs
Backport of 82f466b571 from master
2014-01-15 18:44:47 -05:00
Aymeric Augustin 18d75e0792 [1.6.x] Fixed a test that was failing with PostGIS.
Fixed #21452 again.
2014-01-12 21:39:36 +01:00
Aymeric Augustin cb4a000adb [1.6.x] Fixed #21452 -- Non-autocommit connections to PostgreSQL.
When settings.DATABASES['default']['AUTOCOMMIT'] = False, the connection
wasn't in autocommit mode but Django pretended it was.

Thanks Anssi for analysing this issue.

Refs #17062.

Backport of 1afe7488 from master
2014-01-12 18:47:03 +01:00
Aymeric Augustin b79bf9c7a9 [1.6.x] Fixed a test isolation issue. Refs #17062.
This test could change settings.DATABASES['default']['TIME_ZONE'] and
didn't restore the previous value.

Backport of 1c24096f from master.
2014-01-12 18:45:45 +01:00
Loic Bistuer 6728f159f0 [1.6.x] Fixed #21750 -- Fixed regression introduced by 4befb30.
Validating STATIC_ROOT in StaticFilesStorage.__init__ turned out to be
problematic - especially with tests - because the storage refuses to work even
if there are no actual interactions with the file system, which is backward
incompatible.

Originally the validation happened in the StaticFilesStorage.path method, but
that didn't work as expected because the call to FileSystemStorage.__init__
replaced the empty value by a valid path. The new approach is to move back the
check to the StaticFilesStorage.path method, but ensure that the location
attribute remains None after the call to super.

Refs #21581.

Backport of 1e9e7351f8 from master
2014-01-11 08:21:25 -05:00
Marc Sibson bd3af2ee64 [1.6.x] Fixed docstring typo in django/forms/forms.py.
Backport of 81bb8d1220 from master
2014-01-10 08:33:58 -05:00
Michael Blatherwick e694b0631f [1.6.x] Fixed typo in docstrings of MonthArchiveViews.
Backport of 270c9fe488 from master
2014-01-10 08:26:22 -05:00
Claude Paroz 5d99cd6877 [1.6.x] Fixed #21730 -- Removed superfluous db_index in custom auth docs
Thanks rafalp for the report.
Backport of c717ebbfec from master.
2014-01-04 16:13:21 +01:00
Tim Graham 2206321ff9 [1.6.x] Fixed a sentence in the session security docs; thanks claudep.
Backport of 4d27d311f6 from master
2014-01-03 12:04:18 -05:00
Tianyi Wang 7a4d2b8e3d [1.6.x] Fixed #21728 -- Corrected an inadvertent path change in docs/intro/contributing.txt.
Backport of e6800ea136 from master
2014-01-03 12:01:52 -05:00
Vajrasky Kok 0a4e36c68f [1.6.x] Fixed #21319 -- Added documentation for the Form.fields attribute.
Thanks pydanny for the report. Also, added documentation about
base_fields attribute and its difference with fields attribute.

Backport of ea83102d0f from master
2014-01-02 19:45:22 -05:00