mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-27 10:39:40 +00:00
Code Issues 32 Releases Wiki Activity
19,875 Commits 29 Branches 430 Tags
Commit Graph

19875 Commits

This Branch
This Branch
All Branches
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
6476fa73d3 [1.8.x] Forwardported item in 1.7.5 release notes. 
Backport of a93c5fb2bfbadd4628a2a5d6b6aecbd64bd527cb from master
 2015-02-12 14:06:21 -05:00
Thomas Güttler
6b8c8d7e18 [1.8.x] Clarified timeout=0 in cache docs. 
Backport of e519ee1d352e0e36fcb8edc9d33ec2845f663d3a from master
 2015-02-12 10:32:56 -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
Nik Nyby
0ab8ec4312 [1.8.x] Subclassed template.Node instead of Node for consistency. 
Backport of 34ccb3cc038ac30b13a7243a3dbd9366c1119746 from master
 2015-02-12 08:05:04 -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
Aymeric Augustin
c6a49d4f17 [1.8.x] Fixed a crash of the debug page. 
During the autumn DST change, the template engine would fail to convert
the naive representation of now when USE_TZ = True. Passing now in UTC
eliminates the issue.

Thanks mbertheau and tricoder42.

Refs #23714.

Backport of c7a6996df7e77bc3b9c5e581e67d766627ebabec from master
 2015-02-10 19:07:07 -05:00
Loic Bistuer
6e23c9be46 [1.8.x] Ignored flake8 newly added E402 and E731. 
Backport of e9874d4cf1f582dd78ad171b4e7ce62f3199390f from master
 2015-02-10 19:05:24 -05:00
Loic Bistuer
00f76b018f [1.8.x] Fixed isort import that's inconsistent between platforms. 
Backport of c8e24bbc9b027a712b54e3665d27418ae538f15d from master
 2015-02-10 18:53:23 -05:00
Josh Smeaton
3518d51697 [1.8.x] Fixed #24200 -- Made introspection bypass statement cache 
Backport of 1fbe8a2de3 from master
 2015-02-10 23:42:16 +02:00
Aymeric Augustin
9b7b37382c [1.8.x] Split DTL context creation into its own function. 
This reduces the length of rope RequestContext gives users to hang
themselves with.

Thanks Alex Hill for the report and Tim Graham for the review.

Backport of f2c104a from master.
 2015-02-10 14:35:05 +01: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
64a9540829 [1.8.x] Added isort config to ease resolving merge conflicts. 2015-02-09 09:16:23 -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
Aymeric Augustin
8cb2cfdda5 [1.8.x] Called parent in SimpleTestCase.setUpClass/tearDownClass. 
Backport of 146dd7be8dad4cd6264d374b681256a8b0d5808b from master
 2015-02-08 21:31:28 -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
Alex Gaynor
d54638727a [1.8.x] Simplified the lazy CSRF token implementation in csrf context processor. 
This significantly improves performance on PyPy. The previous
implementation would generate a new class on every single request,
which is relatively slow.

Backport of 8099d33b6553c9ee7de779ae9d191a1bf22adbda from master
 2015-02-08 15:03:29 -05:00
Alex Gaynor
ee86bf24d2 [1.8.x] Optimized allow_lazy() by not generating a new lazy wrapper on each invocation. 
This dramatically improves performance on PyPy. The following benchmark:

python -mtimeit -s "from django.utils.functional import allow_lazy; from django.utils.translation import ugettext_lazy; f = allow_lazy(lambda s: s, str)" "f(ugettext_lazy('abc'))"

goes from 390us per loop to 165us.

Backport of 82e0cd15711c7171aed7af5e481967cc721c9642 from master
 2015-02-08 14:57:19 -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
Markus Holtermann
edbf6de753 [1.8.x] Revert "Fixed #24075 -- Prevented running post_migrate signals when unapplying initial migrations of contenttypes and auth" 
This reverts commit 737d24923ac69bb8b89af1bb2f3f4c4c744349e8.

Backport of 2832a9b028c267997b2fd3dd0989670d57cdd08f from master
 2015-02-07 20:35:20 +01:00
Markus Holtermann
b2b5ea88b7 [1.8.x] Revert "Refs #24075 -- Silenced needless call_command output while running tests" 
This reverts commit 51dc617b21e67636d96cf645905797a4d6ff4bf0.

Backport of bd3d796ecd9a66832ad26024df65caeb63b60a5d from master
 2015-02-07 19:52:50 +01:00
Peter Inglesby
b6323302e0 [1.8.x] Fixed docs typo 
Backport of a8f1c70dce792831688588f271efb3a825dffef8 from master
 2015-02-07 18:47:17 +01:00