innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
18,297 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

11068 Commits

Author SHA1 Message Date
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 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 0dbf366d90 [1.7.x] Revert "Improved AppRegistryNotReady message." 
This reverts commit 154f5f0de1.

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
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
Tim Graham b4c9920352 [1.7.x] Skipped a broken geoapp test on Oracle; refs #23504. 
Backport of 729cd6a11a from master
 2014-09-23 20:01:59 -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
Sergey Fedoseev 09b5ff64b8 [1.7.x] Factored create_fk_sql, create_unique_sql, and delete_constraint_sql. 
Backport of 0bea6c8749 from master
 2014-09-23 10:11:29 -04:00
Dejan Noveski f1d7fffc95 [1.7.x] Fixed #23532 -- Fixed Macedonian locale date formats 
Backport of 903d144d85 from master.
 2014-09-22 18:07:18 +02:00
Tim Graham 17a4038cf3 [1.7.x] Skipped a broken GIS test on Oracle; refs #23504. 
Backport of 828edc5ba9 from master
 2014-09-19 15:06:11 -04:00
Tim Graham b287676739 [1.7.x] Made a GIS test work on Oracle. 
Thanks Josh Smeaton and Claude Paroz for advice.

Backport of 7add30df01 from master
 2014-09-19 15:05:56 -04:00
Tim Graham 988c7425ff [1.7.x] Skipped an unsupported test on Oracle GIS. 
This is fixed more elegantly on master with a feature flag in 6c1a0581ab.
 2014-09-19 12:26:36 -04:00
Tim Graham aa9c69a726 [1.7.x] Fixed an inspectapp test on Oracle GIS. 
This is fixed more elegantly with a feature flag on master in 33e817a6d8.
 2014-09-19 12:21:43 -04:00
Tim Graham e295b0f875 [1.7.x] Removed unnecessary order_by() from a GIS test that crashed Oracle. 
Oracle cannot order_by() a TextField; refs #23504.

Backport of 7fc13178d6 from master
 2014-09-19 12:16:23 -04:00
Tim Graham a0a65b2fd2 [1.7.x] Skipped some broken tests on Oracle GIS; refs #23504. 
Backport of 7fce7f51ef from master
 2014-09-19 12:12:48 -04:00
Tim Graham c61d2c0387 [1.7.x] Improved GIS migration test cleanup; refs #23504. 
Backport of 8facb02faf from master
 2014-09-19 12:10:37 -04:00
Malte Beckmann d4c68c46aa [1.7.x] Fixed #23417 -- Completed locale formats for zh_CN, zh_Hans, zh_Hant and zh_TW. 
Backport of 1ac32e76ac from master
 2014-09-17 11:18:10 -04:00
Duncan Parkes 40ce3efda2 [1.7.x] Overhauled the Welsh formats.py file. 
Backport of df7187d795 from master
 2014-09-17 11:14:11 -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
Claude Paroz 31309d4722 [1.7.x] Fixed #23478 -- Complemented sqlmigrate command help 2014-09-13 09:47:14 +02: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
Tim Graham 7de55fa68e [1.7.x] Fixed #23403 -- Fixed crash in contrib.sitemaps if lastmod returned a date rather than datetime. 
Thanks igorcc for the report and Preston Timmons for review.

Backport of 66580fe97c from master
 2014-09-11 16:15:03 -04:00