Commit Graph

26733 Commits

Author SHA1 Message Date
Mariusz Felisiak 2b533ae60e [2.2.x] Added CVE-2019-12781 to the security release archive.
Backport of 868cd56f05 from master
2019-07-01 10:21:16 +02:00
Mariusz Felisiak 5d39f62f7e [2.2.x] Post-release version bump. 2019-07-01 08:21:52 +02:00
Mariusz Felisiak 89e9a4aeb6 [2.2.x] Bumped version for 2.2.3 release. 2019-07-01 07:55:16 +02:00
Mariusz Felisiak 93e719efdb [2.2.x] Updated man page for Django 2.2. 2019-07-01 07:54:32 +02:00
Mariusz Felisiak 4f2713ff0e [2.2.x] Added release date for 2.2.3.
Backport of fc41401f33 from master
2019-07-01 07:51:53 +02:00
Carlton Gibson 77706a3e47 [2.2.x] Fixed CVE-2019-12781 -- Made HttpRequest always trust SECURE_PROXY_SSL_HEADER if set.
An HTTP request would not be redirected to HTTPS when the
SECURE_PROXY_SSL_HEADER and SECURE_SSL_REDIRECT settings were used if
the proxy connected to Django via HTTPS.

HttpRequest.scheme will now always trust the SECURE_PROXY_SSL_HEADER if
set, rather than falling back to the request scheme when the
SECURE_PROXY_SSL_HEADER did not have the secure value.

Thanks to Gavin Wahl for the report and initial patch suggestion, and
Shai Berger for review.

Backport of 54d0f5e62f from master
2019-07-01 07:50:48 +02:00
Mariusz Felisiak db9f7b44fc [2.2.x] Added stub release notes for security releases.
Backport of 30b3ee9d0b from master
2019-07-01 07:03:03 +02:00
Mariusz Felisiak 395cf7c375 [2.2.x] Fixed GeoIPTest.test04_city() failure with the latest GeoIP2 database.
Backport of 4305fbe8b1 from master
2019-06-30 19:46:40 +02:00
Claude Paroz b3f7262e6e [2.2.x] Updated translations from Transifex 2019-06-29 16:15:53 +02:00
Tom Forbes bdc1de2199 [2.2.x] Fixed #30588 -- Fixed crash of autoreloader when __main__ module doesn't have __file__ attribute.
Backport of 8454f6dea4 from master
2019-06-26 06:44:57 +02:00
Meysam 04965bf92d [2.2.x] Fixed typo in docs/topics/db/models.txt.
Backport of 833878411c from master
2019-06-24 09:05:15 +02:00
Alexey Opalev f3b036593f [2.2.x] Fixed typo in docs/ref/models/indexes.txt.
Backport of 2f91e7832f from master
2019-06-24 09:01:12 +02:00
Claude Paroz 3b2701e4f2 [2.2.x] Removed unneeded non-breaking spaces added in 00169bc36
Backport of 8590726a5d from master.
2019-06-22 10:28:26 +02:00
Markus Holtermann 2525785880 [2.2.x] Bumped minimum ESLint version to 4.18.2.
Backport of ad7b438002 from master.
2019-06-21 18:00:32 +02:00
Jon Dufresne e6b2471ce7 [2.2.x] Fixed typos in 1.11.19, 2.0.11, 2.1.6 release notes.
Backport of 2ef6f209f7 from master
2019-06-21 07:10:32 +02:00
Chris Jerdonek d200069b15 [2.2.x] Refs #30565 -- Doc'd HttpResponse.close() method.
Backport of 533311782f from master
2019-06-20 11:49:52 +02:00
Swat009 c3a0f76d11 [2.2.x] Fixed #30547 -- Doc'd how Meta.constraints affect model validation.
Backport of 00169bc361 from master
2019-06-20 10:45:20 +02:00
Hasan Ramezani c3a9d3050c [2.2.x] Fixed typos in signals and custom management commands docs.
Backport of a7038adbd0 from master
2019-06-19 08:41:51 +02:00
Hasan Ramezani 1ce04289f1 [2.2.x] Fixed typos and example in signals.pre_init docs.
Backport of 036362e0cf from master
2019-06-18 15:09:07 +02:00
Joachim Jablon 26c1214364 [2.2.x] Fixed an example of email with display name in EmailMessage.from_email.
Backport of 0c2ffdd526 from master
2019-06-13 18:00:28 +02:00
Jon Dufresne 13e6040fd4 [2.2.x] Fixed intword example in docs/ref/contrib/humanize.txt.
Backport of 175656e166 from master
2019-06-11 22:12:24 +02:00
Vyacheslav Ver 36766e1a28 [2.2.x] Fixed #30486 -- Fixed the default value of Aggregate.distinct and updated example of custom aggregate functions.
Backport of 76b3fc5c8d from master
2019-06-11 12:02:02 +02:00
Mykola Nicholas d5d22e1090 [2.2.x] Changed charset and collation link to MySQL docs.
Backport of f3a03d5b61 from master
2019-06-11 11:17:23 +02:00
Mariusz Felisiak 430f7e9dac [2.2.x] Removed redundant object descriptions to prevent warnings with Sphinx 2.1.0.
Backport of 5ab75adb90 from master
2019-06-10 16:57:50 +02:00
swatantra 6dca336167 [2.2.x] Fixed #30553 -- Clarified the default value of disable_existing_loggers.
Backport of 03cd3d137e from master
2019-06-10 15:18:40 +02:00
Étienne Beaulé 4e6f0024f1 [2.2.x] Fixed #30542 -- Fixed crash of numerical aggregations with filter.
Filters in annotations crashed when used with numerical-type
aggregations (i.e. Avg, StdDev, and Variance). This was caused as the
source expressions no not necessarily have an output_field (such as the
filter field), which lead to an AttributeError: 'WhereNode' object has
no attribute output_field.

