mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-16 13:22:19 +00:00
Code Issues 32 Releases Wiki Activity
20,103 Commits 29 Branches 430 Tags
Commit Graph

6492 Commits

Author SHA1 Message Date
Markus Holtermann
bd80fa6b0f [1.8.x] Fixed #24184 -- Prevented automatic soft-apply of migrations 
Previously Django only checked for the table name in CreateModel
operations in initial migrations and faked the migration automatically.
This led to various errors and unexpected behavior. The newly introduced
--fake-initial flag to the migrate command must be passed to get the
same behavior again. With this change Django will bail out in with a
"duplicate relation / table" error instead.

Thanks Carl Meyer and Tim Graham for the documentation update, report
and review.

Backport of f287bec5833d75750fa6368bc2802741b7924533 from master
 2015-02-13 15:21:10 +01:00
Markus Holtermann
4ba7d73f94 [1.8.x] Removed explicit pointers to migration modules for contrib apps in runtest 
Thanks Tim Graham for the patch

Backport of b4e1090ab28c0e731157a61a91a6875bad392307 from master
 2015-02-13 15:21:03 +01:00
Markus Holtermann
45d93baf51 [1.8.x] Refs #22962 -- Made test case use non-conflicting table names 
Backport of b06935a486e633e9732bce2bc5f796eb437b2531 from master
 2015-02-13 14:39:50 +01:00
Tim Graham
4c948c7c9d [1.8.x] Fixed #24332 -- Fixed contrib.sites create_default_site() when 'default' DATABASES is empty. 
Backport of e8cf4f8abec87b9da6ed8e5c8cf833af9b27f4dd from master
 2015-02-13 07:02:37 -05:00
Josh Smeaton
47b23ca2ee [1.8.x] Refs #14030 -- Added tests for Value aggregates 
Backport of bd4afef98490198e325654952d38a5735ee7e358 from master
 2015-02-13 11:24:25 +11:00
Josh Smeaton
1784c326b1 [1.8.x] Fixed #24319 -- Added validation for UUID model field 
Backport of de0241eb985c6dec978beda119fee353ef3e9604 from master
 2015-02-13 10:01:06 +11:00
Tim Graham
03f4e2d909 [1.8.x] Fixed #24333 -- Fixed admin history view crash with non-integer slug. 
Backport of d64baaef3b95abe9ae5d07317c9bf4df02cb8592 from master
 2015-02-12 14:20:17 -05:00
Tim Graham
8d1816db87 [1.8.x] Added a test for UUIDField serialization; refs #24320. 
Backport of d7509c52466aeffb13ccd8a86475e74fdb0e6292 from master
 2015-02-12 10:17:31 -05:00
Tim Graham
7b5aa20a28 [1.8.x] Fixed #17716 -- Prevented include('...', app_name='...') without a namespace. 
Backport of 27eeb64a96ec6d3a05714ab6319b500a935706fb from master
 2015-02-12 08:19:10 -05:00
Tim Graham
596564e808 [1.8.x] Fixed #24161 -- Stored the user primary key as a serialized value in the session. 
This allows using a UUIDField primary key along with the JSON session
serializer.

Thanks to Trac alias jamesbeith for the report and Simon Charette
for the initial patch.

Backport of 0f7f5bc9e7a94ab91c2b3db29ef7cf000eff593f from master
 2015-02-12 07:40:14 -05:00
Lukas Klein
1904022f91 [1.8.x] Fixed #24321 -- Improved utils.http.same_origin compliance with RFC6454 
Backport of 93b3ef9b2e from master.
 2015-02-12 09:01:59 +01:00
Josh Smeaton
a6ea62aeaf [1.8.x] Refs #14030 -- Improved expression support for python values 
Backport of e2d6e14662d780383e18066a3182155fb5b7747b from master
 2015-02-12 08:53:03 +11:00
Collin Anderson
343c087533 [1.8.x] Refs #14497 -- Handled empty readonly admin FileFields 
Backport of 07cfe1bd822f4108b5029aef1615a17000d0b0dc from master
 2015-02-11 13:01:25 -05:00
Tim Graham
e06971340d [1.8.x] Moved contrib.webdesign tests out of contrib. 
Backport of 8ec306a3a90aa2ec0baa4c9d8df68f0d49947a2c from master
 2015-02-11 12:35:32 -05:00
Tim Graham
411028df53 [1.8.x] Updated docs and runtests.py for removal of tests from contrib. 
Backport of 7cf3a5786bc76374e743fbc0c1a1c8470a61f6c0 from master
 2015-02-11 12:05:55 -05:00
Tim Graham
69c89aeccf [1.8.x] Moved contrib.gis tests out of contrib. 
Backport of ad0be620aece4dde2f94383426c284f4afef9fbc from master
 2015-02-11 12:05:29 -05:00
