mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-24 01:04:39 +00:00
Code Issues 32 Releases Wiki Activity
24,212 Commits 29 Branches 441 Tags
Commit Graph

8656 Commits

Author SHA1 Message Date
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
hui shang
58aaf13e75 [1.11.x] Fixed #28513 -- Added POST request support to LogoutView. 
Backport of c0f4c60edd429f5ef57241cfabd159d13e26e5ac from master
 2017-08-24 09:11:34 -04:00
Mariusz Felisiak
0d21bdd380 [1.11.x] Fixed #28498 -- Added support for cx_Oracle 6. 
- Fixed implicit Decimal to float conversion when input_size is not
specified for Decimal parameters.
- Used encoding, nencoding parameters of cx_Oracle.connect() to support
unicode in DSN.

Thanks Tim Graham for the review.
 2017-08-23 10:01:49 +02:00
Kevin Grinberg
90be8cf2a4 [1.11.x] Fixed #28451 -- Restored pre-Django 1.11 Oracle sequence/trigger naming. 
Regression in 69b7d4b116e3b70b250c77829e11038d5d55c2a8.

Backport of c6a3546093bebae8225a2c5b7e0836a2b0617ee5 from master
 2017-08-22 17:41:25 -04:00
Claude Paroz
dd82f1df55 [1.11.x] Fixed #28502 -- Made stringformat template filter accept tuples. 
Backport of 4ead705cb3cf04bb7551ac037d1e11f682b62bcf and
ed77bea58274e11e5a9e4c8b9650f50deb8a2b26 from master
 2017-08-22 08:57:50 -04:00
Mariusz Felisiak
07e34f8bca [1.11.x] Fixed #28498 -- Fixed test database creation with cx_Oracle 6. 
Backport of 6784383e93d582f43f8cb5f7647a05645cbb339b from master
 2017-08-16 18:42:41 +02:00
Tim Graham
a49764dd9d [1.11.x] Fixed #28441 -- Fixed GEOS version parsing with a commit hash at the end. 
A less invasive backport of 78c155cf2e5a27fd2db18c2d46953b1b0fdba829
from master
 2017-08-02 09:46:52 -04:00
Rachel Tobin
801b6fb32e [1.11.x] Fixed #28418 -- Fixed queryset crash when using a GenericRelation to a proxy model. 
Backport of f9e5f9ae9f83c7ddf5e5d3c369b6bf54a9b80ab5 from master
 2017-07-21 18:26:03 -04:00
Roman Selivanov
99d5059d76 [1.11.x] Fixed #28414 -- Fixed ClearableFileInput rendering as a subwidget of MultiWidget. 
Backport of d4da39685b5974849c73e4c4dc6e07dfdf21c67a from master
 2017-07-19 14:45:59 -04:00
Florian Apolloner
9350f77c69 [1.11.x] Fixed #28399 -- Fixed QuerySet.count() for union(), difference(), and intersection() queries. 
Backport of adab280cefb15659c39558ac26ea392b0a1e456c from master
 2017-07-15 09:10:42 -04:00
Tim Graham
d9ef8ffb58 [1.11.x] Refs #28174 -- Fixed autoreload test crash on Python 2/non-ASCII path. 2017-07-15 08:48:28 -04:00
Srinivas Reddy Thatiparthy
a3b5df8ed5 [1.11.x] Fixed #28387 -- Fixed has_changed() for disabled form fields that subclass it. 
Backport of 5debbdfcc84266703191e084914998e38f5f52eb from master
 2017-07-14 13:27:30 -04:00
Mark Rogaski
fc6b90bdb7 [1.11.x] Fixed #28174 -- Fixed crash in runserver's autoreload with Python 2 on Windows with non-str environment variables. 2017-07-13 13:12:29 -04:00
Sergey Fedoseev
30f334cc58 [1.11.x] Fixed #28389 -- Fixed pickling of LazyObject on Python 2 when wrapped object doesn't have __reduce__(). 
Partial revert of 35355a4ffedb2aeed52d5fe3034380ffc6a438db.
 2017-07-12 09:11:48 -04:00
Mariusz Felisiak
346b46a274 [1.11.x] Fixed #28378 -- Fixed union() and difference() when combining with a queryset raising EmptyResultSet. 
Thanks Jon Dufresne for the report. Thanks Tim Graham and Simon Charette
for the reviews.

Backport of ca74e563500e291480f1976b58fcd34aac768dca from master
 2017-07-10 20:50:50 +02:00
Mariusz Felisiak
b72298de75 [1.11.x] Added test for intersection() when combining with a queryset raising EmptyResultSet. 
Backport of 9bca0d0b38d941fe7f3842cb2259d018823ed25e from master
 2017-07-10 20:49:15 +02:00
