mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-22 00:04:43 +00:00
Code Issues32 Releases Wiki Activity
26,701 Commits 29 Branches 441 Tags
9400c96b20
Commit Graph

26701 Commits

Author SHA1 Message Date
Carlton Gibson
9400c96b20 [2.2.x] Bumped version for 2.2.2 release. 2.2.2 2019-06-03 11:59:23 +02:00
Carlton Gibson
baaf187a4e [2.2.x] Applied jQuery patch for CVE-2019-11358. 
Backport of 34ec52269ade54af31a021b12969913129571a3f 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 deeba6d92006999fee9adfbd8be79bf0a59e8008 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 98c0fe19ee2cba9726708ac9336e1dc0d43cca69 from master
 2019-06-03 10:50:09 +02:00
parth
5c85244eb9 [2.2.x] Fixed -- Doc'd that InlineModelAdmin methods' obj argument is the parent object. 
Backport of 85436473066aae5d793caeced010ea4f45da4e79 from master
 2019-05-31 13:21:13 +02:00
Tom Forbes
7089502b98 [2.2.x] Fixed -- 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 6754bffa2b2df15a741008aa611c1bb0e8dff22b.

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

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

Backport of b2790f74d4f38c8b297b7c1cef6875d2378f6fa6 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 8bdc7a6778ab3849c31ec77a997d07676f210419 from master
 2019-05-27 12:26:41 +02:00
Shashank Parekh
86904c1850 [2.2.x] Fixed -- Corrected redirect() signature in docs. 
Backport of 8000767769ac37ec7f73eb9fcc4b3fc7399a5808 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 4fb9e7b057507dda1bccd969871ae350f6c68fef from master
 2019-05-24 08:24:04 +02:00
Akshesh
efb906cbe4 [2.2.x] Fixed -- Favored Meta.indexes over Meta.index_together in optimization docs. 
Backport of 888fdf182e164fa4b24aa82fa833c90a2b9bee7a 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 f011d9ea56f9b4385cc7c63c542b7403fef2fde1 from master
 2019-05-22 06:48:26 +02:00
GwynBleidD
83605a17f0 [2.2.x] Refs -- Corrected UniqueConstraint signature in docs. 
Backport of 5402061c80aa2ede08a7c6b3ff204646c5059cf7 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 fa422dd78b9a90143913ebb1d8c0e796504c2bee from master
 2019-05-20 10:44:34 +02:00
Thomasina Lee
3d4e53bcb1 [2.2.x] Fixed -- Removed redundant Coalesce call in SQL generated by SearchVector. 
Regression in 405c8363362063542e9e79beac53c8437d389520.

Backport of c38e7a79f4354ee831f92deb7a658fc0387e3bec from master
 2019-05-20 09:12:32 +02:00
ruchit2801
db7d7901ee [2.2.x] Fixed -- Fixed crash of deprecation message when Meta.ordering contains expressions. 
Regression in 1b1f64ee5a78cc217fead52cbae23114502cf564.

Backport of 04042b2b440f0bf50eb908d52cfe76af430e1738 from master
 2019-05-18 20:05:31 +02:00
Jon Dufresne
ed221f7c97 [2.2.x] Changed docs to link to Python's description of iterable. 
Backport of e86cc14bd36734d81c4e490a2453778e33b95a45 from master
 2019-05-17 17:27:57 +02:00
Daniel Hepper
0aca34fc83 [2.2.x] Fixed -- Updated macOS Spatialite installation instructions. 
Updated the Spatialite installation instruction to refer to the latest
available version from KyngChaos, as Gaia-SINS does not provide MacOS
binaries anymore.
Backport of ccb7f7c6d237900614290085cca103d9509b89b9 from master
 2019-05-17 16:24:43 +02:00
Tobias Kunze
85b698449f [2.2.x] Fixed -- Doc'd a limitation of ModelForm.Meta.widgets. 
Backport of a309821c973cf3bcfe817bb71163fcccc461cec1 from master
 2019-05-17 12:49:19 +02:00
