Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
24,279 Commits 26 Branches 382 Tags
Commit Graph

8687 Commits

Author SHA1 Message Date
Tim Graham
4a20aae468 [1.11.x] Added isolated_local_models support to schema tests. 
Follow up to 46496a542c2ff9f273e090073e9c8071acb1a4a4, which otherwise
has no effect.

Partial backport of 9f7772e098439f9edea3d25ab127539fc514eeb2 from master
 2018-04-14 07:18:33 -04:00
Mariusz Felisiak
f89b11b879
[1.11.x] Fixed #29286 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining an annotated and unannotated queryset with union(), difference(), or intersection(). 
Regression in a0c03c62a8ac586e5be5b21393c925afa581efaf.

Thanks Tim Graham and Carlton Gibson for reviews.

Backport of 0b66c3b442875627fa6daef4ac1e90900d74290b from master.
 2018-04-13 12:54:32 +02:00
Tim Graham
46496a542c [1.11.x] Fixed schema test failure when running tests in reverse. 
Follow up to 003334f8af29e2023cf7ad7d080aa9ab26a7c528.

Backport of 78f8b80f9b215e50618375adce4c97795dabbb84 from master
 2018-04-12 20:29:30 -04:00
Paul Donohue
979253fce9 [1.11.x] Fixed #29296 -- Fixed crashes in admindocs when a view is a callable object. 
Backport of 33a0b7ac815588ed92dca215e153390af8bdbdda from master
 2018-04-12 13:28:29 -04:00
Jeremy Bowman
8f76939f54 [1.11.x] Fixed #29193 -- Prevented unnecessary foreign key drops when altering a unique field. 
Stopped dropping and recreating foreign key constraints on other fields
in the same table as the one which is actually being altered in an
AlterField operation.

Regression in c3e0adcad8d8ba94b33cabd137056166ed36dae0.

Backport of ee17bb8a67a9e7e688da6e6f4b3be1b3a69c09b0 from master
 2018-04-11 23:24:42 -04:00
Jeremy Bowman
a1f4e14f99 [1.11.x] Tested altering a unique field when a reverse M2M relation exists. 
Backport of 003334f8af29e2023cf7ad7d080aa9ab26a7c528 from master
 2018-04-11 23:23:44 -04:00
Claude Paroz
b25433a225 [1.11.x] Fixed #29273 -- Prevented initial selection of empty choice in multiple choice widgets. 
Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01.

Backport of f3b69f9757ec03057441ebbd52b7cdbfed31fb32 from master.
 2018-04-02 09:27:01 -04:00
Amr Anwar
c5bb472095 [1.11.x] Fixed #29229 -- Fixed column mismatch crash when combining two annotated values_list() querysets with union(), difference(), or intersection(). 
Regression in 7316720603821ebb64dfe8fa592ba6edcef5f3e.

Backport of a0c03c62a8ac586e5be5b21393c925afa581efaf from master
 2018-03-19 21:06:40 -04:00
Tim Graham
a91436360b [1.11.x] Fixed CVE-2018-7537 -- Fixed catastrophic backtracking in django.utils.text.Truncator. 
Thanks James Davis for suggesting the fix.
 2018-02-27 13:56:26 -05:00
Tim Graham
abf89d729f [1.11.x] Fixed CVE-2018-7536 -- Fixed catastrophic backtracking in urlize and urlizetrunc template filters. 
Thanks Florian Apolloner for assisting with the patch.
 2018-02-27 13:54:19 -05:00
Tim Graham
e8afd6bf81 [1.11.x] Switched test requirement to new psycopg2-binary package. 
Backport of d4373b6da4b420fe9211438addeedb396a3821be from master
 2018-02-20 19:06:23 -05:00
