mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-16 04:10:45 +00:00
Code Issues 32 Releases Wiki Activity
18,395 Commits 29 Branches 437 Tags
Commit Graph

1139 Commits

Author SHA1 Message Date
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
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
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
aruseni
7c44d4be34 [1.7.x] Fix a typo in 1.7 release notes 
Backport of faf4d5c510 from master
 2014-11-10 20:02:26 -05:00
aruseni
c6d5f74371 [1.7.x] Fixed a typo in 1.6 release notes. 
Backport of 006451f894 from master
 2014-11-10 15:39:04 +01:00
Tim Graham
3fb6e17857 [1.7.x] Fixed #23785 -- Typo in docs/releases/1.6.txt 
Backport of 091f5b5a4e from master
 2014-11-09 22:12: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
Tim Graham
77209e783c [1.7.x] Removed redundant link in 1.7 release notes. 
Backport of 9f4c718b2f from master
 2014-11-05 09:10:16 -05:00
Tim Graham
109719a9cb [1.7.x] Updated six to 1.8.0. 
Backport of 81477c91f6 from master
 2014-11-04 21:22:45 -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
Tim Graham
17205a98ed [1.7.x] Fixed #23731 -- Fixed migrations crash when adding blank GeometryFields on PostGIS. 
Thanks raratiru for the report and Claude Paroz for review.

Backport of d6d55368d4 from master
 2014-10-31 18:38:46 -04: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
Tim Graham
9c9f35ed27 [1.7.x] Fixed #23152 -- Added support for transactional Spatialite metadata initialization. 
Thanks Doug Goldstein for the initial patch.

Backport of 57e40551e4 from master
 2014-10-30 13:58:02 -04:00
slollo
ffd31c017f [1.7.x] Updated FIRST_DAY_OF_WEEK for Ukrainian to Monday. 
Backport of eab3dc195e from master
 2014-10-30 09:20:57 -04: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
Tim Graham
bb42bab6d3 [1.7.x] Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations. 
Backport of 03bd79ed2 from master
 2014-10-29 08:25:59 -04:00
Claude Paroz
a0cfd77971 [1.7.x] Added GeoDjango compatibility with mysqlclient driver 
Thanks Tim Graham for helping on that issue.
 2014-10-27 16:10:35 +01: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
6149a0ab18 [1.7.x] Edited release note for refs #23621. 2014-10-27 07:13:23 -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
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
Berker Peksag
7227ec8ecc [1.7.x] Removed simplejson inventory file from docs/conf.py. 
Backport of 695956376f from master
 2014-10-25 08:21:49 -04:00
Tim Graham
03a20e5abd [1.7.x] Fixed #23692 -- Removed alpha/beta/rc release notes. 
Backport of 740934b507 from master
 2014-10-25 08:20:04 -04: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
Tim Graham
81095a1ae5 [1.7.x] Added stub release notes for 1.7.2. 
Backport of 4bf86d25e5 from master
 2014-10-22 13:39:27 -04:00
Tim Graham
0f9b4b5a90 [1.7.x] Added release dates to release notes. 
Backport of 9dc782b631 from master
 2014-10-22 12:24:13 -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
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
Tim Graham
55a5f0b49a [1.7.x] Added 1.7.1 release notes for refs #23649. 
Backport of 6ce6c77e03 from master
 2014-10-17 08:57:15 -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
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 8d789449c7861b8cf8b10d244f26d9d354989aaf 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