Commit Graph

5626 Commits

Author SHA1 Message Date
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
Loic Bistuer 7fa6781f81 [1.7.x] Fixed #23621 -- Warn for duplicate models when a module is reloaded.
Previously a RuntimeError was raised every time two models clashed
in the app registry. This prevented reloading a module in a REPL;
while it's not recommended to do so, we decided not to forbid this
use-case by turning the error into a warning.

Thanks dfunckt and Sergey Pashinin for the initial patches.

Backport of 8c4ca16c65 and b62f72498a from master
2014-10-26 00:12:17 +07:00
Tim Graham 7750fc8fa8 [1.7.x] Fixed #23702 -- Fixed adding an explicit id field on SQLite.
Thanks gavinwahl for the report.

Backport of 92269b7b53 from master
2014-10-23 14:35:55 -04:00
Tim Graham f70a733abc [1.7.x] Fixed #23630 -- Made AlterModelTable rename auto-created M2M tables.
Thanks Naddiseo for the report, Andrew Godwin for guidance,
and Shai Berger for review.

Backport of 41b337efa0 from master
2014-10-23 08:51:08 -04:00
Claude Paroz d5a273eadb [1.7.x] Fixed #23583 -- More selectively ignored static/media roots
Fixed a regression introduced by 28efafa24c.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.
Backport of 8b4cc9df9c from master.
2014-10-21 20:20:26 +02:00
Claude Paroz 53bc81dca3 [1.7.x] Fixed #21740 -- Allowed test client data to be an empty string
This fixes a regression introduced by 2a31d00933.
Thanks tony-zhu for the report.
Backport of f0bb3c98cc from master.
2014-10-21 09:17:42 +02:00
Simon Charette 117e970610 [1.7.x] Fixed a flake8 warning.
Backport of f6c208d95c from master
2014-10-20 13:17:00 -04:00
Tianyi Wang 3f3bed8fb9 [1.7.x] Fixed #23629 -- Allowed autodetector to detect changes in Meta.db_table.
Thanks Naddiseo for reporting.

Backport of 5732424bee from master
2014-10-20 13:15:34 -04:00
Rigel Di Scala e8262b5941 [1.7.x] Fixed #23615 -- Validate that a Model instance's "check" attribute is a method.
The "check" name is a reserved word used by Django's check framework,
and cannot be redefined as something else other than a method, or the check
framework will raise an error.

This change amends the django.core.checks.model_check.check_all_models()
function, so that it verifies that a model instance's attribute "check"
is actually a method. This new check is assigned the id "models.E020".

Conflicts:
	docs/ref/checks.txt

Backport of a5c77417a6 from master
2014-10-17 00:36:43 +07:00
Claude Paroz da0ebe39f6 [1.7.x] Fixed #23651 -- Isolated non-existent fixture tests
Previous versions of the tests were buggy, as initial_data.json
did exist and the test wasn't failing. It was finally failing on
Python 3.4.2.
Thanks Raphaël Hertzog for the report (and Debian bug #765117
contributors).
Backport of 7a893ee771 from master.
2014-10-15 09:18:14 +02:00
Claude Paroz 555952c3e6 [1.7.x] Adapted invalid cookie test to all Python versions
Refs #23638. Older Python versions are less strict when parsing
invalid cookie content. The test just has to ensure Django doesn't
crash.
2014-10-14 09:59:14 +02:00
Claude Paroz 6398ebab93 [1.7.x] Fixed #23638 -- Prevented crash while parsing invalid cookie content
Thanks Philip Gatt for the report and Tim Graham for the review.
Backport of 59d487e7fc from master.
2014-10-13 17:39:23 +02:00
Florian Apolloner bc13a08f89 [1.7.x] Fixed #23063 -- Convert \n and \r to \r\n when using the SMTP backend as per RFC.
Backport of 8d789449c7 from master.
2014-10-12 22:03:01 +02:00
Konrad Świat fd3dccb8dd [1.7.x] Fixed #23616 - Fixed generic relations in ModelAdmin.list_filter.
Thanks ranjur for reporting bug, timgraham for review,
and collinanderson for contributing tips.

