From 727b4e05f59c15904f7b08388220b7bfc76d59b2 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Fri, 25 Apr 2014 18:53:00 +0200
Subject: Make the pain go away.

Fix #581, #544, #541, #535 and a few others.
---
 docs/changes.rst | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'docs/changes.rst')

diff --git a/docs/changes.rst b/docs/changes.rst
index 5020466..ca31fb9 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,6 +1,23 @@
 Change log
 ==========
 
+1.2
+---
+
+New features
+~~~~~~~~~~~~
+
+* The ``JQUERY_URL`` setting defines where the toolbar loads jQuery from.
+
+Bugfixes
+~~~~~~~~
+
+* The toolbar now always loads a private copy of jQuery in order to avoid
+  using an incompatible version. It no longer attemps to integrate with AMD.
+
+  This private copy is available in ``djdt.jQuery``. Third-party panels are
+  encouraged to use it because it should be as stable as the toolbar itself.
+
 1.1
 ---
 
@@ -24,8 +41,8 @@ Bugfixes
 Deprecated features
 ~~~~~~~~~~~~~~~~~~~
 
-* The `INTERCEPT_REDIRECT` setting is superseded by the more generic
-  `DISABLE_PANELS`.
+* The ``INTERCEPT_REDIRECTS`` setting is superseded by the more generic
+  ``DISABLE_PANELS``.
 
 1.0
 ---
-- 
cgit v1.2.3