mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-26 10:14:36 +00:00
Code Issues32 Releases Wiki Activity
22,914 Commits 29 Branches 441 Tags
393b1c6d45
Commit Graph

7936 Commits

Author SHA1 Message Date
Tim Graham
393b1c6d45 [1.10.x] Fixed typo in tests/migrations/test_loader.py. 
Backport of 6989b45c8dce0d3c50d1530fd65d388c7fde2a2a from master
 2016-09-16 12:56:41 -04:00
Tim Graham
3c9f6eb0c0 [1.10.x] Removed an empty test app. 
Backport of 94b838387c2a7f398c9bad7f5faa86ac4aedcade from master
 2016-09-12 18:51:46 -04:00
Tim Graham
244c4c06f9 [1.10.x] Normalized spelling of ETag. 
Backport of ef021412d5e7eb78c89f0b7cf2ec01bcb959a837 from master
 2016-09-09 11:00:58 -04:00
Nicola Jordan
1f3c66fe9f [1.10.x] Fixed -- Allowed combining SearchQuery with more than one & or | operators. 
Backport of 978a00e39fee25cfa99065285b0de88366710fad from master
 2016-09-07 15:28:59 -04:00
Tim Graham
3e913d2141 [1.10.x] Fixed , -- Made makemigrations consistency checks respect database routers. 
Partially reverted refs  except for one of the tests as this
solution supersedes that one.

Thanks Shai Berger for the review.

Backport of 098c07a03286b5ed133102733e67a83061647ea0 from master
 2016-09-01 16:19:49 -04:00
Riccardo Magliocchetti
51e5ca4462 [1.10.x] Clarified URL regex check message with respect to include(). 
Backport of 7ed8b98f42cd3a9fa530bbb764d3d79230e0a7a7 from master
 2016-09-01 14:06:59 -04:00
Alex Hill
db3eabfae5 [1.10.x] Refs -- Fixed regression with field defaults in prefixed forms. 
Backport of d9c083cfee853272ded14c6c87623e910c9e81c4 from master
 2016-09-01 09:18:34 -04:00
Olexander Yermakov
7c57f5cf8c [1.10.x] Fixed -- Allowed comparing CallableBool with bitwise or. 
Thanks Tim for the review.

Backport of b7fb608142a0be568bc5dce952de5e6aefc2488c from master
 2016-08-31 08:28:47 -04:00
Ed Morley
255456becd [1.10.x] Fixed -- Fixed test failures with pylibmc. 
Backport of 674e3fe13e5156344bfafbea59018b8837eb3044 from master
 2016-08-29 16:28:22 +01:00
Ed Morley
306545d805 [1.10.x] Fixed -- Allowed testing MemcachedCache and PyLibMCCache during the same test run. 
Backport of 047c1d48a613cc2a16f078a9094cc799f06e6b0c from master
 2016-08-29 16:28:16 +01:00
Ed Morley
547c7e6756 [1.10.x] Refs -- Added pylibmc to test requirements. 
Backport of 5d978c46216df53884fbca590a9abe660a739774 from master
 2016-08-29 16:28:02 +01:00
Ed Morley
5756edd46d [1.10.x] Refs -- Split the test_invalid_keys cache test into two. 
The first half of the test fails when using pylibmc (so will need
to be skipped).

Backport of cfd1f93d55d3b9317bdf26b426fe21d935ab3399 from master
 2016-08-29 10:26:41 -04:00
Ed Morley
fb8eea5680 [1.10.x] Fixed -- Excluded cull-related cache configs from memcached tests. 
Since the `cull` and `zero_cull` test cache configs set `MAX_ENTRIES`
and `CULL_FREQUENCY` in `OPTIONS`, which are only intended for use with
the locmem, filesystem, and database backends. This prevents test
failures once refs  is fixed.

Backport of 606a303856afee684563f9349c2a55578854f1ba from master
 2016-08-29 10:24:13 -04:00
Tim Graham
325dd0befe [1.10.x] Fixed -- Fixed empty data fallback to model field default in model forms. 
Backport of 4bc6b939944183533ae74791d21282e613f63a96 from master
 2016-08-24 19:37:04 -04:00
Berker Peksag
c4ee93128f [1.10.x] Fixed -- Fixed KeyError if USERNAME_FIELD isn't in UserCreationForm.fields. 
Backport of 3c18f8a3d2f61669493f9ff2015ddc027eada3d6 from master
 2016-08-24 13:23:50 -04:00
Simon Charette
0b454804db [1.10.x] Fixed -- Included already applied migration changes in the pre-migrate state. 
Refs .

Thanks Tim for the review.

Backport of d5c4ea524679a787fe11c927448e44e95646096b from master
 2016-08-24 01:38:30 -04:00
Simon Charette
1c60765d63 [1.10.x] Fixed -- Included already applied migration changes in the post-migrate state when the execution plan is empty. 
Refs .

