test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,491 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

18491 Commits

Author SHA1 Message Date
Russell Keith-Magee f1a22feaa8 [1.7.x] Renamed variables to avoid name collision with import of django.db.models. 
Backport of 013c2d8d02 from master
 2014-12-31 08:02:06 -05:00
Tim Graham 9311a94ca5 [1.7.x] Revert "Updated some docs for the delayed deprecation of legacy table creation; refs #22340." 
The deprecation was moved back to 1.9 in
61da5f3f02.

Backport of d7fc6eb8ca from master
 2014-12-30 11:53:33 -05:00
Markus Holtermann d49b5851b4 [1.7.x] Added test for an intermediate swappable model change in migration state. 
refs #22563

Backport of fca866763a from master
 2014-12-30 10:03:41 -05:00
Tim Graham a9da5dd5b6 [1.7.x] Fixed #23581 -- Prevented extraneous DROP DEFAULT statements. 
Thanks john_scott for the report and Markus Holtermann for review.

Backport of ab4f709da4 from master
 2014-12-30 08:31:18 -05:00
Tim Graham 79645529e7 Revert "[1.7.x] Fixed #23938 -- Added migration support for m2m to concrete fields and vice versa" 
This reverts commit 1702bc52cc.

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.
 2014-12-29 15:37:15 -05:00
Markus Holtermann 1702bc52cc [1.7.x] Fixed #23938 -- Added migration support for m2m to concrete fields and vice versa 
Thanks to Michael D. Hoyle for the report and Tim Graham for the review.

Backport of 623ccdd598 from master
 2014-12-29 13:42:29 -05:00
Tim Graham 1cbdb49b0a [1.7.x] Fixed #24056 -- Fixed syntax highlighting in topics/testing/tools.txt. 
Backport of 3d0c3a0482 from master
 2014-12-27 19:51:33 -05:00
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 89e2c60f43 from master
 2014-12-27 10:29:21 -05:00
wrwrwr 965a999ae5 [1.7.x] Fixed #23929 -- Added more tests for create_default_site. 
Backport of 1f98ec2e53 from master
 2014-12-27 10:26:43 -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
Collin Anderson 2af33a0719 [1.7.x] Clarified custom header instructions in tutorial 2. 
Backport of 0821b3d53c from master
 2014-12-26 18:29:52 -05:00
Tim Graham 1173140dbf [1.7.x] Fixed #24054 -- Enabled sqlsequencereset for apps with migrations. 
Backport of c2e419c267 from master
 2014-12-26 15:57:30 -05:00
Helen Sherwood-Taylor b9169a100d [1.7.x] Fixed #24041 -- Documented effect of changing a model instance's primary key. 
Backport of 4ccdf6e57f from master
 2014-12-24 15:07:27 -05:00
Frankie Robertson 126eb58abe [1.7.x] Fixed #24035 -- Clarified docs on CACHE_MIDDLEWARE_KEY_PREFIX vs KEY_PREFIX 
Backport of 446b50b90e from master
 2014-12-23 14:40:35 -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 061caa5b38 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 01ab84c613 from master
 2014-12-22 15:19:48 -05:00
Alexander Schulze 4c92ecd705 [1.7.x] Fixed #23959 -- Clarified when checks automatically run. 
Backport of cf2390be16 from master
 2014-12-22 11:35:57 -05:00
David Cramer 66e9154399 [1.7.x] Corrected scoping of savepoint example 
Backport of 27f68f8659 from master
 2014-12-22 07:51:09 -05:00
Oscar Ramirez 1ad5deedd4 [1.7.x] Fixed #23998 -- Added datetime.time support to migrations questioner. 
Backport of 54085b0f9b 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 a3d96bee36 from master
 2014-12-19 19:12:50 -05:00
Claude Paroz ea18652238 [1.7.x] Made model_regress unpickling test CWD-independent 
Refs #24007. Thanks Tim Graham for his help with the patch.

Backport of 1d9fc5caa9 and
995be4a137 from master
 2014-12-19 14:26:46 -05:00
Berker Peksag a970d6d941 [1.7.x] Moved version directives to the bottom of the loaddata section. 
Backport of 6403e07c50 from master
 2014-12-19 06:57: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
Tim Graham 2f13a48f33 [1.7.x] Removed need to update Python version support note on each new release. 
Backport of 0c06f06131 from master
 2014-12-18 11:56:50 -05:00
Tim Graham c2d8da7555 [1.7.x] Corrected indentation in docs to prevent inadvertent blockquote. 2014-12-18 11:34:11 -05: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 b7219c7ba5 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 c7786550c4 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 104aaab704 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 d2ff8a7241 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 3dbbb8a89c from master
 2014-12-16 10:56:35 -05:00
Tim Graham 66c0529b3e [1.7.x] Fixed refs #23987 test on Oracle. 
Backport of ac5f2a4ef7 from master
 2014-12-15 18:20:41 -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 d8f3b86a76 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 d39461eb46 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 089047331d 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
Tim Graham e905d4984d [1.7.x] Updated advice on six.moves.range/xrange; refs #23812. 
Backport of bc88ec550a from master
 2014-12-13 13:42:45 -05:00
Carl Meyer 0a8b911582 [1.7.x] Fixed #23455 -- Accept either bytes or text for related_name, convert to text. 
Backport of c72eb80d11 from master.
 2014-12-12 13:13:57 -07:00
Carl Meyer b376071936 [1.7.x] Fixed #23982 -- Added doc note on generating Python 2/3 cross-compatible migrations. 
Thanks Luke Plant for the report, and Tim Graham, Simon Charette, and Markus
Holtermann for review and discussion.

This is a backport of d4bdddeefe from master.
 2014-12-12 13:09:59 -07:00
Carl Meyer f8b4cf4022 [1.7.x] Revert "Fixed #23455 -- Forced related_name to be a unicode string during deconstruction." 
This reverts commit 45bd7b3bd9.

This is a backport of 8aaf51f94c 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 c7a19f4203 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 0dea81cd6d from master
 2014-12-12 08:50:38 -05:00
Tim Graham a189e9f0d0 [1.7.x] Appeased spell checker. 
Backport of 6a141832ab from master
 2014-12-11 14:44:27 -05:00
Markus Amalthea Magnuson 63d8f84e5d [1.7.x] Fixed typo in admin deprecation message. 
Backport of d4e449d730 from master
 2014-12-11 13:40:05 -05:00
Markus Holtermann f446acf8bb [1.7.x] Fixed #23956 -- Fixed migration creation for multiple table inheritance 
Backport of 44927ba817 from master
 2014-12-11 13:28:57 -05:00
Yohan Boniface 491bf20d19 [1.7.x] Fixed incorrect filter name in docs/topics/i18n/translation.txt. 
Backport of 38fc463fbf from master
 2014-12-11 12:12:33 -05:00
Tim Graham da562d6a87 [1.7.x] Fixed #23961 -- Clarified when makemigrations will create a directory. 
Backport of fa6e3a40e1 from master
 2014-12-09 07:31:33 -05:00