mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
18,626 Commits 30 Branches 460 Tags
2583ee2a7ef18f20e8814c68df45c2021a3aa220
Commit Graph

11190 Commits

Author SHA1 Message Date
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
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
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
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 b7219c7ba5 from master
 2014-12-17 09:16:05 -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
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
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
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
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
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
Shai Berger
991f523753 [1.7.x] Fixed #23969: Made Oracle default test-tablespace larger. 
It seems our test suite has grown...
Refs #21775
 2014-12-07 12:54:04 +02: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 765fa36d57 from master
 2014-12-04 10:59:05 -05:00
Tim Graham
38960a5dd8 [1.7.x] Fixed assertion from refs #23939 test. 
The assertion is different on master due to
393c0e2422.
 2014-12-03 14:09:23 -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 b06dfad88f 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 dee4d23f7e from master
 2014-12-03 08:32:59 -05:00
Tim Graham
0a70d63b0b [1.7.x] Tweaked fix for refs #23946; thanks Claude. 
Backport of 5c773447c3 from master
 2014-12-02 15:58:49 -05:00
Andriy Sokolovskiy
2d0d6cadd4 [1.7.x] Fixed #23946 -- Fixed runserver crash when socket error contains Unicode chars. 
Backport of bba545345f 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 0623f4dea4 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 d2202ec2d4 from master
 2014-12-01 16:00:36 -05:00
Shai Berger
d62e16fe46 [1.7.x] Restored the 'TEST_' prefix in the warning about deprecated test database settings 
Backport of 88edce2abb from master
 2014-12-01 02:18:16 +02:00
Luke Plant
8e3c3be32d [1.7.x] Fixed bug in circular dependency algo for migration dependencies. 
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 ff3d746e8d from master, with
additional tests from c5def493d0
 2014-11-26 08:15:33 +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 f9c4e14aec 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 8e7b384d89 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
Tom V
014f699c8b [1.7.x] Fixed typo in django/utils/decorators.py comment. 
Backport of d049b36f91 from master
 2014-11-24 10:46:28 -05:00
Carl Meyer
2d06c112d1 Revert "[1.7.x] Fixed #23892 -- Made deconstructible classes forwards compatible" 
This reverts commit 8014001d92.

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 f36151ed16 from master.
 2014-11-22 14:33:46 -07:00
Simon Charette
cc5aa809e2 [1.7.x] Fixed typo in forms/models.py comment. 
Backport of a7c3d0f288 from master
 2014-11-21 15:59:54 -05: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 72729f844e 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 5c481db295 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 ab2819aa7b from master.
 2014-11-19 16:15:05 -07:00
Carl Meyer
ac359dc771 [1.7.x] Fixed #21794 -- Removed deprecation warning for abstract models outside an app. 
Backport of e7b9a58b08 from master.
 2014-11-19 15:56:25 -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 d188101319 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 7b4a994599 from master.
 2014-11-17 15:57:19 -07:00
twidi
49d4095767 [1.7.x] Avoided unneeded calls to state.render() in migrations. 
Backport of 19ae13d9ed from master
 2014-11-17 18:45:21 +01:00
twidi
4fbeec5631 [1.7.x] Reordered condition to avoid calling allow_migrate() if unneeded. 
Backport of 82aca216e1 from master
 2014-11-17 18:34:36 +01:00
Tim Graham
4f5614d68e [1.7.x] Removed thread customizations of six which are now built-in. 
Backport of 7ef81b5cdd from master
 2014-11-13 11:34:03 +01:00
Adam DePue
2d12a59938 [1.7.x] Fixed #23761 -- Fixed crash with MySQL validator and db_type is None. 
The issue was fixed on master in e9103402c0.
 2014-11-13 11:03:01 +01:00
Baptiste Mispelon
606c57a132 [1.7.x] Fixed #23795 -- Fixed a regression in custom form fields 
Custom form fields having a `queryset` attribute but no
`limit_choices_to` could no longer be used in ModelForms.

Refs #2445.

Thanks to artscoop for the report.

Backport of bfb11b9562 from master.

Conflicts:
	django/forms/fields.py
 2014-11-12 22:46:00 +01:00