Commit Graph

16055 Commits

Author SHA1 Message Date
Mariusz Felisiak cf903c4c0b
[2.2.x] Reverted "Fixed relative paths imports per isort 4.3.5."
This reverts commit 463fe11bc8 due to
restore of relative paths sorting from isort < 4.3.5 in isort 4.3.10.
Backport of b435f82939 from master
2019-03-03 19:35:37 +01:00
Matthias Kestenholz 459f7c804d [2.2.x] Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient.
Thanks gasman for the tests, and codingjoe and timgraham for the review.

Backport of 231b513926 from master.
2019-02-27 17:16:58 -05:00
Matthias Kestenholz 77e53da127 [2.2.x] Refs #30179 -- Moved topological sort functions to django.utils.
Backport of e04209e181 from master.
2019-02-27 17:16:48 -05:00
Tim Graham d29c8ea124 [2.2.x] Refs #29523 -- Updated admin's collapse.min.js.
Omitted in ba83378a77.

Backport of 93e892bb64 from master.
2019-02-27 16:28:21 -05:00
shiningfm 4dac17ac93 [2.2.x] Fixed #30215 -- Fixed autoreloader crash for modules without __spec__.
Regression in c8720e7696.
Backport of 99cfb28e99 from master.
2019-02-27 10:35:45 -05:00
Tom Forbes 7331dd8a98 [2.2.x] Refs #27685 -- Removed "watchman unavailable" message.
Backport of 65ef5f467b from master
2019-02-25 21:42:14 -05:00
Matthias Kestenholz d59c3fc167 [2.2.x] Fixed #30208 -- Fixed login header height and alignment in the largest breakpoint.
Backport of c41e6c4eb8 from master.
2019-02-25 15:00:27 -05:00
Mariusz Felisiak 370a145996
[2.2.x] Fixed relative paths imports per isort 4.3.5.
Backport of 463fe11bc8 from master
2019-02-25 19:50:12 +01:00
Ran Benita a9bd914a22 [2.2.x] Removed an outdated comment on DefaultConnectionProxy.
Backport of 21ff23bfeb from master
2019-02-20 11:31:57 -05:00
Simon Charette 7f25344c2e [2.2.x] Fixed #30193, Refs #28478 -- Avoided PostgreSQL connection health checks on initialization.
This addressed a regression introduced by a96b901932 as identified by Ran Benita.
Backport of 7071f8f272 from master
2019-02-20 11:01:03 +01:00
Jon Dufresne 37cc6a9dce [2.2.x] Fixed #30171 -- Fixed DatabaseError in servers tests.
Made DatabaseWrapper thread sharing logic reentrant. Used a reference
counting like scheme to allow nested uses.