Thanks to Chuan-Zheng Lee for the report.

Regression in c690afb873 and two following
commits.

Backport of 4b6dfe1622 from master.
2019-06-05 09:15:21 +02:00
Mariusz Felisiak ca3f86288a [2.2.x] Added stub release notes for 2.2.3.
Backport of 1f81e2df69 from master
2019-06-05 06:58:53 +02:00
Caio Ariede d6d65c1e87 [2.2.x] Fixed #30505 -- Doc'd how changes in the order of Field.choices affect migrations.
Backport of 5248abe9b0 from master
2019-06-04 14:57:08 +02:00
Nick Pope ed3dc5119b [2.2.x] Added CVE-2019-12308 to the security release archive.
Backport of 21b1d23912 from master
2019-06-03 21:45:58 +02:00
Nick Pope 162e02b5e4 [2.2.x] Added CVE-2019-11358 to the security release archive.
Backport of 8fb0ea5583 from master
2019-06-03 21:45:41 +02:00
Mariusz Felisiak e6d7641000 [2.2.x] Fixed typos in 1.11.21, 2.1.9, 2.2.2 release notes.
Backport of 100ec901ae from master
2019-06-03 14:10:51 +02:00
Carlton Gibson 666161b41f [2.2.x] Post-release version bump. 2019-06-03 12:07:15 +02:00
Carlton Gibson 9400c96b20 [2.2.x] Bumped version for 2.2.2 release. 2019-06-03 11:59:23 +02:00
Carlton Gibson baaf187a4e [2.2.x] Applied jQuery patch for CVE-2019-11358.
Backport of 34ec52269a from master.
2019-06-03 11:38:57 +02:00
Carlton Gibson afddabf842 [2.2.x] Fixed CVE-2019-12308 -- Made AdminURLFieldWidget validate URL before rendering clickable link.
Backport of deeba6d920 from master.
2019-06-03 11:37:28 +02:00
Carlton Gibson 4a1d25b39f [2.2.x] Added stub release notes for security releases.
Backport of 98c0fe19ee from master
2019-06-03 10:50:09 +02:00
parth 5c85244eb9 [2.2.x] Fixed #28831 -- Doc'd that InlineModelAdmin methods' obj argument is the parent object.
Backport of 8543647306 from master
2019-05-31 13:21:13 +02:00
Tom Forbes 7089502b98 [2.2.x] Fixed #30523 -- Fixed updating file modification times on seen files in auto-reloader when using StatReloader.
Previously we updated the file mtimes if the file has not been seen
before - i.e on the first iteration of the loop.

If the mtime has been changed we triggered the notify_file_changed()
method which in all cases except the translations will result in the
process being terminated. To be strictly correct we need to update the
mtime for either branch of the conditional.

Regression in 6754bffa2b.

Backport of 480492fe70 from master
2019-05-29 09:43:10 +02:00
Tom Forbes ace0bec804 [2.2.x] Fixed #30516 -- Fixed crash of autoreloader when re-raising exceptions with custom signature.
Regression in c8720e7696.

Backport of 0344565179 from master
2019-05-29 08:30:22 +02:00
Brad Solomon 0f0d1cd772 [2.2.x] Fixed #30491 -- Clarified when save() on object with pk executes INSERT.
Backport of 67b6cb7723 from master
2019-05-28 11:28:28 +02:00
Caio Ariede 1172f078eb [2.2.x] Fixed #30315 -- Fixed crash of ArrayAgg and StringAgg with ordering when used in Subquery.
Backport of a3f91891d2 from master.
2019-05-28 10:39:28 +02:00
Tom Forbes 5bf2c87ece [2.2.x] Fixed #30479 -- Fixed detecting changes in manage.py by autoreloader when using StatReloader.
Regression in c8720e7696.

Backport of b2790f74d4 from master
2019-05-28 09:01:29 +02:00
Mariusz Felisiak 853586ee2c [2.2.x] Doc'd that extra_email_context can be used to override default template context values in PasswordResetView.
Backport of 8bdc7a6778 from master
2019-05-27 12:26:41 +02:00
Shashank Parekh 86904c1850 [2.2.x] Fixed #30504 -- Corrected redirect() signature in docs.
Backport of 8000767769 from master
2019-05-24 08:27:10 +02:00
Caio Ariede 2f0dcd8238 [2.2.x] Doc'd that assertXMLEqual()/assertXMLNotEqual() ignores XML declaration and comments.
Backport of 4fb9e7b057 from master
2019-05-24 08:24:04 +02:00
Akshesh efb906cbe4 [2.2.x] Fixed #30419 -- Favored Meta.indexes over Meta.index_together in optimization docs.
Backport of 888fdf182e from master
2019-05-22 07:55:31 +02:00
Alex Gaynor a7515c3532 [2.2.x] Fixed datetime string format examples in docs/howto/custom-template-tags.txt.
Backport of f011d9ea56 from master
2019-05-22 06:48:26 +02:00
GwynBleidD 83605a17f0 [2.2.x] Refs #30062 -- Corrected UniqueConstraint signature in docs.
Backport of 5402061c80 from master
2019-05-20 10:54:19 +02:00
mentix02 da10b647f7 [2.2.x] Changed poll_id to poll_ids in examples of custom management commands.
Backport of fa422dd78b from master
2019-05-20 10:44:34 +02:00
Thomasina Lee 3d4e53bcb1 [2.2.x] Fixed #30488 -- Removed redundant Coalesce call in SQL generated by SearchVector.
Regression in 405c836336.

Backport of c38e7a79f4 from master
2019-05-20 09:12:32 +02:00