mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Code Issues 32 Releases Wiki Activity
18,485 Commits 29 Branches 437 Tags
Commit Graph

1179 Commits

Author SHA1 Message Date
Aymeric Augustin
3483682749 [1.7.x] Fixed #23831 -- Supported strings escaped by third-party libs in Django. 
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.
 2014-12-27 18:26:20 +01:00
Aymeric Augustin
b429a9796a [1.7.x] Fixed an inconsistency introduced in 547b1810. 
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.
 2014-12-27 18:17:18 +01:00
Tim Graham
a79012f6d8 [1.7.x] Fixed #24000 -- Corrected contrib.sites default site creation in a multiple database setup. 
Backport of 89e2c60f4396241c667b7a1de37765b7c96d702f from master
 2014-12-27 10:29:21 -05:00
Claude Paroz
322560489b [1.7.x] Fixed #24051 -- Made schema infrastructure honor tablespaces 
Partial backport of 30cbd5d36. Thanks Douglas J. Reynolds for the
report and initial patch.
 2014-12-27 15:12:17 +01:00
Tim Graham
1173140dbf [1.7.x] Fixed #24054 -- Enabled sqlsequencereset for apps with migrations. 
Backport of c2e419c26781b88f2b34b445f450b735267155b0 from master
 2014-12-26 15:57:30 -05:00
Tim Graham
51ea30a43b [1.7.x] Fixed #24037 -- Prevented data loss possibility when changing 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
 2014-12-23 14:26:56 -05:00
Tim Graham
ac098867c0 [1.7.x] Fixed #23525 -- Fixed admindocs crash on apps installed as eggs. 
Thanks welbornprod for report and initial patch.

Backport of 01ab84c61330ffa5ac87c637249611c5e5343e57 from master
 2014-12-22 15:19:48 -05:00
Oscar Ramirez
1ad5deedd4 [1.7.x] Fixed #23998 -- Added datetime.time support to migrations questioner. 
Backport of 54085b0f9ba7d9f705f9b9c90d3433b0ef6aa042 from master
 2014-12-22 07:26:57 -05:00
Tim Graham
c24624025b [1.7.x] Added upgrade instructions for deprecated model _meta permission methods. 
Backport of a3d96bee36040975ded8e3bf02e33e48d06f1f16 from master
 2014-12-19 19:12:50 -05:00
Claude Paroz
f46a16614d [1.7.x] Fixed #24015 -- Factorized create_index_sql expression 
Backport of 6072f17d0 from master, with one test reinforced.
Thanks Tim Graham for the review.
 2014-12-18 21:14:29 +01:00
Claude Paroz
47912d9f2b [1.7.x] Fixed #24007 -- Ensure apps registry's ready before unpickling models 
This prevents AppRegistryNotReady errors when unpickling Django
models from an external script.
Backport of 108b8bf85 from master.
 2014-12-17 18:41:12 +01:00
Mosson, Andrew
6d8c14621e [1.7x.] Fixed #23497 -- Made admin system checks run for custom AdminSites. 
Backport of b7219c7ba5fdfbf9349948b5a91af50e32822ee6 from master
 2014-12-17 09:16:05 -05:00
Markus Holtermann
a38951948a [1.7.x] Fixed display of lists after website redesign 
Thanks Brian Jacobel for the report. refs django/djangoproject.com#197

Backport of c7786550c4ed396b8580db58f7da60e850894d19 from master
 2014-12-17 08:24:27 -05:00
Alex Gaynor
ebfb1dab26 [1.7.x] Fixed the formatting of one section of the security page 
Backport of 104aaab7049afc6ef456fee52763f6d4f7dd575d from master
 2014-12-16 19:01:06 -05:00
Tim Graham
c085bea6c3 [1.7.x] Fixed #23975 -- Restored pre_migrate signal if all apps have migrations. 
Thanks kmmbvnr for the report.

Backport of d2ff8a7241b621b8013c7ec1631e95ae4445f76d from master
 2014-12-16 18:39:19 -05:00
Andriy Sokolovskiy
10482faf19 [1.7.x] Fixed #23983 -- Fixed a crash in migrations when adding order_with_respect_to to non-empty table. 
Backport of 3dbbb8a89ca4beaabd5359fe82e32ed633b15140 from master
 2014-12-16 10:56:35 -05:00
Andriy Sokolovskiy
fdf4dc6cea [1.7.x] Fixed #23405 -- Fixed makemigrations prompt when adding Text/CharField. 
A default is no longer required.

