diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-12-23 10:26:39 +0000 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-12-23 10:26:39 +0000 |
| commit | 803947161b2296a1c71b9cb7822c469a5fffef04 (patch) | |
| tree | 0ea38c96b3a0ce259cae58b84422369f09183ffd /docs/ref | |
| parent | 01ab84c61330ffa5ac87c637249611c5e5343e57 (diff) | |
| parent | a58cfe8e719163bde76e8a1f56588f6ada1b8c20 (diff) | |
Merge pull request #3775 from collinanderson/jquery1.11.2
Upgrade jQuery from 1.11.1 to 1.11.2
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 6d631b77b0..fb8b6ac150 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1848,13 +1848,13 @@ jQuery Django admin Javascript makes use of the `jQuery`_ library. To avoid conflicts with user-supplied scripts or libraries, Django's jQuery -(version 1.11.1) is namespaced as ``django.jQuery``. If you want to use jQuery +(version 1.11.2) 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 embedded jQuery has been upgraded from 1.9.1 to 1.11.2. 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 |