summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-05-16 20:42:01 -0400
committerTim Graham <timograham@gmail.com>2016-05-17 07:20:06 -0400
commitc999c8d8f61dbfc9998620f668aa8c0c610e3845 (patch)
tree7a5501655b3be224009faf5c4c0589e6c0b52e03 /docs
parented0ff913c648b16c4471fc9a9441d1ee48cb5420 (diff)
Updated admin's jQuery to 2.2.3.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt8
-rw-r--r--docs/releases/1.10.txt3
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 2877a493fb..eed7d4451c 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1922,16 +1922,20 @@ jQuery
Django admin JavaScript makes use of the `jQuery`_ library.
To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
-(version 2.1.4) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 2.2.3) 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:: 1.9
- The embedded jQuery has been upgraded from 1.11.2 to 2.1.4. This drops
+ The embedded jQuery was upgraded from 1.11.2 to 2.1.4. This drops
support for Internet Explorer 8 and below. You can restore support by
:ref:`including your own version of jQuery 1.X <admin-browser-support-19>`.
+.. versionchanged:: 1.10
+
+ The embedded jQuery was upgraded from 2.1.4 to 2.2.3.
+
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/1.10.txt b/docs/releases/1.10.txt
index 3fd6431462..b6ac9f5c89 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -89,6 +89,9 @@ Minor features
* Added "No date" and "Has date" choices for ``DateFieldListFilter`` if the
field is nullable.
+* The jQuery library embedded in the admin is upgraded from version 2.1.4 to
+ 2.2.3.
+
:mod:`django.contrib.admindocs`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~