The error appeared after 8c775391b7.
Backport of 76990cbbda from master.
2019-02-14 10:05:13 -05:00
Dan Davis 5e94c817ee [2.2.x] Fixed #30184 -- Removed ellipsis characters from shell output strings.
Partially reverted 50b8493581 (refs #29654)
to avoid a crash when the user shell doesn't support non-ASCII characters.
Backport of 2bd8df243a from master.
2019-02-13 14:00:53 -05:00
Carlton Gibson 130d2d3072 [2.2.x] Bumped version for 2.2b1. 2019-02-11 11:21:19 +01:00
Carlton Gibson 83ab3e2664 [2.2.x] Fixed CVE-2019-6975 -- Fixed memory exhaustion in utils.numberformat.format().
Thanks Sjoerd Job Postmus for the report and initial patch.
Thanks Michael Manfre, Tim Graham, and Florian Apolloner for review.

Backport of 402c0caa85 from master
2019-02-11 11:10:38 +01:00
Matthias Kestenholz e1bd94496b [2.2.x] Fixed #30153 -- Fixed incorrect form Media asset ordering after three way merge.
Delaying merging assets as long as possible avoids introducing
incorrect relative orderings that cause a broken final result.
Backport of 959d0c078a from master.
2019-02-09 09:39:15 -05:00
Mariusz Felisiak 0aff35459d
[2.2.x] Updated Oracle docs links to Oracle 18c.
Backport of 759a9b710c from master
2019-02-07 10:03:11 +01:00
Tim Graham 5911d25916 [2.2.x] Removed django.utils.lru_cache usage.
Backport of 0367bc6d04 from master.
2019-02-04 20:33:20 -05:00
Mariusz Felisiak 6e8b11ab2b
[2.2.x] Fixed E117 and F405 flake8 warnings.
Backport of 5a5c77d55d from master
2019-01-30 13:08:19 +01:00
Claude Paroz caaa01142d [2.2.x] Fixed #29825 -- Fixed JS ngettext if the string is a non-plural msgid in the catalog.
Backport of 16454ac35f from master.
2019-01-28 18:17:52 -05:00
Tom Forbes 728358c5cf [2.2.x] Fixed #25624 -- Fixed autoreload crash with jinja2.ModuleLoader.
Backport of 1e92407f83 from master.
2019-01-28 14:42:46 -05:00
Tim Graham d3b4f4b962 [2.2.x] Refs #30055 -- Added a helpful error when SQLite is too old.
Backport of 7444f32527 from master.
2019-01-28 11:21:47 -05:00
Nick Pope e53e64280d [2.2.x] Fixed #30115 -- Fixed SQLite introspection crash with a varchar primary key.
Removed obsolete max_length handling for CharField that caused the issue.
Regression in a35d2a4510.

Backport of bff748df3e from master.
2019-01-22 19:20:16 -05:00
Nasir Hussain 6ce7887f13 [2.2.x] Fixed #30111 -- Fixed AppRegistryNotReady error with django.contrib.postgres in INSTALLED_APPS.
Regression in e192223ed9.
Backport of 2804b8d215 from master.
2019-01-22 17:50:00 -05:00
Jon Dufresne 28fb4ed5d9 [2.2.x] Fixed #30121 -- Fixed assertURLEqual() crash with reverse_lazy() URLs.
Regression in 24959e48d9.
Backport of d15c61cabb from master.
2019-01-21 09:31:45 -05:00
Simon Charette 6516e49262 [2.2.x] Fixed #30120 -- Fixed invalid SQL in distinct aggregate.
Regression in bc05547cd8 (refs #28658).
Backport of 65858119d2 from master.
2019-01-21 09:24:47 -05:00
Tom Forbes 370371ee9e [2.2.x] Removed redundant period in Watchman unavailable message.
Backport of d8a2f4ec09 from master.
2019-01-19 18:25:18 -05:00
Tim Graham ee9bd8c310 [2.2.x] Refs #30097 -- Fixed typos in InlineModelAdmin.has_add_permission() deprecation comments. 2019-01-17 18:40:11 -05:00
Carlton Gibson ce26b2180c [2.2.x] Bumped version for Django 2.2 alpha 1. 2019-01-17 16:26:35 +01:00
Simon Charette f84ad16ba4 Refs #17198 -- Detected existing total ordering in admin changelist.
Appending pk is not necessary when a subset of the ordering expressions is
contained in a non-nullable unique contraint.

Related field ordering through lookups and related ordering introspection is
omitted for simplicitly purpose.
2019-01-17 16:22:14 +01:00
Claude Paroz aa5fd84f53 Updated translation catalogs 2019-01-16 20:51:26 +01:00
Simon Charette 9e5e5a657b Fixed #30044 -- Raised a FieldError on inherited field update attempts. 2019-01-16 14:09:51 -05:00
Santiago Basulto 4fc35a9c3e Fixed #20147 -- Added HttpRequest.headers. 2019-01-16 13:38:47 -05:00
Carlton Gibson 876dc306cd
Refs #30102 -- Added comment on use of Template without placeholders in page_not_found() view. 2019-01-16 16:19:56 +01:00
Arthur Rio 181fb60159 Fixed #11154, #22270 -- Made proxy model permissions use correct content type.
Co-Authored-By: Simon Charette <charette.s@gmail.com>
Co-Authored-By: Antoine Catton <acatton@fusionbox.com>
2019-01-16 10:07:28 -05:00
Simon Charette dbcf2ffa77 Refs #9475 -- Simplified dictionary unpacking. 2019-01-16 09:20:15 -05:00
Nick Pope d212bc03ba Refs #9475 -- Fixed typo, used unpacking generalization, and made through_defaults kwarg-only. 2019-01-15 13:03:08 -05:00
Collin Anderson 769355c765 Fixed #9475 -- Allowed RelatedManager.add(), create(), etc. for m2m with a through model. 2019-01-15 11:12:17 -05:00
Nasir Hussain f021c110d0 Fixed #30099 -- Fixed invalid SQL when filtering a Subquery by an aggregate. 2019-01-15 07:22:59 -05:00
Claude Paroz 87bf35abd3 Removed unexpected chars in Armenian admin translation 2019-01-15 10:43:11 +01:00
Jon Dufresne ad7aa02c1d Removed unnecessary string formatting of strings. 2019-01-14 21:04:00 -05:00
Simon Charette b181aba7dd Refs #28478 -- Prevented database feature based skipping on tests disallowing queries.
Database features may require a connection to be established to determine
whether or not they are enabled.
2019-01-14 16:16:30 -05:00
Simon Charette f5b635086a Refs #28478 -- Prevented connection attempts against disallowed databases in tests.
Mocking connect as well as cursor methods makes sure an appropriate error
message is surfaced when running a subset of test attempting to access a
a disallowed database.
2019-01-14 16:05:00 -05:00
Simon Charette a96b901932 Refs #28478 -- Prevented timezone assignment for unusable PostgreSQL connections. 2019-01-14 16:05:00 -05:00
Nick Pope 846624ed08 Refs #28643 -- Extracted DurationField logic for Avg() and Sum() into mixin.
Also addresses Sum() not handling the filter option correctly.
2019-01-14 14:39:57 -05:00
Nick Pope 6d4efa8e6a Refs #28643 -- Changed Variance() to use NumericOutputFieldMixin.
Keeps precision instead of forcing DecimalField to FloatField.
2019-01-14 14:39:46 -05:00
Nick Pope e85afa5943 Refs #28643 -- Changed StdDev() to use NumericOutputFieldMixin.
Keeps precision instead of forcing DecimalField to FloatField.
2019-01-14 14:38:00 -05:00
Nick Pope c690afb873 Refs #28643 -- Changed Avg() to use NumericOutputFieldMixin.
Keeps precision instead of forcing DecimalField to FloatField.
2019-01-14 14:35:41 -05:00
Nick Pope 3d5e0f8394 Refs #28643 -- Moved db function mixins to a separate module. 2019-01-14 14:26:46 -05:00
Nick Pope 7f1577d1ef Avoided calling as_oracle() for SQLite in Left database function. 2019-01-14 13:02:58 -05:00
Nick Pope ae65eed68d Corrected comment in TruncTime database function. 2019-01-14 13:02:58 -05:00