Tim Graham
2482c9dd24 [1.8.x] Moved non-documented auth test models to the new test location. 
Backport of 5ab327a3894c26f57baabe14084bcce2a71b8af8 from master
 2015-02-11 12:03:03 -05:00
Tim Graham
e55d888b66 [1.8.x] Moved contrib.auth tests out of contrib. 
Backport of 2d7aca3da0a46c09e9c70ebdb56ed340691a999f from master
 2015-02-11 12:02:35 -05:00
Tim Graham
44df17d53c [1.8.x] Moved contrib.humanize tests out of contrib. 
Backport of 8192a164defa24d75672e6b10cec650489b8c748 from master
 2015-02-11 11:55:53 -05:00
Tim Graham
c0f0f93b5d [1.8.x] Moved contrib.redirects tests out of contrib. 
Backport of 00da46091a0b35d4822b30e29334de4f4869901e from master
 2015-02-11 11:55:40 -05:00
Tim Graham
bbe7964185 [1.8.x] Moved contrib.messages tests out of contrib. 
Backport of b3cd9e0d0732e1fd7d2afd5825dda5b3857927da from master
 2015-02-11 11:55:05 -05:00
Tim Graham
10fdd2fc1d [1.8.x] Moved contrib.sessions tests out of contrib. 
Backport of fac3a34cbb8fd8dc74006f187dd1e83f3a040d39 from master
 2015-02-11 11:54:51 -05:00
Tim Graham
e1046a96bc [1.8.x] Moved contrib.sitemaps tests out of contrib. 
Backport of fbc467c26bc0adb9867b97d0bb5642b2a85eb357 from master
 2015-02-11 11:52:10 -05:00
Tim Graham
0520cfe94a [1.8.x] Moved contrib.sites tests out of contrib. 
Backport of d8341bf02444e58ff62afe04f15d9679a1b5b8f8 from master
 2015-02-11 11:50:23 -05:00
Tim Graham
36bf6ec9eb [1.8.x] Moved contrib.flatpages tests out of contrib. 
Backport of d3a725054fa260e84c788b240fd03cbd0ccc1151 from master
 2015-02-11 11:47:58 -05:00
Tim Graham
a0553d1a7c [1.8.x] Prevented some test commands from needlessly running system checks. 
This is a performance optimization and also fixes test errors with the
upcoming merge of contrib tests into tests/. The tests failed on MySQL
because the models with GeometryField were being checked but the
non-GIS MySQL backend didn't know how to handle them.

Backport of 197dd4b8f12164f6acebb3b959f9ac2040a40400 from master
 2015-02-11 10:17:53 -05:00
Daniel Pyrathon
fdcc9c47d5 [1.8.x] Fixed #24146 -- Allowed model._meta.get_field() to be used after apps.models_ready 
Backport of 19188826b4aa989475418f1ea9bf8631b04da1e8 from master
 2015-02-10 19:55:42 -05:00
Tim Graham
a8b70d251d [1.8.x] Sorted imports with isort; refs #23860. 
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
 2015-02-09 14:24:06 -05:00
Tim Graham
eb406aa686 [1.8.x] Silenced deprecation warning in refs #24287 test. 2015-02-09 12:34:23 -05:00
Tim Graham
9744529c12 [1.8.x] Fixed #24302 -- Added DurationField.formfield() 
Backport of 2d7c27d3870e57edd1b2ac46b49f0a8804753a1e from master
 2015-02-09 10:21:15 -05:00
jMyles
ac576e9f45 [1.8.x] Fixed #24287 -- Added friendly error if a model is in a models.py outside an installed app. 2015-02-09 09:38:03 -05:00
Tim Graham
6e50fc9246 [1.8.x] Removed unnecessary parentheses in model check messages. 
Backport of e144e0e237136f8bf1831f645c3dde4541d629b0 from master
 2015-02-09 08:57:02 -05:00
Aron Podrigal
eb9fbc0b1d [1.8.x] Fixed #24249 -- Improved field shadowing validation in model multi-inheritance. 
Backport of 4d73303ee974c5f1ea6af984d4578d817825026d from master
 2015-02-09 08:43:40 -05:00
Claude Paroz
cd260d03bd [1.8.x] Replaced hardcoded URLs in admin_* tests 
Refs #15779. This will allow easier admin URL changes, when needed.
Thanks Simon Charette for the review.

Backport of 32e6a7d3a57b2287d55e8b8efa4e8cb7643b1720 from master
 2015-02-08 15:12:07 -05:00
Varun Sharma
b44a56c308 [1.8.x] Fixed #24181 -- Fixed multi-char THOUSAND_SEPARATOR insertion 
Report and original patch by Kay Cha.
Backport of 540ca563de from master.
 2015-02-08 20:09:04 +01:00
Collin Anderson
fc8e1e0c10 [1.8.x] Fixed E265 comment style 
Backport of db77915c9fd35a203edd8206f702ee4082f04d4a from master
 2015-02-06 09:35:08 -05:00
