summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-12-21 15:07:17 -0500
committerTim Graham <timograham@gmail.com>2017-12-26 10:21:05 -0500
commit6deaddcca367d0143c815aaa42342021baa3b41e (patch)
treec3c94e968211555ae4b276d6bef21b96b4788cf4 /docs
parent0fc4b1f31f3cf7788e38a3d53f32254d340f50e8 (diff)
Fixed #28956 -- Updated admin's jQuery to 3.2.1.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt6
-rw-r--r--docs/releases/2.1.txt2
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index e591854a7f..1f7b7f152e 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2016,10 +2016,14 @@ jQuery
Django admin JavaScript makes use of the `jQuery`_ library.
To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
-(version 2.2.3) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 3.2.1) is namespaced as ``django.jQuery``. If you want to use jQuery
in your own admin JavaScript without including a second copy, you can use the
``django.jQuery`` object on changelist and add/edit views.
+.. versionchanged:: 2.1
+
+ jQuery was upgraded from 2.2.3 to 3.2.1.
+
The :class:`ModelAdmin` class requires jQuery by default, so there is no need
to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
a specific need. For example, if you require the jQuery library to be in the
diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index b786fdae11..9d090b8244 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -35,6 +35,8 @@ Minor features
* :attr:`.ModelAdmin.search_fields` now accepts any lookup such as
``field__exact``.
+* jQuery is upgraded from version 2.2.3 to 3.2.1.
+
:mod:`django.contrib.admindocs`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~