Thanks tkhyn for the report and Tim for the review.

Backport of d1757d8df486b689172d2584ded52fad916bcc33 from master
 2016-08-24 01:37:53 -04:00
Tim Graham
46f604244a [1.10.x] Fixed -- Added database alias to InconsistentMigrationHistory message. 
Backport of ad25fe73506d80ffcaac135ad0a8d09552b70d70 from master
 2016-08-23 20:48:29 -04:00
Collin Anderson
4073780219 [1.10.x] Fixed -- Reverted some admin checks from checking field.many_to_many back to isinstance(field, models.ManyToManyField). 
This partially reverts 983c158da7723eb00a376bd31db76709da4d0260

Backport of 384f89f8f843953ac11cf211f85291b5c14baeb9 from master
 2016-08-23 16:06:41 -04:00
Helen Sherwood-Taylor
ae0f55eb49 [1.10.x] Fixed -- Fixed admindocs crash with a view in a class. 
Generated correct admindocs URLs on Python 3. URLs generate 404s on
Python 2, as in older versions of Django.

Backport of bc1e2d8e8edde6cc7d2657c68242a13ee65a15b8 from master
 2016-08-20 10:02:22 -04:00
Loïc Bistuer
21f18e5372 [1.10.x] Fixed -- Removed duplicated managers in Model._meta.managers. 
Backport of d4eefc7e2af0d93283ed1c03e0af0a482982b6f0 from master
 2016-08-19 01:27:43 +07:00
Jim Nicholls
16f032e69f [1.10.x] Fixed -- Fixed makemigrations crash with a read-only database. 
Backport of 76ab8851181675a59425f9637bdbf3f2de95f6f1 from master
 2016-08-18 08:45:41 -04:00
Chris Lamb
c24a47b3e6 [1.10.x] Refs -- Added test for isnull lookup to CharField with primary_key=True. 
Backport of 97513269d73520d10722bbd10404be6ac4d48d07 from master
 2016-08-17 21:19:22 -04:00
Tim Graham
020ba4bf91 [1.10.x] Fixed -- Reallowed the {% for %} tag to unpack any iterable. 
Thanks Sergei Maertens for the report and patch.

Backport of 937d752d3deabebe60dfbe9ff9823772730f336a from master
 2016-08-15 15:40:34 -04:00
Daniel Wiesmann
201198136d [1.10.x] Fixed -- Fixed annotations with database functions on PostGIS. 
Thanks Sean Mc Allister for providing a test.

Backport of 89f17e7caf0d1e70417253d135607c9fd6ebac56 from master
 2016-08-15 14:23:48 -04:00
Jon Dufresne
d8cda352b1 [1.10.x] Fixed -- Prevented required attribute on ClearableFileInput when initial data exists. 
Backport of fab46ce6f5a0a58c4e5e39c9e5e412702beb4a64 from master
 2016-08-12 13:59:23 -04:00
Tim Graham
0254985317 [1.10.x] Fixed -- Fixed views.static.serve() crash with show_indexes enabled. 
Backport of 1e32e1cc951ac9bada52aa20a9523acc7cc6ecb3 from master
 2016-08-10 11:27:29 -04:00
Claude Paroz
246e516f29 [1.10.x] Unified SpatiaLite spelling 
Backport of ade681b9ad2a97833cd3f06530fba01e51250b32 from master.
 2016-08-09 18:48:57 +02:00
Ed Morley
233ec837f6 [1.10.x] Fixed docs to refer to HSTS includeSubdomains as a directive. 
The spec refers to it as a 'directive' rather than a 'tag':
https://tools.ietf.org/html/rfc6797#section-6.1.2

Backport of 8c3bc5cd7801a307a0bc2969abebe7a6ca48d17f from master
 2016-08-08 20:22:09 -04:00
Sjoerd Job Postmus
2f18cbc313 [1.10.x] Fixed -- Fixed state initialization of bulk_create() objects if can_return_ids_from_bulk_insert. 
Backport of 3246d2b4bb981a8d782a349a99e9b89206028cee from master
 2016-08-06 10:25:29 -04:00
Ben Demboski
d68b145a6f [1.10.x] Fixed -- Restored Client.force_login() defaulting to the first auth backend. 
Backport of fc8f097117af7ada616fad20ae5b417fcf740413 from master
 2016-08-06 08:42:17 -04:00
Jarek Glowacki
1e16e141ac [1.10.x] Fixed -- Made migrations consistency check ignore unapplied squashed migrations. 
Backport of d117567c7d65c3c28858c4dfc771483b182075e4 from master
 2016-08-05 18:11:38 -04:00
Claude Paroz
6757c94662 [1.10.x] Fixed -- Fixed isnull filtering on ForeignKey with to_field 
Thanks weidwonder for the report.
Backport of 272eccf7ff0ced609e5a5e3bb6b4a40e773e0e66 from master.
 2016-08-04 16:07:11 +02:00
