| Age | Commit message (Collapse) | Author |
|
|
|
Backport of dda2a3cf4cc29d01de180f66d19441f300732e52 from master
|
|
2.4.2.
Backport of 76356d96 from master
|
|
'default' DATABASES is empty.
Backport of e8cf4f8abec87b9da6ed8e5c8cf833af9b27f4dd from master
|
|
aren't setup.
|
|
define get_internal_type()
Regression introduced in 3d4a826174b7a411a03be39725e60c940944a7fe
Thanks IRC user ris for the report, Loïc Bistuer, Anssi Kääriäinen and
Andriy Sokolovskiy for the discussion and Tim Graham for the review.
|
|
signals when unapplying initial migrations of contenttypes and auth"
This reverts commit 478546fcef38d95866a92bc44d10e15b26c7254c.
Backport of 2832a9b028c267997b2fd3dd0989670d57cdd08f from master
|
|
while running tests"
This reverts commit b419bd38431b83eec93376cd911e2b17eb8e7342.
Backport of bd3d796ecd9a66832ad26024df65caeb63b60a5d from master
|
|
|
|
|
|
instead of class instance
|
|
This regression was caused by 818e59a3f0. The patch is a partial
backport of the new FileResponse class available in later Django
versions.
Thanks Raphaël Hertzog for the report, and Tim Graham and Collin
Anderson for the reviews.
|
|
Backport of b19b81b3960ec2090d40be65547502a3386a769b from master
|
|
Thanks Łukasz Harasimowicz for the report.
Backport of 5792e6a88c1444d4ec84abe62077338ad3765b80 from master
|
|
Thanks Simon and Markus for reviews.
Backport of 28db4af80a319485c0da724d692e2f8396aa57e3 from master
|
|
Thanks Tim Graham for the report
Backport of 51dc617b21e67636d96cf645905797a4d6ff4bf0 from master
|
|
unapplying initial migrations of contenttypes and auth
Thanks Florian Apolloner for the report and Claude Paroz and Tim Graham for the review and help on the patch.
Backport of 737d24923ac69bb8b89af1bb2f3f4c4c744349e8 from master.
|
|
|
|
|
|
This is a security fix. Disclosure following shortly.
Thanks Keryn Knight for the report and initial patch.
|
|
This is a security fix. Disclosure following shortly.
|
|
This is a security fix. Disclosure following shortly.
|
|
environ.
This is a security fix. Disclosure following shortly.
Thanks to Jedediah Smith for the report.
|
|
states
Backport of fdc2cc948725866212a9bcc97b9b7cf21bb49b90 and be158e36251df0b07556657da47cdaf10913c57a from master
|
|
Backport of 74f02557e0183812d6d60e2548985c5c40b3d27b from master
|
|
Thanks Peter Schmidt for the report and the initial patch.
Thanks to Oktay Sancak for writing the original failing test and
Alvin Savoy for supporting contributing back to the community.
Backport of d7bc37d61 from master.
|
|
Thanks codeitloadit for the report, living180 for investigations
and Tim Graham for the review.
Backport of 27dd7e7271 from master.
|
|
|
|
|
|
|
|
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
|