From: Guillaume Pellerin Date: Fri, 19 Aug 2016 13:50:24 +0000 (+0200) Subject: Use branch mezzanine@jquery X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=745775c81933af698d9713ccf20aa408b5f42abd;p=mezzo.git Use branch mezzanine@jquery --- diff --git a/app/local_settings.py b/app/local_settings.py index ce39e804..8677ccaa 100644 --- 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 7e7d273b..cb893109 100644 --- 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/