Alex
4ef96cce6a [2.2.x] Fixed -- Adjusted QuerySet.get_or_create() docs to highlight atomicity warning. 
Backport of 1686dce06c1f3587e90ea98816eddaa965fd9f45 from master
 2019-05-17 12:25:12 +02:00
Claude Paroz
34a357d519 [2.2.x] Fixed -- Delegated hide/show JS toggle to parent div. 
Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>

Backport of e286987a27271c8ee7eb6e4d4332b563c4e6094b from master
 2019-05-17 08:04:59 +02:00
Jon Dufresne
08c8838727 [2.2.x] Changed tuple choices to list in docs. 
Backport of 97d3321e89c8d4434927bdbc308db1ccffa99d3b from master
 2019-05-15 14:41:01 +02:00
Ahisahar Pretel
f6febbc078 [2.2.x] Fixed -- Added source code link to the default logging configuration in logging docs. 
Backport of 717362d810955b9514e2ccd989f8a1647c9d7a00 from master
 2019-05-15 12:37:21 +02:00
Jonatas C. Damasceno
72fe36c246 [2.2.x] Fixed -- Clarified that urlpatterns can be a sequence. 
Backport of 8aad3321ed6f0b603361767a4fe00d046b5fdd34 from master
 2019-05-14 06:47:14 +02:00
Mariusz Felisiak
5d1cf9c442 [2.2.x] Added stub release notes for 2.2.2. 
Backport of 30dd43884e8e5dfb3dfd7e31fc78fd569f15916a from master
 2019-05-08 14:45:37 +02:00
Daniel Musketa
4cfbd2c0c2 [2.2.x] Fixed typo in docs/ref/django-admin.txt. 
Backport of 59de9494e7513de29bc71bd0b27445daff25a4b3 from master
 2019-05-07 12:59:14 +02:00
Tobias Kunze
769f87fd24 [2.2.x] Fixed -- Doc'd that RelatedManager.add()/remove()/set() accepts the field the relation points to. 
Backport of a44a21a22f20c1a710670676fcca798dd6bb5ac0 from master
 2019-05-07 12:58:55 +02:00
Tobias Kunze
bf9e0e342d [2.2.x] Refs -- Corrected documentation of pluralize template filter. 
Backport of e3968df527c4d378677f4784fb1bc0c86950fcf8 from master
 2019-05-03 11:53:56 +02:00
Mariusz Felisiak
2166fe337e
[2.2.x] Post-release version bump. 2019-05-01 09:11:33 +02:00
Mariusz Felisiak
d5b0625cdf
[2.2.x] Bumped version for 2.2.1 release. 2.2.1 2019-05-01 07:21:22 +02:00
Mariusz Felisiak
9d5ce09aec
[2.2.x] Updated man page for Django 2.2. 2019-05-01 07:15:24 +02:00
Mariusz Felisiak
e7629cecde [2.2.x] Added release date for 2.2.1. 
Backport of 2106b983c433586925df12cdca72374829756e45 from master
 2019-05-01 07:07:19 +02:00
can
58391b4d16 [2.2.x] Fixed -- Fixed crash when adding check constraints with OR'ed condition on Oracle and SQLite. 
Backport of 719b7466203181066d9537d2e3bec687dffc9f41 from master
 2019-04-30 13:43:02 +02:00
Tobias Kunze
54fcdf168a [2.2.x] Fixed -- Rephrased custom user models admonition. 
Backport of eb16c7260e573ec513d84cb586d96bdf508f3173 from master
 2019-04-30 09:49:38 +02:00
Simon Charette
f36239fa19 [2.2.x] Fixed -- Fixed crash when adding check constraints with LIKE operator on Oracle and PostgreSQL. 
The LIKE operator wildcard generated for contains, startswith, endswith and
their case-insensitive variant lookups was conflicting with parameter
interpolation on CREATE constraint statement execution.

Ideally we'd delegate parameters interpolation in DDL statements on backends
that support it but that would require backward incompatible changes to the
Index and Constraint SQL generating methods.

Thanks David Sanders for the report.