Backport of d8f3b86a7691c8aa0ec8f5a064ad4c3218250fed from master
 2014-12-15 14:58:01 -05:00
Tim Graham
4cc646bb56 [1.7.x] Fixed typos in docs/releases/1.7.2.txt. 
Backport of d39461eb46b2d11051940e16818baf2f0e1b894d from master
 2014-12-15 13:43:34 -05:00
Andriy Sokolovskiy
1690b92b0d [1.7.x] Fixed #23987 -- Made SQLite SchemaEditor always use effective_default(). 
Backport of 089047331d972c0ee58d13476fc54f2118bf1359 from master
 2014-12-15 13:42:08 -05:00
JuneHyeon Bae
eb632bfba5 [1.7.x] Fixed timesince translations for Korean 
Refs #23989.
 2014-12-14 16:47:06 +01:00
Shai Berger
9189ef438e [1.7.x] Added release note for Refs #23969 2014-12-13 22:57:25 +02:00
Carl Meyer
0a8b911582 [1.7.x] Fixed #23455 -- Accept either bytes or text for related_name, convert to text. 
Backport of c72eb80d114fb5d90bd21b5549e8abd0bbd17f99 from master.
 2014-12-12 13:13:57 -07:00
Carl Meyer
f8b4cf4022 [1.7.x] Revert "Fixed #23455 -- Forced related_name to be a unicode string during deconstruction." 
This reverts commit 45bd7b3bd9008941580c100b9fc7361e3ff3ff0d.

This is a backport of 8aaf51f94c70e3cfcd2c75a0be1b6f55049d82d8 from master.
 2014-12-12 13:09:04 -07:00
Tim Graham
c64286c62b [1.7.x] Fixed #23857 -- Fixed admin crash with "save as new" and deleting inline. 
Thanks amarandon for the report.

Backport of c7a19f42030c15ad3b3475ad9a4854e10733ff74 from master
 2014-12-12 11:49:44 -05:00
Grzegorz Slusarek
4b96e862b4 [1.7.x] Fixed #23674 -- Fixed a crash when a MultiValueField has invalid data. 
Backport of 0dea81cd6d34b3e41cc4bbec99b5fdf06142b09e from master
 2014-12-12 08:50:38 -05:00
Tim Graham
a189e9f0d0 [1.7.x] Appeased spell checker. 
Backport of 6a141832ab9be30d1bde4794560897bcdbe68fb6 from master
 2014-12-11 14:44:27 -05:00
Markus Holtermann
f446acf8bb [1.7.x] Fixed #23956 -- Fixed migration creation for multiple table inheritance 
Backport of 44927ba817a4ecf9834d429ff6c86bc5ac961305 from master
 2014-12-11 13:28:57 -05:00
Claude Paroz
6ba960266a [1.7.x] Fixed #23954 -- Added special text/varchar PostgreSQL indexes in migrations 
Thanks adityagupta104 for the report and Tim Graham for the review.
Backport of 8d7a48027e from master.
 2014-12-04 21:39:32 +01:00
Tim Graham
d57124433f [1.7.x] Fixed #23920 -- Fixed MySQL crash when adding blank=True to TextField. 
Thanks wkornewald for the report and Markus Holtermann for review.

Backport of 765fa36d57d08d0568438f6fd74521e7a56abb61 from master
 2014-12-04 10:59:05 -05:00
Tim Graham
99c0cc5300 [1.7.x] Fixed #23939 -- Moved session verification out of SessionAuthenticationMiddleware. 
Thanks andrewbadr for the report and Carl Meyer for the review.

Backport of b06dfad88fb12a927c86a1eb23064201c9560fb1 from master
 2014-12-03 13:42:02 -05:00
Gavin Wahl
e9975ed3cd [1.7.x] Fixed #23950 -- Prevented calling deconstruct on classes in MigrationWriter. 
Backport of dee4d23f7e703aec2d1244e4facbf7f4c88deed5 from master
 2014-12-03 08:32:59 -05:00
Andriy Sokolovskiy
2d0d6cadd4 [1.7.x] Fixed #23946 -- Fixed runserver crash when socket error contains Unicode chars. 
Backport of bba545345f46f09245799f7ae0a22177a84eba71 from master
 2014-12-02 12:02:18 -05:00
Kamil Braun
ccc30ffe57 [1.7.x] Fixed #23934 -- Fixed regression in admin views obj parameter. 
Backport of 0623f4dea46eefba46efde6c6528f7d813ef4391 from master
 2014-12-02 08:43:59 -05:00
