| Age | Commit message (Collapse) | Author |
|
|
|
Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master
|
|
Backport of b4bdd5262b18644456d12a00d475adf9897a9255 from master
|
|
Backport of 7a878ca5cb50ad65fc465cb263a44cc93629f75c from master
|
|
Refactored bump_prefix() to avoid infinite loop and allow more than
than 5 subquires by extending the alphabet to use multi-letters.
Backport of 41fc1c0b5eac156e200a10233c7c9210a1c0fed8 from master
|
|
django.db.models.
Backport of 013c2d8d02e679c969255d9b11214d020dd34418 from master
|
|
Thanks john_scott for the report and Markus Holtermann for review.
Backport of ab4f709da4516672b0bd811f2b4d0c4ba9f5b636 from master
|
|
fields and vice versa"
This reverts commit 1702bc52cc20ed0729893177fc8f4391b4b3183c.
This doesn't work on stable/1.7.x because #23844 wasn't backported and we're
not willing to do so because it's a large change.
|
|
and vice versa
Thanks to Michael D. Hoyle for the report and Tim Graham for the review.
Backport of 623ccdd598625591d1a12fc1564cf3ef9a87581f from master
|
|
Refs #7261 -- Made strings escaped by Django usable in third-party libs.
The changes in mark_safe and mark_for_escaping are straightforward. The
more tricky part is to handle correctly objects that implement __html__.
Historically escape() has escaped SafeData. Even if that doesn't seem a
good behavior, changing it would create security concerns. Therefore
support for __html__() was only added to conditional_escape() where this
concern doesn't exist.
Then using conditional_escape() instead of escape() in the Django
template engine makes it understand data escaped by other libraries.
Template filter |escape accounts for __html__() when it's available.
|force_escape forces the use of Django's HTML escaping implementation.
Here's why the change in render_value_in_context() is safe. Before Django
1.7 conditional_escape() was implemented as follows:
if isinstance(text, SafeData):
return text
else:
return escape(text)
render_value_in_context() never called escape() on SafeData. Therefore
replacing escape() with conditional_escape() doesn't change the
autoescaping logic as it was originally intended.
This change should be backported to Django 1.7 because it corrects a
feature added in Django 1.7.
Thanks mitsuhiko for the report.
Backport of 6d52f6f from master.
|
|
mark_safe and mark_for_escaping should have been kept similar.
On Python 2 this change has no effect. On Python 3 it fixes the use case
shown in the regression test for mark_for_escaping, which used to raise
a TypeError. The regression test for mark_safe is just for completeness.
Backport of 5c5eb5fe from master.
|
|
multiple database setup.
Backport of 89e2c60f4396241c667b7a1de37765b7c96d702f from master
|
|
Backport of 1f98ec2e53e4636863396ab54f671f4546f9ba4c from master
|
|
Partial backport of 30cbd5d36. Thanks Douglas J. Reynolds for the
report and initial patch.
|
|
Backport of c2e419c26781b88f2b34b445f450b735267155b0 from master
|
|
Meta.managed.
The migrations autodetector now issues AlterModelOptions operations for
Meta.managed changes instead of DeleteModel + CreateModel.
Thanks iambibhas for the report and Simon and Markus for review.
Backport of 061caa5b386681dc7bdef16918873043224a299c from master
|
|
Thanks welbornprod for report and initial patch.
Backport of 01ab84c61330ffa5ac87c637249611c5e5343e57 from master
|
|
Backport of 54085b0f9ba7d9f705f9b9c90d3433b0ef6aa042 from master
|
|
Backport of 6072f17d0 from master, with one test reinforced.
Thanks Tim Graham for the review.
|
|
This prevents AppRegistryNotReady errors when unpickling Django
models from an external script.
Backport of 108b8bf85 from master.
|
|
Backport of b7219c7ba5fdfbf9349948b5a91af50e32822ee6 from master
|
|
Thanks kmmbvnr for the report.
Backport of d2ff8a7241b621b8013c7ec1631e95ae4445f76d from master
|
|
order_with_respect_to to non-empty table.
Backport of 3dbbb8a89ca4beaabd5359fe82e32ed633b15140 from master
|
|
A default is no longer required.
Backport of d8f3b86a7691c8aa0ec8f5a064ad4c3218250fed from master
|
|
Backport of 089047331d972c0ee58d13476fc54f2118bf1359 from master
|
|
Refs #23989.
|
|
convert to text.
Backport of c72eb80d114fb5d90bd21b5549e8abd0bbd17f99 from master.
|
|
during deconstruction."
This reverts commit 45bd7b3bd9008941580c100b9fc7361e3ff3ff0d.
This is a backport of 8aaf51f94c70e3cfcd2c75a0be1b6f55049d82d8 from master.
|
|
inline.
Thanks amarandon for the report.
Backport of c7a19f42030c15ad3b3475ad9a4854e10733ff74 from master
|
|
Backport of 0dea81cd6d34b3e41cc4bbec99b5fdf06142b09e from master
|
|
Backport of d4e449d73029dd512acb5f156ee5b4e93189e7b9 from master
|
|
Backport of 44927ba817a4ecf9834d429ff6c86bc5ac961305 from master
|
|
It seems our test suite has grown...
Refs #21775
|
|
migrations
Thanks adityagupta104 for the report and Tim Graham for the review.
Backport of 8d7a48027e from master.
|
|
Thanks wkornewald for the report and Markus Holtermann for review.
Backport of 765fa36d57d08d0568438f6fd74521e7a56abb61 from master
|
|
The assertion is different on master due to
393c0e24223c701edeb8ce7dc9d0f852f0c081ad.
|
|
SessionAuthenticationMiddleware.
Thanks andrewbadr for the report and Carl Meyer for the review.
Backport of b06dfad88fb12a927c86a1eb23064201c9560fb1 from master
|
|
MigrationWriter.
Backport of dee4d23f7e703aec2d1244e4facbf7f4c88deed5 from master
|
|
Backport of 5c773447c3239a297b22929f0df15d2971d72e77 from master
|
|
Unicode chars.
Backport of bba545345f46f09245799f7ae0a22177a84eba71 from master
|
|
Backport of 0623f4dea46eefba46efde6c6528f7d813ef4391 from master
|
|
Thanks James Rivett-Carnac for the report and Markus Holtermann
for the review.
Backport of e11c6fd21 from master.
|
|
Backport of d2202ec2d4d0477b682c6d0051f27ab4843ef89f from master
|
|
database settings
Backport of 88edce2abb from master
|
|
Previous algo only worked if the first item was a part of the loop,
and you would get an infinite loop otherwise (see test).
To fix this, it was much easier to do a pre-pass.
A bonus is that you now get an error message that actually helps you debug
the dependency problem.
Backport of ff3d746e8d8e8fbe6de287bd0f4c3a9fa23c18dc from master, with
additional tests from c5def493d0993d65bf7d96f0a204006cbeaa6178
|
|
This change allows dynamically created inlines "Add related" button to work
correcly as long as their associated foreign key is pointing to the primary
key of the related model.
Thanks to amorce for the report, Julien Phalip for the initial patch,
and Collin Anderson for the review.
Backport of f9c4e14aeca7df79991bca8ac2d743953cbd095c from master
|
|
Backport of 8e7b384d89db67e450aef1f2eb9a12703a5942e9 from master
|
|
unicode.
Backport of 1e9ac504e4 from master
|
|
Backport of d049b36f91538595b9c7cdb7a1506c130803d226 from master
|
|
compatible"
This reverts commit 8014001d9287d516c58be80ad71fb63593648b3d.
Adding kwargs to deconstructed objects does not achieve useful
forward-compatibility in general, since the additional kwargs are silently
dropped rather than having their expected effect. In fact, it can cause the
failure to be more difficult to debug. Thanks Shai Berger for discussion.
|