mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-03 13:44:45 +00:00
Code Issues 32 Releases Wiki Activity
18,626 Commits 29 Branches 441 Tags
Commit Graph

11190 Commits

Author SHA1 Message Date
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
109719a9cb [1.7.x] Updated six to 1.8.0. 
Backport of 81477c91f6 from master
 2014-11-04 21:22:45 -05: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
Claude Paroz
378f94e39e [1.7.x] Confirmed Spatialite 4 support 
Backport of e62dea9ad5 from master
 2014-11-03 10:51:23 -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
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
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
David Hoffman
d9bb7128fe [1.7.x] Fixed #23558 -- documented slugify limitations 
Backport of 03467368db from master
 2014-10-30 09:08:01 -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
Berker Peksag
d73c7e5db6 [1.7.x] Limited lines to 119 characters in django/{contrib,db}. 
Refs #23395.

Backport of c9178ef17a (to decrease chance of backport conflicts) from master
 2014-10-29 08:01:35 -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
0a4183dfe6 [1.7.x] Fixed typo in MySQL backend doctring 
Thanks CHI Cheng for the report.
 2014-10-27 14:03:15 +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
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
Tim Graham
c4092e8bde [1.7.x] Post-release version bump. 2014-10-22 13:29:56 -04:00
James Bennett
c5780adeec [1.7.x] Bump version number for bugfix release. 2014-10-22 12:56:07 -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
Shai Berger
a1578055e6 [1.7.x] Fixed #23649 -- Made Oracle test-db creation drop test-user earlier when needed 
Checked database destruction for ORA-29857, which happens when objects of
some types are left over in an old test database (notably, such objects
are created by the GIS backend). When this happens, we can resolve the
issue by dropping the test-user (if we are allowed to).

An alternative approach, to just switch the order of creation (so that,
if the test user exists and can be dropped, it is always dropped before
the tablespace) was considered; but since the user creation depends on
the tablespace, this would necessitate separating the dropping of the user
from its creation -- a change I am reluctant to make.

Thanks Josh Smeaton and Tim Graham for reviews.

Backport of 2e1ed5f33c from master
 2014-10-17 04:58:31 +03: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
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
0dbf366d90 [1.7.x] Revert "Improved AppRegistryNotReady message." 
This reverts commit 154f5f0de108f428de2d5f488e0264f4459a4b66.

Aymeric: "I chose not to talk about django.setup() here on purpose.
This will hardly always be the correct solution."

Backport of 8121860be4 from master
 2014-10-04 13:16:05 -04:00
Collin Anderson
154f5f0de1 [1.7.x] Improved AppRegistryNotReady message. 
Backport of 6fa9fa91a5 from master
 2014-10-04 08:24:18 -04:00
Claude Paroz
e9c8aefbce [1.7.x] Updated translations from Transifex 2014-09-30 20:51:54 +02: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
Tim Graham
9d7a4ea205 [1.7.x] Fixed #23537 -- Added Oracle GIS SchemaEditor. 
Thanks Shai Berger for review.

Backport of a8f07530a7 from master
 2014-09-25 21:25:46 -04:00
Tim Graham
692df41419 [1.7.x] Added missing import removed in bad merge. 2014-09-25 18:02:40 -04: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
Tim Graham
1dec42822c [1.7.x] Fixed #23538 -- Added SchemaEditor for MySQL GIS. 
Thanks Claude Paroz for suggestions and review.

Backport of 74e7f91e6d from master
 2014-09-25 14:36:31 -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