| Age | Commit message (Collapse) | Author |
|
|
|
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 780ae7e9f8 from master.
|
|
Thanks Wim for the report.
Backport of 2b154ae from master.
|
|
Backpatch of 78a2617703bc1dada409f126db5c3db214913ff4 from master.
|
|
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
|
|
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
|
|
When STATIC_ROOT wasn't set, collectstatic --clear would delete
every files within the current directory and its descendants.
This patch makes the following changes:
Prevent collectstatic from running if STATIC_ROOT isn't set.
Fixed an issue that prevented collectstatic from displaying the
destination directory.
Changed the warning header to notify when the command is run
in dry-run mode.
Backport of 4befb3015c from master
|
|
Backport of bfe9052831c6d7ad7501b71c884525b3b471eebc from master.
|
|
data as it would get send via smtp.
Backport of c988745cca1225496bfd36910dc3cec5065d8cc4 from master.
|
|
This is to provide a consistent interface (namely bytes) for the smtp
backend which after all sends bytes over the wire; encoding with as_string
yields different results since mails as unicode are not really specified.
as_string stays for backwardscompatibilty mostly and some debug outputs.
But keep in mind that the output doesn't match as_bytes!
Backport of 5dfd824d38ec7d1f695494e46d603e89cae68661 from master.
|
|
Backport of 280c1a65ccacd679bf298bf2b169ff01e7266b8e from master.
|
|
3.3.3+.
Thanks to Arfrever for the report and Aymeric for the review.
Backport of f28ea0230846c81e9b6725454bb3a10df24678aa from master.
|
|
time zone definitions.
Refs #21432.
Backport of 32e75803be from master
|
|
Fixed a crash when executing changepassword command when the user object
representation contained non-ASCII characters.
Backport of 398642fd9b from master
|
|
Thanks Robert Scott for the report.
Backport of 542198c1d0 from master.
|
|
Refs #21601.
|
|
|
|
|
|
Current language is no longer saved to session by LocaleMiddleware
on every response (the behavior introduced in #14825).
Instead language stored in session is reintroduced into new session
after logout.
|
|
Thanks moritz.pfeiffer at alp-phone.ch for the report and
Tim Graham for the initial patch.
Backport of c7c647419c from master.
|
|
|
|
This was a regression in Django 1.6 that was only partially
restored in 839940f27f.
Thanks Jonas Haag for the report.
Backport of 41ebc4838d from master.
|
|
Thanks dibrovsd at gmail.com for the report and Simon Charette
for the review.
Backport of 8a9c8bb90 from master.
|
|
code.
Thanks to @dmyerscoug for the report and original patch
and to @alasdairnicol for the added tests.
Backport of a020dd0a99da13d0f024d42c46f01d8f503e9d5e from master.
|
|
e36c165b14 from master.
|
|
Thanks svartalf for the report.
Backport of 2080bce69 from master.
|
|
Thanks jared_mess for the report.
Backport of fddb0131d3 from master
|
|
Thanks Rhett Garber for the report and initial patch.
Backport of 34b8a3855 from master.
|
|
Thanks Gunnar Scherf for the report and the suggested patch.
Backport of 384816fcc from master.
|
|
Backport of 5725236c3e from master
|
|
This was particularly problematic in the chain get_wsgi_application
-> db.connections import -> signal connection -> settings configuration.
Thanks Jon Dufresne for the report.
Backport of 42fef294464 from master.
|
|
Removed multiple locales separated by commas variation (that wasn't
working as documented) in favor of simply allowing use of the
``--locale``/``-l`` options more than once for ``makemessages`` and
``compilemessages``.
Thanks Romain Beylerian for the report and Claude, Simon for their help.
|
|
Thanks productions@zaziork.co.uk for the review.
Backport of 18185724e6 from master.
|
|
Thanks guido@20tab.com for the report and Tim Graham for the
analyze.
Backport of 1718b5256c from master.
|
|
Report, analysis and tests from stephenmcd.
Backpatch of 752d3d70da6291039f33781a0a2ef6f3b7c5fcb5 from master.
|
|
Thanks agale031176@gmail.com for the report.
Backport of fafb6cf049b from master.
|
|
Thanks Keryn Knight for the report.
Backport of 97ac22ebfc from master.
|
|
|
|
Refs #21415.
|
|
On Python 3 sorting Fields mixed with GenericForeignKeys doesn't work
as GenericForeignKey isn't a subclass of django.db.models.fields.Field.
Refs #21428.
Backport of 326539f6a4 from master
|
|
The GenericRelation refactoring removed GenericRelations from
model._meta.many_to_many. This had the side effect of disallowing
editable GenericRelations in ModelForms. Editable GenericRelations
aren't officially supported, but if we don't fix this we don't offer any
upgrade path for those who used the ability to set editable=True
in GenericRelation subclass.
Thanks to Trac alias joshcartme for the report and stephencmd and Loic
for working on this issue.
Backpatch of 0e079e4331a8be4dbd18d5e5776116330b0a5e61 from master.
|
|
Refs #21415
|
|
Unfortunately, escape sequences (\x.. or \u....) do not fit well
with the gettext toolchain. Falling back to using literal char,
even if visibility is not ideal.
Backport of 7e0ebd74c from master.
|