mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-23 15:50:45 +00:00
Code Issues 32 Releases Wiki Activity
18,466 Commits 29 Branches 438 Tags
Commit Graph

5670 Commits

Author SHA1 Message Date
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
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
Tim Graham
66c0529b3e [1.7.x] Fixed refs #23987 test on Oracle. 
Backport of ac5f2a4ef7b9993502ebc02f487cbb06bfb9bf0a 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 d8f3b86a7691c8aa0ec8f5a064ad4c3218250fed 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 089047331d972c0ee58d13476fc54f2118bf1359 from master
 2014-12-15 13:42:08 -05: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
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
5219a02fda [1.7.x] Added a test to verify headers set by default middleware; refs #23939. 
Backport of 50c1d8f24b0d04c813b3dd34720df86446091afa from master
 2014-12-03 14:17:05 -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
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
Tim Graham
bc5bb3e1a0 [1.7.x] Fixed selenium test failure of JavascriptI18nTests. 
The failure was introduced in dd1ea70779adff294140eddb0229c382e12f32f3.
The tests wouldn't start due to a "Dependency on unknown app" error.

Backport of b8cc5f3cd4c70518dceb894edf9717abff79f0b4 from master
 2014-12-01 17:04:44 -05:00
Tim Graham
943b1047de [1.7.x] Fixed flake8 warnings. 
Backport of 392e11945fa246d751d23bb515703fcaf55dfa26 from master
 2014-12-01 16:01:18 -05: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
Carl Meyer
6f65bd1cf0 [1.7.x] Fixed #23872 -- Removed sensitivity of migrations tests to CWD. 
Backport of 47b7f601eeb93bd7a91f87b77da658212f2f2314 from master.
 2014-11-26 17:36:04 -07: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 ff3d746e8d8e8fbe6de287bd0f4c3a9fa23c18dc from master, with
additional tests from c5def493d0993d65bf7d96f0a204006cbeaa6178
 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 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
Alasdair Nicol
f91c6ecc22 [1.7.x] Fixed #23865 -- documented how to assign errors to a field in 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
 2014-11-21 13:02:40 -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 72729f844e0dd9bd01b3874171b89ab0d136a40e from master
 2014-11-21 10:57:38 -05:00
Markus Holtermann
145467a636 [1.7.x] Fixed duplicate index error on Oracle; refs #23859. 
Refers to regression introduced in 7b4a994599b75a07cb07d1e0cc26b3bbf25ab7a6

Backport of 4c709cc0ef0daa2b527e056865f51796fb0d42f3 from master
 2014-11-20 14:44:05 -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
Markus Holtermann
1b8c067a4f [1.7.x] Cleaned up and reformatted autodetector tests 
Backport of 233165083593baf5f62194f50df26fb830e5f570 from master.
 2014-11-19 18:25:00 -05:00
Markus Holtermann
2f8cd09a06 [1.7.x] Formatted model states in autodetector tests 
Backport of f17acd59303a27876966927869af7f4bfe38a74a from master.
 2014-11-19 18:25:00 -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
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 e9103402c0fa873aea58a6a11dba510cd308cb84.
 2014-11-13 11:03:01 +01:00
Tim Graham
d4bec655ae [1.7.x] Fixed flake8 warning. 
Backport of dec7da3c4c from master
 2014-11-13 10:08:17 +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 bfb11b95626f39e2f5e18d97d7761c6f93dcc1a9 from master.

Conflicts:
	django/forms/fields.py
 2014-11-12 22:46:00 +01:00
Markus Holtermann
1f50ea730e [1.7.x] Fixed #23770 -- Changed serialization strategy for floats with respect to NaN and Inf 
Thanks to w0rp for the report

Backport of c7c098cf97fbb1416f302c76799058ad63a5f7aa from master.
 2014-11-06 15:31:30 +01:00
Veres Lajos
6b32adda59 [1.7.x] Fixed typos using https://github.com/vlajos/misspell_fixer 
Backport of a71a2ea756 from master
 2014-11-03 21:07:05 -05:00
Andy Chosak
12e5b87b89 [1.7.x] Fixed #23420 - broken warning for unbound naive datetime objects 
Fixed issue with warning message displayed for unbound naive datetime
objects when USE_TZ is True. Adds unit test that demonstrates the issue
(discoverable when using a custom lookup in MySQL).

Backport of ceb1ffcc8d from master.

Conflicts:
	tests/custom_lookups/tests.py
 2014-11-03 15:59:17 +02:00
Markus Holtermann
40ad022d5e [1.7.x] Fixed #23738 -- Allowed migrating from NULL to NOT NULL with the same default value 
Thanks to Andrey Antukh for the report.

Backport of 715ccfde24 from master
 2014-10-31 13:30:56 -04:00
Aymeric Augustin
12bace46c1 [1.7.x] Avoided using private API get_template_from_string. 
Conflicts:
	django/contrib/webdesign/tests.py

Backport of c0c1bb9e from master.
 2014-10-31 11:43:54 +01:00
Markus Holtermann
21358e7225 [1.7.x] Fixed #23614 -- Changed the way the migration autodetector orders unique/index_together 
Thanks to Naddiseo for the report and Tim Graham for the review

Backport of 5c9c1e029d from master
 2014-10-29 13:16:23 -04:00
Claude Paroz
6a1bd837b1 [1.7.x] Fixed #23717 -- Fixed makemessages crash when STATIC_ROOT=None 
Backport of 528c9af54 from master.
 2014-10-27 13:59:09 +01:00
Tim Graham
abee4f718e [1.7.x] Fixed stable/1.7.x test failures from refs #23699. 2014-10-27 08:19:57 -04:00
Tim Graham
af1c85e851 [1.7.x] Fixed flake8 warning. 
Backport of ef9e3c5ed8 from master
 2014-10-27 07:13:47 -04:00
Tim Graham
5cc8180a65 [1.7.x] Fixed #23699 -- Prevented flush from loading initial data for apps with migrations. 
Backport of dd1ea70779 from master.
 2014-10-27 07:13:05 -04:00
Claude Paroz
b42930e4b7 [1.7.x] Fixed #23446 -- Officially recommended mysqlclient as MySQL driver 
Thanks Corey Farwell for the report and Tim Graham for the review.
Thanks also to Inada Naoki for creating and maintaining mysqlclient.
Backport of 7f089ac2e3 from master.
 2014-10-27 09:17:31 +01:00