Claude Paroz
3a42d9730c [1.7.x] Fixed #23909 -- Prevented crash when collecting SQL for RunSQL 
Thanks James Rivett-Carnac for the report and Markus Holtermann
for the review.
Backport of e11c6fd21 from master.
 2014-12-02 09:02:54 +01:00
Markus Holtermann
ba3e976186 [1.7.x] Fixed #23880 -- Added missing index_together handling for SQLite 
Backport of d2202ec2d4d0477b682c6d0051f27ab4843ef89f from master
 2014-12-01 16:00:36 -05:00
Luke Plant
87254532fb [1.7.x] Release notes for ff3d746e8d8e8fbe6de287bd0f4c3a9fa23c18dc 
Backport of 8b15018fd57b7b10df321b61a17601982660ebdc from master
 2014-11-26 08:22:49 +00:00
Simon Charette
2a20bccda9 [1.7.x] Fixed #23754 -- Always allowed reference to the primary key in the admin 
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
 2014-11-25 13:32:24 -05:00
Redouane Zait
f671905fdb [1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view. 
Backport of 8e7b384d89db67e450aef1f2eb9a12703a5942e9 from master
 2014-11-25 11:27:30 -05:00
Sergey Fedoseev
78fe7ec14f [1.7.x] Fixed #23888 -- Fixed crash in File.__repr__() when name contains unicode. 
Backport of 1e9ac504e4 from master
 2014-11-24 15:55:43 -05:00
Luke Plant
9d0e61f04d [1.7.x] Further fixes to the migration notes for get_query_set 
This rename is very tricky for the case of subclasses which define
get_query_set and haven't been updated yet, which applies to all projects in
the form of RelatedManager from Django 1.5.

Backport of 0c623da66406d1f20b5e26d497d57da5ad0de066 from master
 2014-11-24 15:35:31 +00:00
Luke Plant
e10c5a8fdd [1.7.x] Better migration docs for get_query_set -> get_queryset 
This way they won't need to fix things again when get_query_set disappears

Backport of 91e2780dfba5609b0f83d51aee1cf7e8fe78b1f7 from master
 2014-11-24 10:17:27 +00:00
Carl Meyer
2d06c112d1 Revert "[1.7.x] Fixed #23892 -- Made deconstructible classes forwards 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.
 2014-11-22 22:26:58 -07:00
Carl Meyer
8014001d92 [1.7.x] Fixed #23892 -- Made deconstructible classes forwards compatible 
Backport of f36151ed169813f2873e13ca9de616cfa4095321 from master.
 2014-11-22 14:33:46 -07:00
Andrzej Pragacz
feded19104 [1.7.x] Fixed #23794 -- Fixed migrations crash when removing a field that's part of index/unique_together. 
Backport of 72729f844e0dd9bd01b3874171b89ab0d136a40e from master
 2014-11-21 10:57:38 -05:00
Anssi Kääriäinen
01f2cf2aec [1.7.x] Fixed #23605 -- Fixed nested subquery regression 
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
 2014-11-20 13:53:28 -05:00
Carl Meyer
03e8c18288 [1.7.x] Fixed #23410 -- Avoided unnecessary rollbacks in related apps when migrating backwards. 
Backport of ab2819aa7b09d36d9ff24830a9825aa52b87fdb4 from master.
 2014-11-19 16:15:05 -07:00
Stratos Moros
50434aebe2 [1.7.x] Fixed #22248 -- Made RenameModel reversible 
Backport of cf7a2a000e from master
 2014-11-19 09:51:07 -05:00
Tillmann Karras
dfcac7d7f5 [1.7.x] Fixed #23799 -- Made makemigrations respect --no-optimize. 
Thanks to yamila-moreno for the idea of a skip message.

Backport of d18810131995dac63f9d89b0beaeadfc935130aa from master
 2014-11-18 09:20:04 +01:00
Markus Holtermann
03d983f7c3 [1.7.x] Fixed #23859 -- Fixed a migration crash when a field is renamed that is part of an index_together 
Backport of 7b4a994599b75a07cb07d1e0cc26b3bbf25ab7a6 from master.
 2014-11-17 15:57:19 -07:00
Tim Graham
cf5e2c46f2 [1.7.x] Fixed #23802 -- Typos in 1.7 release notes. 
Backport of d5a109f6e6684b2ea8028af5c57f4257872d11aa from master
 2014-11-13 20:10:40 +01:00