Tim Graham
fc1e9107d7 [1.8.x] Added UUIDField.deconstruct() 
Backport of 0f54cf28c09a80254571487e3af93be2096cfdac from master
 2015-02-05 19:15:37 -05:00
Markus Holtermann
c9addfd4bf [1.8.x] Fixed small regression caused by e3702dc3f2af9e8cc6c1155b248f458899be334e 
Since 1.7 models need to declare an explicit app_label if they are not
in an application in INSTALLED_APPS or were imported before their
application was loaded.

Backport of 235124d3eaf6cc7ab9f97f1d1467d1caf18e1016 from master
 2015-02-06 00:50:42 +01:00
Markus Holtermann
e3702dc3f2 [1.8.x] Cleaned up schema tests 
Thanks Tim Graham for the review.

Backport of 0204714b0bdf10d7558ee106de9a718407f3ec5a from master
 2015-02-05 20:15:18 +01:00
Aymeric Augustin
aed1b1f6e5 [1.8.x] Fixed #24265 -- Preserved template backend loading exceptions. 
If importing or initializing a template backend fails, attempting to
access this template backend again must raise the same exception.

Backport of 44ad6915 from master
 2015-02-05 20:09:22 +01:00
Aymeric Augustin
5fbec369aa [1.8.x] Fixed #24273 -- Allowed copying RequestContext more than once. 
Thanks Collin Anderson for the report.

Backport of 31d3a355 from master
 2015-02-05 14:07:18 +01:00
Matthew Somerville
2a55301f9f [1.8.x] Fixed #24242 -- Improved efficiency of utils.text.compress_sequence() 
The function no longer flushes zfile after each write as doing so can
lead to the gzipped streamed content being larger than the original
content; each flush adds a 5/6 byte type 0 block. Removing this means
buf.read() may return nothing, so only yield if that has some data.
Testing shows without the flush() the buffer is being flushed every 17k
or so and compresses the same as if it had been done as a whole string.

Backport of caa3562d5bec1196502352a715a539bdb0f73c2d from master
 2015-02-04 15:17:22 -05:00
mlavin
d585ade0df [1.8.x] Fixed #24197 -- Added clearing of staticfiles caches on settings changes during tests 
Cleared caching in staticfiles_storage and get_finder when
relevant settings are changed.

Backport of 2730dad0d7c425f33f1ecc6cec01fdbf1cdd8376 from master
 2015-02-04 10:54:33 -05:00
Riccardo Magliocchetti
4957b8a406 [1.8.x] Fixed #14497 -- Improved admin widget for "read only" FileFields 
Based on patch by Adam J Forster, Paul Collins, and Julien.

Backport of 2be621e44c1b5b68c895383f3e20b1f17ddb447a from master
 2015-02-04 09:05:41 -05:00
Josh Schneier
16e3910e9c [1.8.x] Fixed typos of "select_related" in docs and tests. 
Backport of 7d363ed43247a80d2b764723e1bf6e0e6da4e82f from master
 2015-02-04 07:32:34 -05:00
Aron Podrigal
fc49e73648 [1.8.x] Fixed #15321 -- Honored ancestors unique checks. 
Thanks to Tim for the review.

Backport of 79f27f2b61aeac763ae048416ef8a97c2b639ae8 from master
 2015-02-03 18:58:48 -05:00
Tim Graham
3e24ab6f4c [1.8.x] Refactored tests that rely on an ImportError for Python 3.5 compatibility 
A change in Python test discovery [1] causes the old packages that raised
an error to be discovered; now we use a common directory that's
ignored during discovery. Refs #23763.

[1] http://bugs.python.org/issue7559

Backport of c0cc8f69e7abfa8578729031f97ae4b96c5cdafe from master
 2015-02-03 18:31:17 -05:00
Simon Charette
cbcf92e95f [1.8.x] Fixed #24266 -- Changed get_parent_list to return a list ordered by MRO. 
Thanks to Aron Podrigal for the initial patch and Tim for the review.

Backport of 65e005f8cd9c656e558e53e6c8b890cd0fcc9e74 from master
 2015-02-03 16:41:51 -05:00
Tim Graham
92d5bedc56 [1.8.x] Reverted "Fixed #24146 -- Fixed a missing fields regression in admin checks." 
This reverts commit e8171daf0cd7f0e070395cb4c850c17fea32f11d.

A new solution is forthcoming.

Backport of 0e489c19f1554ecfd9825daacfbac73be8ce723e from master
 2015-02-03 15:24:24 -05:00
Claude Paroz
ea3e40c278 [1.8.x] Fixed #24252 -- Forced lazy __str__ to utf-8 on Python 2 
Thanks Stanislas Guerra for the report and Tomas Ehrlich for
the review.
Backport of cd0ceaa102 from master.
 2015-02-03 18:26:08 +01:00