| Age | Commit message (Collapse) | Author |
|
Backport of 7a878ca5cb50ad65fc465cb263a44cc93629f75c from master
|
|
Backport of 8a9b0c15a6c0ef60dea3ba3042317520bc201206 from master
|
|
six.moves.range().
Backport of 837fc2d8cdfefce375697d95e241836c7be12696 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
|
|
state.
refs #22563
Backport of fca866763acb6b3414c20ca3772b94cb5d111733 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.
|
|
Partial backport of 30cbd5d36. Thanks Douglas J. Reynolds for the
report and initial patch.
|
|
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
|
|
Backport of 54085b0f9ba7d9f705f9b9c90d3433b0ef6aa042 from master
|
|
Refs #24007. Thanks Tim Graham for his help with the patch.
Backport of 1d9fc5caa947ff4ee72180185e91a9a145171712 and
995be4a1375340a53668dd80444756d77302000d 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
|
|
Backport of ac5f2a4ef7b9993502ebc02f487cbb06bfb9bf0a from master
|
|
A default is no longer required.
Backport of d8f3b86a7691c8aa0ec8f5a064ad4c3218250fed from master
|
|
Backport of 089047331d972c0ee58d13476fc54f2118bf1359 from master
|
|
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 44927ba817a4ecf9834d429ff6c86bc5ac961305 from master
|
|
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
|
|
Backport of 50c1d8f24b0d04c813b3dd34720df86446091afa from master
|
|
MigrationWriter.
Backport of dee4d23f7e703aec2d1244e4facbf7f4c88deed5 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.
|
|
The failure was introduced in dd1ea70779adff294140eddb0229c382e12f32f3.
The tests wouldn't start due to a "Dependency on unknown app" error.
Backport of b8cc5f3cd4c70518dceb894edf9717abff79f0b4 from master
|
|
Backport of 392e11945fa246d751d23bb515703fcaf55dfa26 from master
|
|
Backport of d2202ec2d4d0477b682c6d0051f27ab4843ef89f from master
|
|
Backport of 47b7f601eeb93bd7a91f87b77da658212f2f2314 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
|
|
Model.clean()
Also added a unit test wit the simpler syntax which we have documented,
where the dictionary values are strings.
Backport of 5b26a014a81ba0d404d46e11d2b45c01d92b97e5 from master
|
|
part of index/unique_together.
Backport of 72729f844e0dd9bd01b3874171b89ab0d136a40e from master
|
|
Refers to regression introduced in 7b4a994599b75a07cb07d1e0cc26b3bbf25ab7a6
Backport of 4c709cc0ef0daa2b527e056865f51796fb0d42f3 from master
|
|
Added relabeled_clone() method to sql.Query to fix the problem. It
manifested itself in rare cases where at least double nested subquery's
filter condition might target non-existing alias.
Thanks to Trac alias ris for reporting the problem.
Backport of 5c481db29572a387651681b43d5d4523f96b3793 from master
|
|
Backport of 233165083593baf5f62194f50df26fb830e5f570 from master.
|
|
Backport of f17acd59303a27876966927869af7f4bfe38a74a from master.
|
|
migrating backwards.
Backport of ab2819aa7b09d36d9ff24830a9825aa52b87fdb4 from master.
|
|
Backport of cf7a2a000e from master
|
|
Thanks to yamila-moreno for the idea of a skip message.
Backport of d18810131995dac63f9d89b0beaeadfc935130aa from master
|