Backport of 06b11b617e from master
2014-10-10 13:12:26 -04:00
Markus Holtermann 71988ed953 [1.7.x] Fixed #23609 -- Fixed IntegrityError that prevented altering a NULL column into a NOT NULL one due to existing rows
Thanks to Simon Charette, Loic Bistuer and Tim Graham for the review.

Backport of f633ba778d from master
2014-10-09 22:41:27 +07:00
Rudy Mutter e31be40f16 [1.7.x] Fixed #23365 -- Added support for timezone-aware datetimes to migrations.
Backport of a407b846b4 from master
2014-10-09 22:39:17 +07:00
Ian Foote d830665007 [1.7.x] Fixed #23333 -- Made urlsafe_base64_decode() return proper type on Python 3.
Backport of 03d89168a2 from master
2014-10-08 14:03:46 -04:00
André Ericson fa4b6482df [1.7.x] Fixed #23611 -- update_or_create failing from a related manager
Added update_or_create to RelatedManager, ManyRelatedManager and
GenericRelatedObjectManager.
Added missing get_or_create to GenericRelatedObjectManager.

Conflicts:
	tests/generic_relations/tests.py
	tests/get_or_create/tests.py

Backport of ed37f7e979 from master
2014-10-08 04:55:47 +07:00
Tim Graham 96f022203a [1.7.x] Fixed #23593 -- Fixed crash in AdminEmailHandler with non-ASCII characters in request.
Thanks edevil for the report and Simon Charette for review.

Backport of 9dff5ce7c7 from master
2014-10-06 17:37:38 -04:00
Markus Holtermann c2508990cb [1.7.x] Fixed #23601 -- Ensured view exists in URLconf before importing it in admindocs.
Backport of 2f16ff5a6c from master
2014-10-06 13:44:01 -04:00
Loic Bistuer 082abce81e [1.7.x] Fixed #23594 -- Fixed deepcopy on ErrorList.
Thanks Troy Grosfield for the report and Tim Graham for the tests.

Backport of ec2fd02bb3 from master
2014-10-07 00:14:11 +07:00
Emmanuelle Delescolle f8d845910b [1.7.x] Fixed #23604 -- Allowed related m2m fields to be references in the admin.
Thanks Simon Charette for review.

Backport of a24cf21722 from master
2014-10-06 08:43:05 -04:00
Tim Graham 4743a94429 [1.7.x] Required numpy < 1.9 for tests; refs #23489. 2014-09-29 19:31:29 -04:00
Loic Bistuer 7355885ef5 [1.7.x] Fixed #23560 -- Fixed MigrationWrite to handle builtin types without imports.
Thanks Tim Graham for the review.

Backport of b23d47412c from master
2014-09-27 00:40:35 +07:00
Markus Holtermann e8a08514de [1.7.x] Fixed #23455 -- Forced related_name to be a unicode string during deconstruction.
Backport of 45bd7b3bd9 from master
2014-09-25 17:50:50 -04:00
Markus Holtermann 00c2a721e2 [1.7.x] Fixed #23415 -- Added fields for unmanaged and proxy model migrations.
Thanks sky-chen for the report.

