summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-23 15:41:58 -0400
committerTim Graham <timograham@gmail.com>2014-08-24 15:26:29 -0400
commit7d62fb5957dce7b51316079409b4311877f54bfe (patch)
tree196103dc4e73855fe9488d58d7a77e44d9616e1d /docs
parent50ae4b4b9e146848ce0d95e76662ec0cf667fbe6 (diff)
Fixed #23355 -- Updated admin jQuery to 1.11.1.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt6
-rw-r--r--docs/releases/1.8.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 29b5abdc24..0760a0ed63 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1823,10 +1823,14 @@ jQuery
Django admin Javascript makes use of the `jQuery`_ library.
To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
-(version 1.9.1) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 1.11.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:: 1.8
+
+ The embedded jQuery has been upgraded from 1.9.1 to 1.11.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/1.8.txt b/docs/releases/1.8.txt
index b720c036ed..7cf14f1bef 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -48,6 +48,8 @@ Minor features
<django.contrib.admin.ModelAdmin.delete_view>` displays a summary of objects
to be deleted on the deletion confirmation page.
+* The jQuery library embedded in the admin has been upgraded to version 1.11.1.
+
:mod:`django.contrib.auth`
^^^^^^^^^^^^^^^^^^^^^^^^^^