Tim Graham
d5da552d92 [1.11.x] Removed blank lines per isort 4.3.0. 2018-02-20 08:58:29 -05:00
Tim Graham
57b95fedad [1.11.x] Fixed CVE-2018-6188 -- Fixed information leakage in AuthenticationForm. 
Reverted 359370a8b8ca0efe99b1d4630b291ec060b69225 (refs #28645).

This is a security fix.
 2018-02-01 09:18:33 -05:00
Tim Graham
1c9233b1b9 [1.11.x] Fixed #29094 -- Fixed crash when entering an invalid uuid in ModelAdmin.raw_id_fields. 
Regression in 2f9861d823620da7ecb291a8f005f53da12b1e89.

Thanks Carel Burger for the report and fix.

Backport of docs552abffab16cbdff571486b683e7e7ef12e46066 from master
 2018-02-01 08:56:52 -05:00
Tim Graham
4430b83e4b [1.11.x] Fixed #29071 -- Fixed contrib.auth.authenticate() crash if a backend doesn't accept a request but a later one does. 
Regression in a3ba2662cdaa36183fdfb8a26dfa157e26fca76a.

Backport of 55e16f25e9d2050e95e448f9ab2e4b9fc845a9e5 from stable/2.0.x
 2018-01-31 09:27:21 -05:00
Étienne Loks
419705bbe8 [1.11.x] Fixed #29016 -- Fixed incorrect foreign key nullification on related instance deletion. 
Backport of 9a621edf624a4eb1f1645fca628a9e432f0de776 from master
 2018-01-13 10:33:24 -05:00
Tim Graham
967d824288 [1.11.x] Fixed a GeoIP2 test failure with the latest GeoIP2 database. 
Backport of 66d74676e23c32bc676fb0706af8580b391953b6 from master
 2018-01-10 10:20:19 -05:00
Tim Graham
1bf0e5c43c [1.11.x] Fixed GeoIP test failure with the latest data. 2018-01-08 09:57:49 -05:00
Tim Graham
06e4e80382 [1.11.x] Fixed #25277 -- Restored test dependency to the original python-memcached. 
Backport of 770b9ea77fb5e39d616e62b54c06755e6d4f4d36 from master
 2017-12-18 15:23:44 -10:00
Morgan Wahl
3522203502 [1.11.x] Refs #28856 -- Fixed caching of a GenericForeignKey pointing to a model that uses more than one level of MTI. 2017-12-07 09:34:54 -05:00
Mariusz Felisiak
1decd0197d [1.11.x] Refs #28876 -- Fixed incorrect foreign key constraint name for models with quoted db_table. 
Thanks Simon Charette and Tim Graham for the review and Carlos E. C.
Leite for the report.

Backport of fc48047586a8f92262f55d9d2bfb976325844b23 from master
 2017-12-05 22:52:42 +01:00
Mariusz Felisiak
3e52fd7595 [1.11.x] Refs #28876 -- Fixed incorrect class-based model index name generation for models with quoted db_table. 
Thanks Simon Charette and Tim Graham for the review and Carlos E. C.
Leite for the report.

Backport of f79d9a322c6008e5fada1453aebfb56afc316cc8 from master
 2017-12-05 22:42:58 +01:00
Nick Pope
47681af344 [1.11.x] Fixed #28890 -- Removed newlines between MultiWidget's subwidgets. 
Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01.

Backport of e014f91a70aa3ccdddb363a733c76e35597424fa from master
 2017-12-05 11:44:39 -05:00
Tim Graham
b8a2f3c2d6 [1.11.x] Fixed #28305 -- Fixed "Cannot change column 'x': used in a foreign key constraint" crash on MySQL with a sequence of AlterField or RenameField operations. 
Regression in 45ded053b1f4320284aa5dac63052f6d1baefea9.

Backport of c3e0adcad8d8ba94b33cabd137056166ed36dae0 from master
 2017-12-01 19:09:36 -05:00
Simon Charette
f319e7abad [1.11.x] Fixed #28856 -- Fixed a regression in caching of a GenericForeignKey pointing to a MTI model. 
Regression in b9f8635f58ad743995cad2081b3dc395e55761e5.

Backport of d31424fec1a3de9d281535c0503644a9d7b93c63 from stable/2.0.x
 2017-11-30 10:45:20 -05:00
Mads Jensen
3545e84488 [1.11.x] Fixed #28702 -- Made query lookups for CIText fields use citext. 
Backport of f0a68c25118786d47041d0a435b2afa953be3c86 from master
 2017-11-29 11:12:07 -05:00
Raphael Michel
899999db42 [1.11.x] Fixed #28848 -- Fixed SQLite/MySQL crash when ordering by a filtered subquery that uses nulls_first/nulls_last. 
Backport of 616f468760e4984915bb2ccca6b9eb3d80ddadb0 from master
 2017-11-27 11:40:09 -05:00
Dražen Odobašić
7f4e174511 [1.11.x] Fixed #28817 -- Made QuerySet.iterator() use server-side cursors after values() and values_list(). 
Backport of d97f026a7ab5212192426e45121f7a52751a2044 from master
 2017-11-21 10:45:02 -05:00
Tim Graham
90c120c2b7 [1.11.x] Added assertion helpers for PostgreSQL's server-side cursor tests. 
Backport of 6cb6382639cbd29c8348b42c4d43b02c950eff3a from master
 2017-11-21 08:41:41 -05:00
Tim Graham
dc629097af [1.11.x] Fixed test failures due to ordering differences on PostgreSQL 10. 
Backport of 9bea555d06e0e585645053ae6ca9ac3dc8b899bd from master
 2017-11-15 11:03:34 -05:00
Simon Charette
a35ab95ed4 [1.11.x] Fixed #28792 -- Fixed index name truncation of namespaced tables. 
Refs #27458, #27843.

Thanks Tim and Mariusz for the review.

Backport of ee85ef8315db839e5723dea19d8b971420a2ebb4 from master
 2017-11-14 22:06:30 -05:00
Mariusz Felisiak
6731672060
[1.11.x] Fixed #28781 -- Added QuerySet.values()/values_list() support for union(), difference(), and intersection(). 
Thanks Tim Graham for the review.
Backport of 2d3cc94284674638c334670903d49565039d77ae from master
 2017-11-12 14:33:41 +01:00
shanghui
308f644624 [1.11.x] Fixed #28645 -- Reallowed AuthenticationForm to raise the inactive user error when using ModelBackend. 
Regression in e0a3d937309a82b8beea8f41b17d8b6298da2a86.

Thanks Guilherme Junqueira for the report and Tim Graham for the review.

Backport of 359370a8b8ca0efe99b1d4630b291ec060b69225 from master
 2017-11-08 09:52:27 -05:00
Mariusz Felisiak
11f6d43566 [1.11.x] Fixed #28689 -- Fixed unquoted table names in Subquery SQL when using OuterRef. 
Regression in f48bc7c3dbd204eefb3c19016b1e4906ac26bee3.

Backport of 81e357a7e19f35235cc998459a10213532727d4e from master
 2017-10-25 22:00:19 +02:00
Tomer Chachamu
e98ae4fe6b [1.11.x] Fixed #28722 -- Made QuerySet.reverse() affect nulls_first/nulls_last. 
Backport of 21a3a29dc9d138c248fd7922923b3ec710735c6c from master
 2017-10-21 21:03:52 -04:00
Claude Paroz
398a79ceb6 [1.11.x] Refs #28710 -- Simplified l10n format test 
Backport of c1fa6672dd995e5ab4e06d5132db40ed0f41a47e from master.
 2017-10-14 21:11:28 +02:00
Claude Paroz
50bbc93ccb [1.11.x] Fixed #28710 -- Fixed the Basque DATE_FORMAT string 
Thanks Eneko Illarramendi for the report and initial patch.
Backport of 8c538871bda3832bca2dddefe317bf4a9230dd45 from master.
 2017-10-13 19:52:22 +02:00
Daniel Tao
45b0ec87d3 [1.11.x] Fixed #28601 -- Prevented cache.get_or_set() from caching None if default is a callable that returns None. 
Backport of 4d60261b2a77460b4c127c3d832518b95e11a0ac from master
 2017-10-10 09:35:57 -04:00
Florian Apolloner
42847327d1 [1.11.x] Fixed #28488 -- Reallowed error handlers to access CSRF tokens. 
Regression in eef95ea96faef0b7dbbe0c8092202b74f68a899b.

Backport of c4c128d67c7dc2830631c6859a204c9d259f1fb1 from master
 2017-09-20 16:32:24 -04:00
Florian Apolloner
19ea298aaf [1.11.x] Initialized CsrfViewMiddleware once in csrf_tests. 
Backport of 77f82c4bf1565b074d12b1531caa4bc4f4b89506 from master
 2017-09-20 16:32:11 -04:00
Mariusz Felisiak
cee07ba088 [1.11.x] Fixed #28597 -- Fixed crash with the name of a model's autogenerated primary key in an Index's fields. 
Backport of fb02ebe889eee292144f9157ed4ddcdcc139eba9 from master
 2017-09-18 14:22:33 -04:00
Josh Schneier
1d1a56c599 [1.11.x] Fixed #28555 -- Made CharField convert whitespace-only values to the empty_value when strip is enabled. 
Backport of 48c394a6fc2594891f766293afec8f86d63e1015 from master
 2017-09-05 16:42:15 -04:00
Tim Graham
e35a0c5608 [1.11.x] Fixed CVE-2017-12794 -- Fixed XSS possibility in traceback section of technical 500 debug page. 
This is a security fix.
 2017-09-05 11:05:43 -04:00
Zach Liu
f8e0557b01 [1.11.x] Fixed #28550 -- Restored contrib.auth's login() and logout() views' respect of positional arguments. 
Regression in 78963495d0caadb77eb97ccf319ef0ba3b204fb5.
 2017-09-03 12:05:18 -04:00
Nick Pope
ff0b81f3a6 [1.11.x] Fixed typo in ModelAdmin action logging test. 2017-09-02 09:36:51 -04:00
Bo Marchman
8d66bffbae [1.11.x] Fixed #26522 -- Fixed a nondeterministic AssertionError in QuerySet combining. 
Thanks Andrew Brown for the test case.

Backport of 9bbb6e2d2536c4ac20dc13a94c1f80494e51f8d9 from master
 2017-09-01 15:49:33 -04:00
Tim Graham
20c03399d8 [1.11.x] Fixed #27998, #28543 -- Restored logging of ManyToManyField changes in admin's object history. 
And prevented ManyToManyField initial data in model forms from being affected
by subsequent model changes.

Regression in 56a55566a791a11420fe96f745b7489e756fc931.

Partial backport of e5bd585c6eb1e13e2f8aac030b33c077b0b70c05 and
15b465c584f49a1d43b6c18796f83521ee4ffc22 from master
 2017-08-31 09:41:04 -04:00
Mark Rogaski
80a0016c49 [1.11.x] Fixed #28487 -- Fixed runserver crash with non-Unicode system encodings on Python 2 + Windows. 2017-08-31 07:33:01 -04:00
caleb logan
3bb03df0fc [1.11.x] Fixed #28530 -- Prevented SelectDateWidget from localizing years in output. 
Backport of 9e2bf65d6a5dc3b53db84f4839652f0d154349ee from master
 2017-08-29 14:56:23 -04:00
Mads Jensen
c685b8f838 [1.11.x] Refs #25809 -- Omitted pages_per_range from BrinIndex.deconstruct() if it's None. 
Backport of fb42d0247136249ea81962474e9a6a2faf1755f1 from master
 2017-08-26 10:14:20 -04:00