Backport of 215aa4f53b from master
2014-09-25 10:28:11 -04:00
Tim Graham d7b32d3120 [1.7.x] Revert "Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations."
Backport of d7ab2cefb7 from master
2014-09-24 15:56:24 -04:00
Tim Graham 02aa3e30e9 [1.7.x] Fixed #23421 -- Corrected TEST SERIALIZE setting.
Thanks gkoller for the report and Markus Holtermann for review.
2014-09-24 14:49:46 -04:00
Markus Holtermann ae14c75014 [1.7.x] Fixed #23426 -- Don't require double percent sign in RunSQL without parameters
Backport of b9a670b227 from master
2014-09-24 07:21:50 -04:00
Justin Caratzas cc74d8e02e [1.7.x] Fixed #23539 -- Added get_extra(), get_max_num(), and get_min_num() hooks to GenericInlineModelAdmin.
Backport of cf43a1ee90 from master
2014-09-24 06:33:07 -04:00
Sergey Fedoseev 991ec655b6 [1.7.x] Fixed #23503 -- Fixed renaming of model with self-referential m2m field.
Backport of 463952d940 from master
2014-09-23 10:12:10 -04:00
Sergey Fedoseev 58d7b84d53 [1.7.x] Fixed #23065 -- Quoted constraint names in SQL generated by migrations.
Backport of 83cd18633f from master
2014-09-23 10:11:58 -04:00
Tim Graham 0f52bf7c96 [1.7.x] Fixed some flake8 errors.
Backport of 9d30412a5a from master
2014-09-19 12:33:44 -04:00
Baptiste Mispelon 04e7c7d51f [1.7.x] Fixed #23492 -- Restored F.__deepcopy__.
This reverts commit 3a66035107.
A regression test was also added.

Backport of d63ac5b595 from master.
2014-09-16 12:24:01 +02:00
valtron 563eaf0499 [1.7.x] Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations.
Backport of abcf28a076 from master
2014-09-15 15:06:21 -04:00
Carl Meyer ac1adfbe4a [1.7.x] Fixed #23483 -- Prevented ImproperlyConfigured with dotted app names
Made sure the app labels stay unique for the AppConfigStubs, so
migrations wouldn't fail if two dotted app names has the same last part
(e.g. django.contrib.auth and vendor.auth)

Backport of 5e32605ce9 from master.
2014-09-12 15:34:42 -06:00
Markus Bertheau 35cd0854f9 [1.7.x] Corrected grammar in migrations error message.
Backport of 61f56e239f from master
2014-09-10 10:34:32 -04:00
Markus Holtermann 67872bfff1 [1.7.x] Fixed #23452 -- Prevented infinite migrations for empty unique/index_together.
Thanks fwkroon for the report.

Backport of 6d5958c7a3 from master
2014-09-10 07:57:31 -04:00
Aymeric Augustin c981d9140d [1.7.x] Fixed #22920 -- Avoid masking some exceptions.
If loading an application trigger an ImportError, the details of that
error were lost in some cases. Thanks Ben Davis for the report.

Backport of b161c01 from master
2014-09-09 20:54:07 +02:00
Tim Graham a8ded528b3 [1.7.x] Fixed #11775 -- Made ABSOLUTE_URL_OVERRIDES work with models that don't define get_absolute_url().
Thanks jukvalim for the report and initial patch,
and Preston Timmons for review.

Backport of c32bc1a7a7 from master
2014-09-09 11:07:41 -04:00
Petras Zdanavičius a3e9e9e6c6 [1.7.x] Fixed #23451 -- Fixed typo in inlineformset_factory() error message.
Backport of f7eee04ebe from master
2014-09-08 17:22:49 -04:00
Markus Holtermann 1f1a329288 [1.7.x] Fixed broken test from da160d440f; refs #23418.
Backport of 16548cfc7c from master
2014-09-08 16:51:34 -04:00
Markus Holtermann b0def3bcac [1.7.x] Fixed #23418 -- Fail when migration deconstruct produces invalid import
Backport of d28b5f13b3 from master
2014-09-08 15:41:14 -04:00
Simon Charette 9c4fb019cb [1.7.x] Fixed #23431 -- Allowed inline and hidden references to admin fields.
This fixes a regression introduced by the 53ff096982 security fix.

Thanks to @a1tus for the report and Tim for the review.

refs #23329.

Backport of 342ccbddc1 from master
2014-09-08 13:54:21 -04:00
Andrew Pinkham 27e7972e63 [1.7.x] Fixed #22951 -- Checked for types during deep_deconstruct migration serializ
Thanks Sam Hartsfield for the report.

Backport of 4680d25df2 from master
2014-09-08 07:58:06 -04:00