| Age | Commit message (Collapse) | Author |
|
|
|
|
|
Backport of b17c75564f from master
|
|
Backport of 2dd88f0687c2bc9c457816a011bf5e46f6bf84ad from master.
|
|
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.
|
|
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
|
|
Backpatch of 9918c11114ac3ec9622631558ef26ebf3919cb69 from master.
Conflicts:
django/db/models/sql/compiler.py
tests/model_inheritance_regress/tests.py
|
|
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
|
|
Refs #19884
Backport of ad975c64fc from master
|
|
Backport of af64f829d7 from master
|
|
Backport of dfa28981ce from master
|
|
Backport of 2cbe1e28fb from master
|
|
Backport of 780ae7e9f8 from master.
|
|
Thanks Wim for the report.
Backport of 2b154ae from master.
|
|
Backport of 8e1fc03 from master
|
|
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.
|
|
Thanks tragiclifestories for the report.
Backport of e1d18b9d2e from master
|
|
Backport of 4d8209431d from master
|
|
Backpatch of 78a2617703bc1dada409f126db5c3db214913ff4 from master.
|
|
Backport of 81830ce34f from master
|
|
Backport of 05d36dc06e6d767bb28993c65a54b703f319a386 from master.
|
|
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 79e1d6ebd70898d514a44b85648e3d24104c4243 from master.
|
|
Thanks Giggaflop and Jennifer Casavantes.
Backport of 5f9790072d from master
|
|
issue.
Backport of 2171341162 from master
|
|
Backport of dfc092622e from master
|
|
REQUIRED_FIELDS.
Thanks russellm for the report.
Backport of 6f06c749b7 from master
|
|
refs #21195 on master.
|
|
Backport of a44cbca2a5f1388c6511dad48443877fa660845a from master.
|
|
Thanks Aymeric for the suggestion.
Backport of bc7668eb51 from master
|
|
as var %} syntax.
Thanks leif_p for the suggestion.
Backport of 4a5aac47a6 from master
|
|
django-jython.
Thanks Josh Juneau (maintainer of django-jython) for the review.
Backport of a67e327db5 from master
|
|
relationships.
Backport of 9173d2cb74 from master
|
|
Thanks nedbatchelder for the report and claudep for the patch.
Backport of c05b2f58e7 from master
|
|
Thanks daGrevis for the suggestion.
Backport of d35f2bfd5b from master
|
|
Thanks gcc for the suggestion.
Backport of 9e5033b302 from master
|
|
Backport of 82f466b571 from master
|
|
Fixed #21452 again.
|
|
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
|
|
This test could change settings.DATABASES['default']['TIME_ZONE'] and
didn't restore the previous value.
Backport of 1c24096f from master.
|
|
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
|
|
Backport of 81bb8d1220 from master
|
|
Backport of 270c9fe488 from master
|
|
Thanks rafalp for the report.
Backport of c717ebbfec from master.
|
|
Backport of 4d27d311f6 from master
|
|
docs/intro/contributing.txt.
Backport of e6800ea136 from master
|
|
Thanks pydanny for the report. Also, added documentation about
base_fields attribute and its difference with fields attribute.
Backport of ea83102d0f from master
|
|
when reusing built-in filters.
Thanks Stephen McDonald for the suggestion.
Backport of 07711e9997 from master
|
|
Backport of 6dd8631617 from master
|
|
Backport of 44d40ba521 from master
|
|
|