Tim Graham
81febf4def [1.11.x] Fixed #28355 -- Fixed widget rendering of non-ASCII date/time formats on Python 2. 2017-07-06 07:41:57 -04:00
Jon Dufresne
8641489f4d [1.11.x] Fixed #28345 -- Applied limit_choices_to during ModelForm.__init__(). 
field_for_model() now has an additional keyword argument,
apply_limit_choices_to, allowing it to continue to be used to create
form fields dynamically after ModelForm.__init__() is called.

Thanks Tim Graham for the review.

Backport of a1be12fe193c8f3de8a0b0820f460a302472375f from master
 2017-06-30 21:28:47 -04:00
Simon Charette
c1621d8008 [1.11.x] Fixed #28350 -- Fixed UnboundLocalError crash in RenameField with nonexistent field. 
Thanks Tim for the review.

Backport of 5cbcb3683964205ce023157ca181d05a31be2ab5 from master
 2017-06-30 13:12:33 -04:00
Josh Schneier
7765d3ba9b [1.11.x] Fixed #28298 -- Prevented a primary key alteration from adding a foreign key constraint if db_constraint=False. 
Backport of fba0eaa5d60603721d7b4653e3efacbfb3613bd2 from master
 2017-06-22 21:54:46 -04:00
Mariusz Felisiak
d50e0e6553 [1.11.x] Simplified schema.tests with assertForeignKeyExists()/assertForeignKeyNotExists(). 
Backport of 663d1c316070af80a41f136b76308f21993537e4 from master
 2017-06-22 21:49:25 -04:00
Tim Graham
a3b1319d58 [1.11.x] Fixed #28176 -- Restored the uncasted option value in ChoiceWidget template context. 
Backport of 221e6e18177516ac4ac95e40c344b93d14dd607b from master
 2017-06-17 18:33:01 -04:00
Tim Graham
f0ec88fb63 [1.11.x] Fixed #28303 -- Prevented localization of attribute values in the DTL attrs.html widget template. 
Backport of 3b050fd0d0b8dbf499bdb44ce12fa926298c0bd0 from master
 2017-06-17 17:16:08 -04:00
Claude Paroz
49de4f1541 [1.11.x] Refs #24423 -- Readded inadvertently deleted i18n tests. 
Mistake in 97c1931c4f610e80053430d0297d51e1bed1e7ae.

Backport of 357a6428980961b2c5311eb75d16229c7fc0d982 from master
 2017-06-14 22:11:55 -04:00
Mikhail Golubev
16431b03f8 [1.11.x] Fixed #28229 -- Fixed the value of LoginView's "next" template variable. 
Backport of e7dc39fb65e51d7613c941f7e5768b621dea4e76 from master
 2017-06-13 09:19:11 -04:00
orf
f908e9d015 [1.11.x] Fixed #28284 -- Prevented Paginator's unordered object list warning from evaluating a QuerySet. 
Backport of a118287bca65f2e5da110c89509941c677ebc2e1 from master
 2017-06-13 08:34:49 -04:00
Mariusz Felisiak
44e29ea1e9 [1.11.x] Fixed #28293 -- Fixed union(), intersection(), and difference() when combining with an EmptyQuerySet. 
Thanks Jon Dufresne for the report and Tim Graham for the review.

Backport of 82175ead723f8fa3f9271fbd4b24275097029aab from master
 2017-06-13 08:33:26 +02:00
Paulo
927d9b51fe [1.11.x] Fixed #27967 -- Fixed KeyError in admin's inline form with inherited non-editable pk. 
Thanks Robin Anupol for the initial report and workaround.

Backport of 9dc83c356d363c090f3351c908cad6f823aeb7bf from master
 2017-06-12 21:22:53 -04:00
Jon Dufresne
ccb8297eee [1.11.x] Fixed #28282 -- Fixed class-based indexes name for models that only inherit Model. 
Backport of 0c3c37a376bac149fe7e7e4b2696f8fb7990e2ab from master
 2017-06-08 09:47:18 -04:00
kakulukia
992f143bad [1.11.x] Fixed #28278 -- Fixed invalid HTML for a required AdminFileWidget. 
Backport of 525dc283a68c0d47f5eb2192cc4a20111d561ae0 from master
 2017-06-06 15:57:08 -04:00
Paulo
a0707947e4 [1.11.x] Fixed #28202 -- Fixed FieldListFilter.get_queryset() crash on invalid input. 
Backport of 4ad2f862844d35404e4798b3227517625210a72e from master
 2017-06-06 08:18:08 -04:00
Paulo
834d57b4de [1.11.x] Fixed #28262 -- Fixed incorrect DisallowedModelAdminLookup when a nested reverse relation is in list_filter. 
Backport of b7f99f84bcc4a06114ac31174840efab0aef7602 from master
 2017-06-05 11:34:43 -04:00