Tim Graham
dcebeea270 [1.10.x] Fixed -- Fixed crash if request.META[''CONTENT_LENGTH']=''. 
Backport of 5c63b3e5a797102d915e1683971517f747a28013 from master
 2016-08-03 14:01:08 -04:00
Tim Graham
348406c381 [1.10.x] Fixed a GeoIP test failure with the latest data. 
Backport of 4a696bbe13383b14b2762cc5accd45849e9dcfba from master
 2016-08-03 11:16:15 -04:00
Alex Hill
86ae2b22ae [1.10.x] Fixed -- Fixed a query count regression in ModelChoiceField with RadioSelect. 
Backport of c5ebfda00226e3695cadbc13ea9ce4c5951d3ed0 from master
 2016-08-03 10:53:42 -04:00
Sergey Yurchenko
a8b8ef114d [1.10.x] Fixed -- Fixed checks crash with empty Meta.default_permissions. 
Backport of 4e64e3bb6e96a50b057bc1144fba3efdee7dfc10 from master
 2016-08-03 09:14:27 -04:00
Tim Graham
fa4b5c1b93 [1.10.x] Fixed -- Improved/clarified User.is_authenticated/anonymous compatibility. 
Thanks marktranchant for the report and review.

Backport of 54afa960d1ee8c63635225a0f0a2489971b5aab5 from master
 2016-08-02 11:26:40 -04:00
Tim Graham
d5dbf2e166 [1.10.x] Fixed admin_utils test failures due to translation updates. 
Backport of 24123c31362b5f3783d84d133c160e9fe16805fe from master
 2016-08-01 15:44:20 -04:00
Jon Dufresne
6a3f31fa33 [1.10.x] Fixed -- Made subwidget iteration pass disabled and required attributes. 
Backport of ac3aaaa740dcf9c6efd2f88ee9219c1924c7695e from master
 2016-08-01 10:49:37 -04:00
Tim Graham
ddcf7dbae7 [1.10.x] Fixed -- Prevented makemigrations from accessing an empty database. 
Thanks Liz Lemon for the report and investigation and
Claude Paroz for the test.

Backport of aad46c3e370e105f9117a337924090d05f1b001d from master
 2016-08-01 07:57:25 -04:00
Tim Graham
83b950e9ff [1.10.x] Refs -- Corrected deprecation message for assigning M2M relations. 
Backport of 5fa4370543658aedd79dc554d8c52684d6c7cbca from master
 2016-07-30 20:50:54 -04:00
Tim Graham
c6e5878410 [1.10.x] Fixed -- Fixed crash with disabled ModelMultipleChoiceField. 
Backport of 4e861682904744b0ea3ead8552513c6f1a826c5a from master
 2016-07-30 20:45:37 -04:00
Tomas Pazderka
d61dbc20cf [1.10.x] Fixed -- Allowed a lazy base_url for FileSystemStorage. 
Backport of b820b6108a7d3f11ec18774d16d657f4f63fe9fa from master
 2016-07-29 14:16:03 -04:00
Tim Graham
8735710def [1.10.x] Fixed a typo in tests/middleware/test_security.py 
Backport of 0850236a8c3647bc3c239bd34afae0488abe5c60 from master
 2016-07-28 22:01:12 -04:00
Sergey Fedoseev
25581e6382 [1.10.x] Refs -- Fixed a crash induced by invalid WKT returned by MySQL 5.7.5+. 
Backport of 4178488881f4e703c4e47ea78720dd61e0230ce5 from master
 2016-07-28 18:09:47 -04:00
Olexander Yermakov
714e287d9a [1.10.x] Fixed -- Fixed crash of disabled forms.JSONField. 
Backport of 68de48c96328e13d5dbdb1f3006e4a1ca74f3c34 from master
 2016-07-27 08:43:07 -04:00
Tim Graham
3744fc1666 [1.10.x] Fixed -- Fixed crash in disabled ModelChoiceFields. 
Partially reverted refs  to fix a regression in Django 1.10.
This reintroduces a crash for disabled forms.JSONField (refs ),
however, that issue is also present on Django 1.9.

Thanks Ryan Schave for the test.

Backport of a5f85d891b51d7ceb4f9e422e3e4f5c741062288 from master
 2016-07-27 08:36:49 -04:00
Alex Hill
d53e3c1e07 [1.10.x] Fixed -- Fixed regression handling responses returned from view middleware. 
Backport of 44a6b4028033890d4a3832875c774db321182de6 from master
 2016-07-25 13:46:44 -04:00
Jon Dufresne
c0026a9d2d
[1.10.x] Fixed -- Fixed invalid HTML in template postmortem on the debug page. 
Backport of 348cfccd9072f0e08ffe4cfb3946d1dc6a629e86 from master
 2016-07-24 18:25:43 +02:00