| 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
|
|
Backpatch of 78a2617703bc1dada409f126db5c3db214913ff4 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.
|
|
|
|
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
|
|
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.
|
|
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.
|
|
Thanks Tim Graham for the report
Backport of c75dd664cf from master
|
|
Backport of 3b60ffa334 from master
|
|
Thanks Gunnar Scherf for the report and the suggested patch.
Backport of 384816fcc 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.
|
|
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.
|
|
67c30426c1370f5d6c39bd73888c3902c1c5f365.
|
|
67c30426c1370f5d6c39bd73888c3902c1c5f365.
|
|
Thanks Enrique Martínez for the report and @bmispelon for the tests.
Backport of 17ed99f3a3eea4bd27fa34be59c3582616ed8079 from master.
|
|
Regression introduced by commit 9777442.
Thanks to trac username troygrosfield for the report and test case.
Backpatch of cb83448891f2920c926f61826d8eae4051a3d8f2 from master.
Conflicts:
tests/prefetch_related/models.py
|
|
Change strategy used to examine instrumented output to acommodate the
fact that on Windows, where the path separator is '\', repr() of Python
modules has changed in Python 3 to use escaped backslashes in the FS
path section (e.g.
'C:\\python3x\\Lib\\site-packages\\django\\contrib\\auth\\models.py')
without having to special-case based on platform.
c04f3fc686 from master.
|
|
51d2e1fb23 from master.
|
|
This shows itself with Python 3 under Windows where UTF-8 usually isn't
the default file I/O encoding and caused one failure and three errors
in our test suite under that platform setup.
b5f52647fe from master.
|
|
a3690168cb from master.
|
|
Thanks wildfire for the report.
Backport of 3514bcb251 from master.
|
|
Thanks Raphaël Barrois for the report and the initial patch and
Aymeric Augustin for the review.
Backport of a14f087233 from master.
|
|
Thanks kontakt@eikefoken.de for the report.
Backport of 42a67ec1cd from master.
|
|
Thanks jpic for the report and chmodas for working on a patch.
Reverts 2ea80b94. Refs #19362.
Conflicts:
tests/utils_tests/test_encoding.py
|
|
Thanks gcc for the report and vajrasky for the patch.
Backport of 570d9c2678d6cc564f9c70138554af8f7ce9ec49 from master.
|
|
Thanks to vajrasky for the report and patch.
Backport of a971d19 from trunk.
|
|
Thanks to Carl and Shai for the discussion.
Backport of 8ff4303 from master.
|
|
Windows.
Thanks Michael Manfre for the report, Raphaël Barrois for the patch and
Claude Paroz, Aymeric Augustin for the reviews.
Refs #7936
62dfd79f8b from master.
|
|
- Fixed test that didn't close the files it opened
- Caught and handled exception when temp directory cannot be removed
Backport of 978e1351a6 of master
|
|
3ec368014d0d74e14a7ed98ccfd638ffe0e62863.
|
|
throwing an exception.
Thanks Tuttle for the report.
Backport of 5381317fe3 from master
|
|
Take in account platform path separator. Refs #19552.
651bed0918 from master.
|
|
os.symlink() is available starting with Windows Vista but can fail at
runtime.
0f46ec315e from master.
|
|
|