From: mathieu Date: Fri, 10 Jun 2016 14:05:17 +0000 (+0200) Subject: Fixs from master X-Git-Tag: search~8^2~8^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5e753f6ffd88b6c44f30b8b2309ba93bc805b07b;p=telemeta.git Fixs from master --- diff --git a/.dockerignore b/.dockerignore index 3d2ee082..a692b3d6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,8 +4,5 @@ app/ build/ dist/ -media/ -static/ -var/ -backup/ +data/ tmp/ diff --git a/app/settings.py b/app/settings.py index 696d182b..1f4e860a 100644 --- a/app/settings.py +++ b/app/settings.py @@ -333,20 +333,20 @@ HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50 BOWER_COMPONENTS_ROOT = '/srv/bower/' BOWER_PATH = '/usr/local/bin/bower' BOWER_INSTALLED_APPS = ( - 'jquery', + 'jquery#2.2.4', 'jquery-migrate#~1.2.1', - 'underscore', - 'bootstrap', + 'underscore#1.8.3', + 'bootstrap#3.3.6', 'bootstrap-select#1.5.4', 'font-awesome#4.4.0', 'angular#1.2.26', - 'angular-bootstrap-select', + 'angular-bootstrap-select#0.0.5', 'angular-resource#1.2.26', - 'raphael', + 'raphael#2.2.0', 'soundmanager#V2.97a.20150601', 'https://github.com/Parisson/loaders.git', 'https://github.com/Parisson/ui.git', - 'jquery-ui', + 'jquery-ui#1.11.4', 'tablesorter', 'video.js', 'sass-bootstrap-glyphicons',