Backport of a8b3f96f6acfa082f99166e0a1cfb4b0fbc0eace from master
 2019-04-30 08:54:30 +02:00
Tom Forbes
d326c743ef [2.2.x] Fixed -- Fixed detecting changes by autoreloader when using StatReloader. 
Backport of 6754bffa2b2df15a741008aa611c1bb0e8dff22b from master
 2019-04-29 12:18:29 +02:00
Tom Forbes
097457afe4 [2.2.x] Refs -- Prevented crash of autoreloader when get_resolver().urlconf_module raising an exception. 
Backport of 0636d4d2aa6e4469198fdf662225ad862e60c5e3 from master
 2019-04-29 12:18:18 +02:00
Carlton Gibson
4f8ebdd098 [2.2.x] Fixed -- Handled pre-existing permissions in proxy model permissions data migration. 
Regression in 181fb60159e54d442d3610f4afba6f066a6dac05.

Backport of 98296f86b340c8c9c968375d59f1d3a3479e60c2 from master
 2019-04-27 21:08:46 +02:00
Jacob Green
e45763193f [2.2.x] Fixed -- Increased the default timeout of watchman client to 5 seconds and made it customizable. 
Made the default timeout of watchman client customizable via
DJANGO_WATCHMAN_TIMEOUT environment variable.

Backport of ed3c59097a01ed3f32f8a8bed95307fb5c181251 from master
 2019-04-26 13:35:47 +02:00
Aarni Koskela
a4095dadc4 [2.2.x] Fixed -- Relaxed admin check from django.contrib.sessions to SessionMiddleware subclasses. 
Backport of efeceba589974b95b35b2e25df86498c96315518 from master
 2019-04-26 11:51:28 +02:00
Alasdair Nicol
3c3df7db8e [2.2.x] Fixed -- Added check for importability of arguments of custom error handler views. 
Thanks to Jon on Stack Overflow for reporting the issue.

Backport of a5accc0368c6575b55976c06af36ed399c85c781 from master
 2019-04-25 11:38:35 +02:00
Mariusz Felisiak
f24cf51661 [2.2.x] Fixed -- Noted partial indexes and constraints restrictions with abstract base classes. 
Thanks Carlton Gibson for the review.

Backport of 5df3301aab9e1d1c386799263bef5cf013985c83 from master
 2019-04-25 07:37:34 +02:00
Mariusz Felisiak
158cfebe87 [2.2.x] Fixed UniqueConstraint example in ref/models/constraints.txt. 
Backport of f8f0f92ed9f73a025de599bd1a4965f2cc2ebbba from master
 2019-04-25 07:37:21 +02:00
Luke Plant
46416554f3 [2.2.x] Changed tuple Mate.unique_together/permissions to lists in docs. 
Backport of 0c916255eb4d94e06e123fafec93efdba45b1259 from master
 2019-04-24 10:33:05 +02:00
Simon Charette
88bf635c35 [2.2.x] Fixed -- Restored SearchVector(config) immutability. 
Regression in 1a28dc3887e8d66d5e3ff08cf7fb0a6212b873e5.

The usage of CONCAT to allow SearchVector to deal with non-text fields
made the generated expression non-IMMUTABLE which prevents a functional
index to be created for it.

Using a combination of COALESCE and ::text makes sure the expression
preserves its immutability.

Refs . Thanks Andrew Brown for the report, Nick Pope for the
review.

Backport of 405c8363362063542e9e79beac53c8437d389520 from master
 2019-04-23 08:32:36 +02:00
Ville Skyttä
47885278c6 [2.2.x] Fixed typo in docs/internals/contributing/committing-code.txt. 
Backport of 34a68c2cbea837b81cd9ab6bc91563416612157c from master
 2019-04-21 12:48:14 +02:00
Mariusz Felisiak
ba20579106 [2.2.x] Made cosmetic edits in docs/releases/2.2.1.txt. 
Backport of 753580ecd17de62fa8ab9cd43c4cd0b986f9e348 from master
 2019-04-19 08:29:23 +02:00