Use branch mezzanine@jquery

diff --git a/app/local_settings.py b/app/local_settings.py
index ce39e804ccc94bf00510a9e83ca3a41d0c6f3eb0..8677ccaa5f7ba0020d697c118243093f0e6e1987 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -142,5 +142,5 @@ DEBUG_TOOLBAR_PANELS = [
 ]
 
 GRAPPELLI_INSTALLED = True
-JQUERY_FILENAME = 'jquery-3.1.0.min.js'
-JQUERY_UI_FILENAME = 'jquery-ui-1.12.0.min.js'
+# JQUERY_FILENAME = 'jquery-3.1.0.min.js'
+# JQUERY_UI_FILENAME = 'jquery-ui-1.12.0.min.js'

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7e7d273b2d26e731ae9f03ad5767f4af79238f45..cb89310963a60c83fd02b5e50a0ab6c4885e1c69 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
--e git+https://github.com/yomguy/mezzanine.git@master#egg=mezzanine-4.2-dev
+-e git+https://github.com/yomguy/mezzanine.git@jquery#egg=mezzanine-4.2-dev
 -e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
 #-e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light
 #https://forge.ircam.fr/p/django-eve/source/download/dev/