mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
19,883 Commits 28 Branches 426 Tags 668 MiB
8657e7caaa
Commit Graph

19883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
8657e7caaa [1.8.x] Fixed #24325 -- Documented change in ModelForm.save() foreign key access. 
Backport of 0af3822dc3 from master
 2015-02-14 08:09:27 -05:00
Michael Angeletti
2e6d8e51db [1.8.x] Fixed #24339 -- Fixed crash with empty DurationField form field. 
Backport of 8a21d25033 from master
 2015-02-14 07:38:20 -05:00
Aymeric Augustin
0f3eb8260b [1.8.x] Fixed #24338 -- Accepted Template wrapper in {% extends %}. 
Explicitly checking for django.template.Template subclasses is
preferrable to duck-typing because both the django.template.Template and
django.template.backends.django.Template have a render() method.

Thanks spectras for the report.

Backport of 47ee7b48 from master
 2015-02-14 10:36:44 +01:00
Loic Bistuer
20b621eb3c [1.8.x] Fixed #24289 -- Reversed usage of Field.many_to_one and one_to_many. 
Thanks Carl Meyer and Tim Graham for the reviews and to all involved
in the discussion.

Backport of 18c0aaa912 from master
 2015-02-14 02:42:06 +07:00
Andriy Sokolovskiy
136edac897 [1.8.x] Fixed #24320 - Used field.value_to_string() in serialization of foreign key. 
This fixes serialization of a ForeignKey to a UUIDField as the
test indicates.

Backport of 5c995dcfc2 from master
 2015-02-13 12:45:35 -05:00
Joe Simpson
8277f5d7d0 [1.8.x] Added each_context() and a template tip to custom admin view docs. 
Backport of 648e516b8d from master
 2015-02-13 10:38:29 -05:00
Tim Graham
2347f3267f [1.8.x] Fixed #24315 -- Fixed auth.views.password_reset_confirm() with a UUID user. 
Backport of 002425fe39 from master
 2015-02-13 09:57:44 -05:00
Tim Graham
8fc4840289 [1.8.x] Fixed #24334 -- Allowed admin password reset to work with non-digit custom user model primary key. 
Thanks Loic for help and Simon for review.

Backport of fdf20093e0 from master
 2015-02-13 09:50:55 -05:00
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 f287bec583 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 b4e1090ab2 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 b06935a486 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 e8cf4f8abe 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 bd4afef984 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 de0241eb98 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 d64baaef3b 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 a93c5fb2bf 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 e519ee1d35 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 d7509c5246 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 27eeb64a96 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 34ccb3cc03 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 0f7f5bc9e7 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 e2d6e14662 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 07cfe1bd82 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 8ec306a3a9 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 7cf3a5786b 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 ad0be620ae 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 5ab327a389 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 2d7aca3da0 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 8192a164de 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 00da46091a 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 b3cd9e0d07 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 fac3a34cbb 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 fbc467c26b 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 d8341bf024 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 d3a725054f 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 197dd4b8f1 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 19188826b4 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 c7a6996df7 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 e9874d4cf1 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 c8e24bbc9b 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 0ed7d15563 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 2d7c27d387 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 e144e0e237 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 4d73303ee9 from master
 2015-02-09 08:43:40 -05:00